[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 7/7] e500: Add support for eTSEC in device tree
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH v3 7/7] e500: Add support for eTSEC in device tree |
Date: |
Wed, 24 Sep 2014 17:22:23 +0200 |
This patch adds support to expose eTSEC devices in the dynamically created
guest facing device tree. This allows us to expose eTSEC devices into guests
without changes in the machine file.
Because we can now tell the guest about eTSEC devices this patch allows the
user to specify eTSEC devices via -device at all.
Signed-off-by: Alexander Graf <address@hidden>
---
v1 -> v2:
- fix device name (base on reg for value after @)
- use qom properties to fetch mmio and irq props
- remove useless interrupt-parent
- make interrupts level triggered
v2 -> v3:
- use new platform bus APIs
---
hw/ppc/e500.c | 43 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index f16bab7..22cfeac 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -38,6 +38,7 @@
#include "hw/pci-host/ppce500.h"
#include "qemu/error-report.h"
#include "hw/platform-bus.h"
+#include "hw/net/fsl_etsec/etsec.h"
#define EPAPR_MAGIC (0x45504150)
#define BINARY_DEVICE_TREE_FILE "mpc8544ds.dtb"
@@ -132,11 +133,53 @@ typedef struct PlatformDevtreeData {
PlatformBusDevice *pbus;
} PlatformDevtreeData;
+static int create_devtree_etsec(SysBusDevice *sbdev, PlatformDevtreeData *data)
+{
+ eTSEC *etsec = ETSEC_COMMON(sbdev);
+ PlatformBusDevice *pbus = data->pbus;
+ hwaddr mmio0 = platform_bus_get_mmio_addr(pbus, sbdev, 0);
+ int irq0 = platform_bus_get_irqn(pbus, sbdev, 0);
+ int irq1 = platform_bus_get_irqn(pbus, sbdev, 1);
+ int irq2 = platform_bus_get_irqn(pbus, sbdev, 2);
+ gchar *node = g_strdup_printf("/platform/address@hidden"PRIx64, mmio0);
+ gchar *group = g_strdup_printf("%s/queue-group", node);
+ void *fdt = data->fdt;
+
+ assert((int64_t)mmio0 >= 0);
+ assert(irq0 >= 0);
+ assert(irq1 >= 0);
+ assert(irq2 >= 0);
+
+ qemu_fdt_add_subnode(fdt, node);
+ qemu_fdt_setprop_string(fdt, node, "device_type", "network");
+ qemu_fdt_setprop_string(fdt, node, "compatible", "fsl,etsec2");
+ qemu_fdt_setprop_string(fdt, node, "model", "eTSEC");
+ qemu_fdt_setprop(fdt, node, "local-mac-address", etsec->conf.macaddr.a, 6);
+ qemu_fdt_setprop_cells(fdt, node, "fixed-link", 0, 1, 1000, 0, 0);
+
+ qemu_fdt_add_subnode(fdt, group);
+ qemu_fdt_setprop_cells(fdt, group, "reg", mmio0, 0x1000);
+ qemu_fdt_setprop_cells(fdt, group, "interrupts",
+ data->irq_start + irq0, 0x2,
+ data->irq_start + irq1, 0x2,
+ data->irq_start + irq2, 0x2);
+
+ g_free(node);
+ g_free(group);
+
+ return 0;
+}
+
static int sysbus_device_create_devtree(SysBusDevice *sbdev, void *opaque)
{
PlatformDevtreeData *data = opaque;
bool matched = false;
+ if (object_dynamic_cast(OBJECT(sbdev), TYPE_ETSEC_COMMON)) {
+ create_devtree_etsec(sbdev, data);
+ matched = true;
+ }
+
if (!matched) {
error_report("Device %s is not supported by this machine yet.",
qdev_fw_name(DEVICE(sbdev)));
--
1.8.1.4
- [Qemu-devel] [PATCH v3 0/7] Dynamic sysbus device allocation support, Alexander Graf, 2014/09/24
- [Qemu-devel] [PATCH v3 1/7] sysbus: Add dynamic sysbus device search, Alexander Graf, 2014/09/24
- [Qemu-devel] [PATCH v3 6/7] PPC: e500: Support dynamically spawned sysbus devices, Alexander Graf, 2014/09/24
- [Qemu-devel] [PATCH v3 4/7] sysbus: Expose MMIO enumeration helper, Alexander Graf, 2014/09/24
- [Qemu-devel] [PATCH v3 5/7] sysbus: Add new platform bus helper device, Alexander Graf, 2014/09/24
- [Qemu-devel] [PATCH v3 2/7] sysbus: Make devices spawnable via -device, Alexander Graf, 2014/09/24
- [Qemu-devel] [PATCH v3 3/7] sysbus: Expose IRQ enumeration helpers, Alexander Graf, 2014/09/24
- [Qemu-devel] [PATCH v3 7/7] e500: Add support for eTSEC in device tree,
Alexander Graf <=
- Re: [Qemu-devel] [PATCH v3 0/7] Dynamic sysbus device allocation support, Paolo Bonzini, 2014/09/24