From 123a069ae69735e9d71c262061254838132b69d9 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 26 Nov 2018 13:39:23 +0000 Subject: [PATCH 1/3] MAINTAINERS: Assign some more files in the hw/arm/ directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I apparently missed some more files and even a complete machine (the "imx25-pdk") in my previous patch... but now we should hopefully have a completely coverage for all available ARM boards. Fixes: 95a5db3ae5698b49c63144610ad02913e780c828 Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-id: 1542782568-20059-1-git-send-email-thuth@redhat.com Signed-off-by: Peter Maydell --- MAINTAINERS | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index f4a7e453c0..43d0d9d578 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -535,6 +535,17 @@ L: qemu-arm@nongnu.org S: Odd Fixes F: hw/arm/gumstix.c +i.MX25 PDK +M: Peter Maydell +R: Jean-Christophe Dubois +L: qemu-arm@nongnu.org +S: Odd Fixes +F: hw/arm/fsl-imx25.c +F: hw/arm/imx25_pdk.c +F: hw/misc/imx25_ccm.c +F: include/hw/arm/fsl-imx25.h +F: include/hw/misc/imx25_ccm.h + i.MX31 (kzm) M: Peter Chubb M: Peter Maydell @@ -617,6 +628,7 @@ R: Andrew Baumann R: Philippe Mathieu-Daudé L: qemu-arm@nongnu.org S: Odd Fixes +F: hw/arm/raspi.c F: hw/arm/raspi_platform.h F: hw/*/bcm283* F: include/hw/arm/raspi* @@ -641,8 +653,12 @@ F: hw/arm/spitz.c F: hw/arm/tosa.c F: hw/arm/z2.c F: hw/*/pxa2xx* +F: hw/display/tc6393xb.c +F: hw/gpio/max7310.c +F: hw/gpio/zaurus.c F: hw/misc/mst_fpga.c F: include/hw/arm/pxa.h +F: include/hw/arm/sharpsl.h SABRELITE / i.MX6 M: Peter Maydell From 49154ea0bfdefa17e03bf927db38b8501deb294f Mon Sep 17 00:00:00 2001 From: Eric Auger Date: Thu, 22 Nov 2018 19:01:43 +0100 Subject: [PATCH 2/3] MAINTAINERS: Add an ARM SMMU section Add a new ARM SMMU section and set Eric Auger as the maintainer for ARM SMMU emulation sources. Signed-off-by: Eric Auger Message-id: 20181122180143.14237-1-eric.auger@redhat.com Suggested-by: Peter Maydell Signed-off-by: Peter Maydell --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 43d0d9d578..9410bbb7cf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -151,6 +151,13 @@ F: disas/arm.c F: disas/arm-a64.cc F: disas/libvixl/ +ARM SMMU +M: Eric Auger +L: qemu-arm@nongnu.org +S: Maintained +F: hw/arm/smmu* +F: include/hw/arm/smmu* + CRIS M: Edgar E. Iglesias S: Maintained From 58102ce7fbb2362aa53984aabcf684d164da2d9d Mon Sep 17 00:00:00 2001 From: "Edgar E. Iglesias" Date: Fri, 23 Nov 2018 14:54:50 +0100 Subject: [PATCH 3/3] net: cadence_gem: Remove incorrect assert() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Don't assert on RX descriptor settings when the receiver is disabled. This fixes an issue with incoming packets on an unused GEM. Reported-by: mbilal Signed-off-by: Edgar E. Iglesias Reviewed-by: Philippe Mathieu-Daudé Message-id: 20181123135450.24829-2-edgar.iglesias@gmail.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/net/cadence_gem.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index d95cc27f58..7f63411430 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -979,7 +979,6 @@ static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size) /* Do nothing if receive is not enabled. */ if (!gem_can_receive(nc)) { - assert(!first_desc); return -1; }