1 files changed, 0 insertions, 107 deletions

diff --git a/recipes-devtools/qemu/qemu-zynqmp-mainline/0008-arm-xilinx-zynqmp-Add-GEM-support.patch b/recipes-devtools/qemu/qemu-zynqmp-mainline/0008-arm-xilinx-zynqmp-Add-GEM-support.patch
deleted file mode 100644
index 9441f609..00000000
--- a/recipes-devtools/qemu/qemu-zynqmp-mainline/0008-arm-xilinx-zynqmp-Add-GEM-support.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 5f3d79a3b5ede9d2da63dded227f7cdf44e7d476 Mon Sep 17 00:00:00 2001
-From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
-Date: Wed, 18 Feb 2015 18:56:37 -0800
-Subject: [PATCH 08/15] arm: xilinx-zynqmp: Add GEM support
-
-There are 4x Cadence GEMs in ZynqMP. Add them.
-
-Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
----
- hw/arm/xlnx-zynqmp.c         |   32 ++++++++++++++++++++++++++++++++
- include/hw/arm/xlnx-zynqmp.h |    3 +++
- 2 files changed, 35 insertions(+)
-
-diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c
-index 29954f5..d8c648d 100644
---- a/hw/arm/xlnx-zynqmp.c
-+++ b/hw/arm/xlnx-zynqmp.c
-@@ -25,6 +25,14 @@
- #define GIC_DIST_ADDR       0xf9010000
- #define GIC_CPU_ADDR        0xf9020000
- 
-+static const uint64_t gem_addr[XLNX_ZYNQMP_NUM_GEMS] = {
-+    0xFF0B0000, 0xFF0C0000, 0xFF0D0000, 0xFF0E0000,
-+};
-+
-+static const int gem_intr[XLNX_ZYNQMP_NUM_GEMS] = {
-+    57, 59, 61, 63,
-+};
-+
- static inline int arm_gic_ppi_index(int cpu_nr, int ppi_index)
- {
-     return GIC_NUM_SPI_INTR + cpu_nr * 32 + ppi_index;
-@@ -44,6 +52,11 @@ static void xlnx_zynqmp_init(Object *obj)
- 
-     object_initialize(&s->gic, sizeof(s->gic), TYPE_ARM_GIC);
-     qdev_set_parent_bus(DEVICE(&s->gic), sysbus_get_default());
-+
-+    for (i = 0; i < XLNX_ZYNQMP_NUM_GEMS; i++) {
-+        object_initialize(&s->gem[i], sizeof(s->gem[i]), TYPE_CADENCE_GEM);
-+        qdev_set_parent_bus(DEVICE(&s->gem[i]), sysbus_get_default());
-+    }
- }
- 
- #define ERR_PROP_CHECK_RETURN(err, errp) do { \
-@@ -57,6 +70,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
- {
-     XlnxZynqMPState *s = XLNX_ZYNQMP(dev);
-     uint8_t i;
-+    qemu_irq gic_spi[GIC_NUM_SPI_INTR];
-     Error *err = NULL;
- 
-     qdev_prop_set_uint32(DEVICE(&s->gic), "num-irq", GIC_NUM_SPI_INTR + 32);
-@@ -82,6 +96,24 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
-                                arm_gic_ppi_index(i, ARM_VIRT_TIMER_PPI));
-         qdev_connect_gpio_out(DEVICE(&s->cpu[i]), 1, irq);
-     }
-+
-+    for (i = 0; i < GIC_NUM_SPI_INTR; i++) {
-+        gic_spi[i] = qdev_get_gpio_in(DEVICE(&s->gic), i);
-+    }
-+
-+    for (i = 0; i < XLNX_ZYNQMP_NUM_GEMS; i++) {
-+        NICInfo *nd = &nd_table[i];
-+
-+        if (nd->used) {
-+            qemu_check_nic_model(nd, TYPE_CADENCE_GEM);
-+            qdev_set_nic_properties(DEVICE(&s->gem[i]), nd);
-+        }
-+        object_property_set_bool(OBJECT(&s->gem[i]), true, "realized", &err);
-+        ERR_PROP_CHECK_RETURN(err, errp);
-+        sysbus_mmio_map(SYS_BUS_DEVICE(&s->gem[i]), 0, gem_addr[i]);
-+        sysbus_connect_irq(SYS_BUS_DEVICE(&s->gem[i]), 0,
-+                           gic_spi[gem_intr[i]]);
-+    }
- }
- 
- static void xlnx_zynqmp_class_init(ObjectClass *oc, void *data)
-diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h
-index d29c7de..12a1be1 100644
---- a/include/hw/arm/xlnx-zynqmp.h
-+++ b/include/hw/arm/xlnx-zynqmp.h
-@@ -3,12 +3,14 @@
- #include "qemu-common.h"
- #include "hw/arm/arm.h"
- #include "hw/intc/arm_gic.h"
-+#include "hw/net/cadence_gem.h"
- 
- #define TYPE_XLNX_ZYNQMP "xlnx,zynqmp"
- #define XLNX_ZYNQMP(obj) OBJECT_CHECK(XlnxZynqMPState, (obj), \
-                                        TYPE_XLNX_ZYNQMP)
- 
- #define XLNX_ZYNQMP_NUM_CPUS 4
-+#define XLNX_ZYNQMP_NUM_GEMS 4
- 
- typedef struct XlnxZynqMPState {
-     /*< private >*/
-@@ -17,6 +19,7 @@ typedef struct XlnxZynqMPState {
- 
-     ARMCPU cpu[XLNX_ZYNQMP_NUM_CPUS];
-     GICState gic;
-+    CadenceGEMState gem[XLNX_ZYNQMP_NUM_GEMS];
- }  XlnxZynqMPState;
- 
- #define XLNX_ZYNQMP_H_
--- 
-1.7.10.4
-