[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/8] hw/pci-host/bonito: Convert to 3-phase reset
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 1/8] hw/pci-host/bonito: Convert to 3-phase reset |
Date: |
Thu, 5 Jan 2023 14:07:03 +0100 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Convert the TYPE_PCI_BONITO class to use 3-phase reset.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/pci-host/bonito.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index a57e81e3a9..b0d09c85d0 100644
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -47,7 +47,6 @@
#include "hw/mips/mips.h"
#include "hw/pci/pci_host.h"
#include "migration/vmstate.h"
-#include "sysemu/reset.h"
#include "sysemu/runstate.h"
#include "hw/misc/unimp.h"
#include "hw/registerfields.h"
@@ -593,9 +592,9 @@ static int pci_bonito_map_irq(PCIDevice *pci_dev, int
irq_num)
}
}
-static void bonito_reset(void *opaque)
+static void bonito_reset_hold(Object *obj)
{
- PCIBonitoState *s = opaque;
+ PCIBonitoState *s = PCI_BONITO(obj);
uint32_t val = 0;
/* set the default value of north bridge registers */
@@ -739,8 +738,6 @@ static void bonito_realize(PCIDevice *dev, Error **errp)
pci_set_byte(dev->config + PCI_MIN_GNT, 0x3c);
pci_set_byte(dev->config + PCI_MAX_LAT, 0x00);
-
- qemu_register_reset(bonito_reset, s);
}
PCIBus *bonito_init(qemu_irq *pic)
@@ -770,7 +767,9 @@ static void bonito_class_init(ObjectClass *klass, void
*data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
+ ResettableClass *rc = RESETTABLE_CLASS(klass);
+ rc->phases.hold = bonito_reset_hold;
k->realize = bonito_realize;
k->vendor_id = 0xdf53;
k->device_id = 0x00d5;
--
2.38.1
- [PATCH 0/8] hw/pci-host/bonito: Housekeeping, Philippe Mathieu-Daudé, 2023/01/05
- [PATCH 1/8] hw/pci-host/bonito: Convert to 3-phase reset,
Philippe Mathieu-Daudé <=
- [PATCH 2/8] hw/pci-host/bonito: Use 'bonito_host' for PCI host bridge code, Philippe Mathieu-Daudé, 2023/01/05
- [PATCH 3/8] hw/pci-host/bonito: Use 'bonito_pci' for PCI function #0 code, Philippe Mathieu-Daudé, 2023/01/05
- [PATCH 4/8] hw/pci-host/bonito: Set reference using object_property_add_const_link(), Philippe Mathieu-Daudé, 2023/01/05
- [PATCH 8/8] hw/mips/fuloong2e: Open code bonito_init(), Philippe Mathieu-Daudé, 2023/01/05
- [PATCH 5/8] hw/pci-host/bonito: Create PCI function #0 in bridge realize() handler, Philippe Mathieu-Daudé, 2023/01/05