ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/pci-host/pnv_phb3_msi: Convert TYPE_PHB3_MSI to 3-phase reset 

Convert the TYPE_PHB3_MSI class to 3-phase reset, so we can
avoid using the device_class_set_parent_reset() function.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20221125115240.3005559-8-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2022-11-25 11:52:40 +00:00
parent a359da4c62
commit a0c2e80afc
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/pci-host/pnv_phb3_msi.c
View File

@ -228,12 +228,14 @@ static void phb3_msi_resend(ICSState *ics)
} }
} }
static void phb3_msi_reset(DeviceState *dev) static void phb3_msi_reset_hold(Object *obj)
{ {
Phb3MsiState *msi = PHB3_MSI(dev); Phb3MsiState *msi = PHB3_MSI(obj);
ICSStateClass *icsc = ICS_GET_CLASS(dev); ICSStateClass *icsc = ICS_GET_CLASS(obj);
icsc->parent_reset(dev); if (icsc->parent_phases.hold) {
icsc->parent_phases.hold(obj);
}
memset(msi->rba, 0, sizeof(msi->rba)); memset(msi->rba, 0, sizeof(msi->rba));
msi->rba_sum = 0; msi->rba_sum = 0;
@ -287,11 +289,12 @@ static void phb3_msi_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
ICSStateClass *isc = ICS_CLASS(klass); ICSStateClass *isc = ICS_CLASS(klass);
ResettableClass *rc = RESETTABLE_CLASS(klass);
device_class_set_parent_realize(dc, phb3_msi_realize, device_class_set_parent_realize(dc, phb3_msi_realize,
&isc->parent_realize); &isc->parent_realize);
device_class_set_parent_reset(dc, phb3_msi_reset, resettable_class_set_parent_phases(rc, NULL, phb3_msi_reset_hold, NULL,
&isc->parent_reset); &isc->parent_phases);
isc->reject = phb3_msi_reject; isc->reject = phb3_msi_reject;
isc->resend = phb3_msi_resend; isc->resend = phb3_msi_resend;

2
include/hw/ppc/xics.h
View File

@ -95,7 +95,7 @@ struct ICSStateClass {
DeviceClass parent_class; DeviceClass parent_class;
DeviceRealize parent_realize; DeviceRealize parent_realize;
DeviceReset parent_reset; ResettablePhases parent_phases;
void (*reject)(ICSState *s, uint32_t irq); void (*reject)(ICSState *s, uint32_t irq);
void (*resend)(ICSState *s); void (*resend)(ICSState *s);