[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 52/60] ppc/ppc405: Use an embedded PPCUIC model in SoC state
From: |
Daniel Henrique Barboza |
Subject: |
[PULL 52/60] ppc/ppc405: Use an embedded PPCUIC model in SoC state |
Date: |
Wed, 31 Aug 2022 15:50:26 -0300 |
From: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
[balaton: Simplify sysbus device casts for readability]
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Message-Id:
<ac5f010f4eb3ade061c65bc39a049f231f75574a.1660746880.git.balaton@eik.bme.hu>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/ppc/ppc405.h | 3 ++-
hw/ppc/ppc405_uc.c | 28 ++++++++++++++--------------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/hw/ppc/ppc405.h b/hw/ppc/ppc405.h
index 343a84c98e..67f4c14f50 100644
--- a/hw/ppc/ppc405.h
+++ b/hw/ppc/ppc405.h
@@ -27,6 +27,7 @@
#include "qom/object.h"
#include "hw/ppc/ppc4xx.h"
+#include "hw/intc/ppc-uic.h"
#define PPC405EP_SDRAM_BASE 0x00000000
#define PPC405EP_NVRAM_BASE 0xF0000000
@@ -208,7 +209,7 @@ struct Ppc405SoCState {
hwaddr ram_size;
PowerPCCPU cpu;
- DeviceState *uic;
+ PPCUIC uic;
Ppc405CpcState cpc;
Ppc405GptState gpt;
Ppc405OcmState ocm;
diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c
index 247c4f3fa8..47bb9f534a 100644
--- a/hw/ppc/ppc405_uc.c
+++ b/hw/ppc/ppc405_uc.c
@@ -1083,6 +1083,8 @@ static void ppc405_soc_instance_init(Object *obj)
object_initialize_child(obj, "cpu", &s->cpu,
POWERPC_CPU_TYPE_NAME("405ep"));
+ object_initialize_child(obj, "uic", &s->uic, TYPE_PPC_UIC);
+
object_initialize_child(obj, "cpc", &s->cpc, TYPE_PPC405_CPC);
object_property_add_alias(obj, "sys-clk", OBJECT(&s->cpc), "sys-clk");
@@ -1150,17 +1152,15 @@ static void ppc405_soc_realize(DeviceState *dev, Error
**errp)
sysbus_mmio_map(sbd, 0, 0xef600600);
/* Universal interrupt controller */
- s->uic = qdev_new(TYPE_PPC_UIC);
-
- object_property_set_link(OBJECT(s->uic), "cpu", OBJECT(&s->cpu),
+ object_property_set_link(OBJECT(&s->uic), "cpu", OBJECT(&s->cpu),
&error_fatal);
- if (!sysbus_realize(SYS_BUS_DEVICE(s->uic), errp)) {
+ sbd = SYS_BUS_DEVICE(&s->uic);
+ if (!sysbus_realize(sbd, errp)) {
return;
}
-
- sysbus_connect_irq(SYS_BUS_DEVICE(s->uic), PPCUIC_OUTPUT_INT,
+ sysbus_connect_irq(sbd, PPCUIC_OUTPUT_INT,
qdev_get_gpio_in(DEVICE(&s->cpu), PPC40x_INPUT_INT));
- sysbus_connect_irq(SYS_BUS_DEVICE(s->uic), PPCUIC_OUTPUT_CINT,
+ sysbus_connect_irq(sbd, PPCUIC_OUTPUT_CINT,
qdev_get_gpio_in(DEVICE(&s->cpu), PPC40x_INPUT_CINT));
/* SDRAM controller */
@@ -1171,7 +1171,7 @@ static void ppc405_soc_realize(DeviceState *dev, Error
**errp)
"ppc405.sdram0", s->dram_mr,
s->ram_bases[0], s->ram_sizes[0]);
- ppc4xx_sdram_init(env, qdev_get_gpio_in(s->uic, 17), 1,
+ ppc4xx_sdram_init(env, qdev_get_gpio_in(DEVICE(&s->uic), 17), 1,
s->ram_banks, s->ram_bases, s->ram_sizes,
s->do_dram_init);
@@ -1186,12 +1186,12 @@ static void ppc405_soc_realize(DeviceState *dev, Error
**errp)
}
sbd = SYS_BUS_DEVICE(&s->dma);
for (i = 0; i < ARRAY_SIZE(s->dma.irqs); i++) {
- sysbus_connect_irq(sbd, i, qdev_get_gpio_in(s->uic, 5 + i));
+ sysbus_connect_irq(sbd, i, qdev_get_gpio_in(DEVICE(&s->uic), 5 + i));
}
/* I2C controller */
sysbus_create_simple(TYPE_PPC4xx_I2C, 0xef600500,
- qdev_get_gpio_in(s->uic, 2));
+ qdev_get_gpio_in(DEVICE(&s->uic), 2));
/* GPIO */
sbd = SYS_BUS_DEVICE(&s->gpio);
@@ -1203,13 +1203,13 @@ static void ppc405_soc_realize(DeviceState *dev, Error
**errp)
/* Serial ports */
if (serial_hd(0) != NULL) {
serial_mm_init(get_system_memory(), 0xef600300, 0,
- qdev_get_gpio_in(s->uic, 0),
+ qdev_get_gpio_in(DEVICE(&s->uic), 0),
PPC_SERIAL_MM_BAUDBASE, serial_hd(0),
DEVICE_BIG_ENDIAN);
}
if (serial_hd(1) != NULL) {
serial_mm_init(get_system_memory(), 0xef600400, 0,
- qdev_get_gpio_in(s->uic, 1),
+ qdev_get_gpio_in(DEVICE(&s->uic), 1),
PPC_SERIAL_MM_BAUDBASE, serial_hd(1),
DEVICE_BIG_ENDIAN);
}
@@ -1226,7 +1226,7 @@ static void ppc405_soc_realize(DeviceState *dev, Error
**errp)
}
sysbus_mmio_map(sbd, 0, 0xef600000);
for (i = 0; i < ARRAY_SIZE(s->gpt.irqs); i++) {
- sysbus_connect_irq(sbd, i, qdev_get_gpio_in(s->uic, 19 + i));
+ sysbus_connect_irq(sbd, i, qdev_get_gpio_in(DEVICE(&s->uic), 19 + i));
}
/* MAL */
@@ -1237,7 +1237,7 @@ static void ppc405_soc_realize(DeviceState *dev, Error
**errp)
}
sbd = SYS_BUS_DEVICE(&s->mal);
for (i = 0; i < ARRAY_SIZE(s->mal.irqs); i++) {
- sysbus_connect_irq(sbd, i, qdev_get_gpio_in(s->uic, 11 + i));
+ sysbus_connect_irq(sbd, i, qdev_get_gpio_in(DEVICE(&s->uic), 11 + i));
}
/* Ethernet */
--
2.37.2
- [PULL 42/60] ppc/ppc405: QOM'ify DMA, (continued)
- [PULL 42/60] ppc/ppc405: QOM'ify DMA, Daniel Henrique Barboza, 2022/08/31
- [PULL 43/60] ppc/ppc405: QOM'ify EBC, Daniel Henrique Barboza, 2022/08/31
- [PULL 44/60] ppc/ppc405: QOM'ify OPBA, Daniel Henrique Barboza, 2022/08/31
- [PULL 46/60] ppc/ppc405: QOM'ify PLB, Daniel Henrique Barboza, 2022/08/31
- [PULL 45/60] ppc/ppc405: QOM'ify POB, Daniel Henrique Barboza, 2022/08/31
- [PULL 47/60] ppc/ppc405: QOM'ify MAL, Daniel Henrique Barboza, 2022/08/31
- [PULL 48/60] ppc4xx: Move PLB model to ppc4xx_devs.c, Daniel Henrique Barboza, 2022/08/31
- [PULL 49/60] ppc4xx: Rename ppc405-plb to ppc4xx-plb, Daniel Henrique Barboza, 2022/08/31
- [PULL 50/60] ppc4xx: Move EBC model to ppc4xx_devs.c, Daniel Henrique Barboza, 2022/08/31
- [PULL 51/60] ppc4xx: Rename ppc405-ebc to ppc4xx-ebc, Daniel Henrique Barboza, 2022/08/31
- [PULL 52/60] ppc/ppc405: Use an embedded PPCUIC model in SoC state,
Daniel Henrique Barboza <=
- [PULL 53/60] hw/intc/ppc-uic: Convert ppc-uic to a PPC4xx DCR device, Daniel Henrique Barboza, 2022/08/31
- [PULL 54/60] ppc/ppc405: Use an explicit I2C object, Daniel Henrique Barboza, 2022/08/31
- [PULL 55/60] ppc/ppc405: QOM'ify FPGA, Daniel Henrique Barboza, 2022/08/31
- [PULL 56/60] ppc405: Move machine specific code to ppc405_boards.c, Daniel Henrique Barboza, 2022/08/31
- [PULL 57/60] hw/ppc/sam3460ex: Remove PPC405 dependency from sam460ex, Daniel Henrique Barboza, 2022/08/31
- [PULL 58/60] hw/ppc/Kconfig: Move imply before select, Daniel Henrique Barboza, 2022/08/31
- [PULL 59/60] ppc/ppc4xx: Fix sdram trace events, Daniel Henrique Barboza, 2022/08/31
- [PULL 60/60] ppc4xx: Fix code style problems reported by checkpatch, Daniel Henrique Barboza, 2022/08/31
- Re: [PULL 00/60] ppc queue, BALATON Zoltan, 2022/08/31