[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 08/50] dino: move initial register configuration to new dino_p
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v2 08/50] dino: move initial register configuration to new dino_pcihost_reset() function |
Date: |
Wed, 4 May 2022 10:25:18 +0100 |
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
---
hw/hppa/dino.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/hw/hppa/dino.c b/hw/hppa/dino.c
index ae79ddbf5c..d3cd8578a1 100644
--- a/hw/hppa/dino.c
+++ b/hw/hppa/dino.c
@@ -527,8 +527,6 @@ PCIBus *dino_init(MemoryRegion *addr_space,
object_property_set_link(OBJECT(dev), "memory-as", OBJECT(addr_space),
&error_fatal);
s = DINO_PCI_HOST_BRIDGE(dev);
- s->iar0 = s->iar1 = CPU_HPA + 3;
- s->toc_addr = 0xFFFA0030; /* IO_COMMAND of CPU */
b = s->parent_obj.bus;
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
@@ -542,6 +540,14 @@ PCIBus *dino_init(MemoryRegion *addr_space,
return b;
}
+static void dino_pcihost_reset(DeviceState *dev)
+{
+ DinoState *s = DINO_PCI_HOST_BRIDGE(dev);
+
+ s->iar0 = s->iar1 = CPU_HPA + 3;
+ s->toc_addr = 0xFFFA0030; /* IO_COMMAND of CPU */
+}
+
static void dino_pcihost_realize(DeviceState *dev, Error **errp)
{
DinoState *s = DINO_PCI_HOST_BRIDGE(dev);
@@ -632,6 +638,7 @@ static void dino_pcihost_class_init(ObjectClass *klass,
void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
+ dc->reset = dino_pcihost_reset;
dc->realize = dino_pcihost_realize;
dc->unrealize = dino_pcihost_unrealize;
device_class_set_props(dc, dino_pcihost_properties);
--
2.20.1
- [PATCH v2 02/50] dino: move registers from dino_init() to DINO_PCI_BRIDGE init function, (continued)
- [PATCH v2 02/50] dino: move registers from dino_init() to DINO_PCI_BRIDGE init function, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 03/50] dino: move PCI bus initialisation to dino_pcihost_init(), Mark Cave-Ayland, 2022/05/04
- [PATCH v2 07/50] dino: move PCI bus master address space setup to dino_pcihost_realize(), Mark Cave-Ayland, 2022/05/04
- [PATCH v2 05/50] dino: add memory-as property containing a link to the memory address space, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 04/50] dino: move PCI windows initialisation to dino_pcihost_init(), Mark Cave-Ayland, 2022/05/04
- [PATCH v2 08/50] dino: move initial register configuration to new dino_pcihost_reset() function,
Mark Cave-Ayland <=
- [PATCH v2 09/50] dino: use QOM cast instead of directly referencing parent_obj, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 11/50] dino: split declarations from dino.c into dino.h, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 14/50] machine.c: map DINO device during board configuration, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 06/50] dino: move pci_setup_iommu() to dino_pcihost_init(), Mark Cave-Ayland, 2022/05/04
- [PATCH v2 10/50] dino: return PCIBus from dino_init() using qdev_get_child_bus(), Mark Cave-Ayland, 2022/05/04