On 12/22/21 03:38, Cédric Le Goater wrote:
> The PHB4 reset handler was preparing ground for PHB5 to set
> appropriately the device id. We don't need it for the PHB4 since the
> device id is already set in the root port complex. PH5 will introduce
> its own.
>
> "device-id" property is now useless. It should be removed.
>
> Signed-off-by: Cédric Le Goater <clg@kaod.org>
> ---
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
> hw/pci-host/pnv_phb4.c | 13 -------------
> 1 file changed, 13 deletions(-)
>
> diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c
> index 40b793201a34..4caf03310fab 100644
> --- a/hw/pci-host/pnv_phb4.c
> +++ b/hw/pci-host/pnv_phb4.c
> @@ -1229,18 +1229,6 @@ static void pnv_phb4_realize(DeviceState *dev, Error **errp)
> phb->qirqs = qemu_allocate_irqs(xive_source_set_irq, xsrc, xsrc->nr_irqs);
> }
>
> -static void pnv_phb4_reset(DeviceState *dev)
> -{
> - PnvPHB4 *phb = PNV_PHB4(dev);
> - PCIDevice *root_dev = PCI_DEVICE(&phb->root);
> -
> - /*
> - * Configure PCI device id at reset using a property.
> - */
> - pci_config_set_vendor_id(root_dev->config, PCI_VENDOR_ID_IBM);
> - pci_config_set_device_id(root_dev->config, phb->device_id);
> -}
> -
> static const char *pnv_phb4_root_bus_path(PCIHostState *host_bridge,
> PCIBus *rootbus)
> {
> @@ -1290,7 +1278,6 @@ static void pnv_phb4_class_init(ObjectClass *klass, void *data)
> device_class_set_props(dc, pnv_phb4_properties);
> set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
> dc->user_creatable = false;
> - dc->reset = pnv_phb4_reset;
>
> xfc->notify = pnv_phb4_xive_notify;
> }
>