[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 06/21] aspeed: add support for multiple NICs
From: |
Cédric Le Goater |
Subject: |
[Qemu-devel] [PATCH v2 06/21] aspeed: add support for multiple NICs |
Date: |
Tue, 18 Jun 2019 18:52:56 +0200 |
The Aspeed SoCs have two MACs. Extend the Aspeed model to support a
second NIC.
Signed-off-by: Cédric Le Goater <address@hidden>
---
include/hw/arm/aspeed_soc.h | 3 ++-
hw/arm/aspeed_soc.c | 33 +++++++++++++++++++--------------
2 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h
index b613b00600fc..75b557060b9b 100644
--- a/include/hw/arm/aspeed_soc.h
+++ b/include/hw/arm/aspeed_soc.h
@@ -25,6 +25,7 @@
#define ASPEED_SPIS_NUM 2
#define ASPEED_WDTS_NUM 3
#define ASPEED_CPUS_NUM 2
+#define ASPEED_MACS_NUM 2
typedef struct AspeedSoCState {
/*< private >*/
@@ -43,7 +44,7 @@ typedef struct AspeedSoCState {
AspeedSMCState spi[ASPEED_SPIS_NUM];
AspeedSDMCState sdmc;
AspeedWDTState wdt[ASPEED_WDTS_NUM];
- FTGMAC100State ftgmac100;
+ FTGMAC100State ftgmac100[ASPEED_MACS_NUM];
} AspeedSoCState;
#define TYPE_ASPEED_SOC "aspeed-soc"
diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c
index d38fb0aaa0f5..736e52366a66 100644
--- a/hw/arm/aspeed_soc.c
+++ b/hw/arm/aspeed_soc.c
@@ -234,8 +234,10 @@ static void aspeed_soc_init(Object *obj)
sc->info->silicon_rev);
}
- sysbus_init_child_obj(obj, "ftgmac100", OBJECT(&s->ftgmac100),
- sizeof(s->ftgmac100), TYPE_FTGMAC100);
+ for (i = 0; i < ASPEED_MACS_NUM; i++) {
+ sysbus_init_child_obj(obj, "ftgmac100[*]", OBJECT(&s->ftgmac100[i]),
+ sizeof(s->ftgmac100[i]), TYPE_FTGMAC100);
+ }
}
static void aspeed_soc_realize(DeviceState *dev, Error **errp)
@@ -382,19 +384,22 @@ static void aspeed_soc_realize(DeviceState *dev, Error
**errp)
}
/* Net */
- qdev_set_nic_properties(DEVICE(&s->ftgmac100), &nd_table[0]);
- object_property_set_bool(OBJECT(&s->ftgmac100), true, "aspeed", &err);
- object_property_set_bool(OBJECT(&s->ftgmac100), true, "realized",
- &local_err);
- error_propagate(&err, local_err);
- if (err) {
- error_propagate(errp, err);
- return;
+ for (i = 0; i < nb_nics; i++) {
+ qdev_set_nic_properties(DEVICE(&s->ftgmac100[i]), &nd_table[i]);
+ object_property_set_bool(OBJECT(&s->ftgmac100[i]), true, "aspeed",
+ &err);
+ object_property_set_bool(OBJECT(&s->ftgmac100[i]), true, "realized",
+ &local_err);
+ error_propagate(&err, local_err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
+ sysbus_mmio_map(SYS_BUS_DEVICE(&s->ftgmac100[i]), 0,
+ sc->info->memmap[ASPEED_ETH1 + i]);
+ sysbus_connect_irq(SYS_BUS_DEVICE(&s->ftgmac100[i]), 0,
+ aspeed_soc_get_irq(s, ASPEED_ETH1 + i));
}
- sysbus_mmio_map(SYS_BUS_DEVICE(&s->ftgmac100), 0,
- sc->info->memmap[ASPEED_ETH1]);
- sysbus_connect_irq(SYS_BUS_DEVICE(&s->ftgmac100), 0,
- aspeed_soc_get_irq(s, ASPEED_ETH1));
}
static Property aspeed_soc_properties[] = {
DEFINE_PROP_UINT32("num-cpus", AspeedSoCState, num_cpus, 0),
--
2.21.0
- [Qemu-devel] [PATCH v2 00/21] aspeed: machine extensions and fixes, Cédric Le Goater, 2019/06/18
- [Qemu-devel] [PATCH v2 03/21] hw: timer: Add ASPEED RTC device, Cédric Le Goater, 2019/06/18
- [Qemu-devel] [PATCH v2 01/21] aspeed: add a per SoC mapping for the interrupt space, Cédric Le Goater, 2019/06/18
- [Qemu-devel] [PATCH v2 04/21] hw/arm/aspeed: Add RTC to SoC, Cédric Le Goater, 2019/06/18
- [Qemu-devel] [PATCH v2 02/21] aspeed: add a per SoC mapping for the memory space, Cédric Le Goater, 2019/06/18
- [Qemu-devel] [PATCH v2 05/21] aspeed: introduce a configurable number of CPU per machine, Cédric Le Goater, 2019/06/18
- [Qemu-devel] [PATCH v2 06/21] aspeed: add support for multiple NICs,
Cédric Le Goater <=
- [Qemu-devel] [PATCH v2 08/21] aspeed/timer: Status register contains reload for stopped timer, Cédric Le Goater, 2019/06/18
- [Qemu-devel] [PATCH v2 07/21] aspeed/timer: Fix behaviour running Linux, Cédric Le Goater, 2019/06/18
- [Qemu-devel] [PATCH v2 09/21] aspeed/timer: Fix match calculations, Cédric Le Goater, 2019/06/18
- [Qemu-devel] [PATCH v2 10/21] aspeed/timer: Provide back-pressure information for short periods, Cédric Le Goater, 2019/06/18
- [Qemu-devel] [PATCH v2 11/21] aspeed/timer: Ensure positive muldiv delta, Cédric Le Goater, 2019/06/18
- [Qemu-devel] [PATCH v2 12/21] aspeed: remove the "ram" link, Cédric Le Goater, 2019/06/18