ppc/pnv: remove pnv-phb4-root-port
The unified pnv-phb-root-port can be used instead. The phb4-root-port device isn't exposed to the user in any official QEMU release so there's no ABI breakage in removing it. Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> Reviewed-by: Frederic Barrat <fbarrat@linux.ibm.com> Message-Id: <20220624084921.399219-9-danielhb413@gmail.com>
This commit is contained in:
parent
805150619e
commit
c8d14603e9
@ -38,11 +38,11 @@ static void pnv_phb_realize(DeviceState *dev, Error **errp)
|
|||||||
break;
|
break;
|
||||||
case 4:
|
case 4:
|
||||||
phb_typename = g_strdup(TYPE_PNV_PHB4);
|
phb_typename = g_strdup(TYPE_PNV_PHB4);
|
||||||
phb_rootport_typename = g_strdup(TYPE_PNV_PHB4_ROOT_PORT);
|
phb_rootport_typename = g_strdup(TYPE_PNV_PHB_ROOT_PORT);
|
||||||
break;
|
break;
|
||||||
case 5:
|
case 5:
|
||||||
phb_typename = g_strdup(TYPE_PNV_PHB5);
|
phb_typename = g_strdup(TYPE_PNV_PHB5);
|
||||||
phb_rootport_typename = g_strdup(TYPE_PNV_PHB5_ROOT_PORT);
|
phb_rootport_typename = g_strdup(TYPE_PNV_PHB_ROOT_PORT);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
g_assert_not_reached();
|
g_assert_not_reached();
|
||||||
|
@ -1725,94 +1725,9 @@ static const TypeInfo pnv_phb4_root_bus_info = {
|
|||||||
.class_init = pnv_phb4_root_bus_class_init,
|
.class_init = pnv_phb4_root_bus_class_init,
|
||||||
};
|
};
|
||||||
|
|
||||||
static void pnv_phb4_root_port_reset(DeviceState *dev)
|
|
||||||
{
|
|
||||||
PCIERootPortClass *rpc = PCIE_ROOT_PORT_GET_CLASS(dev);
|
|
||||||
PCIDevice *d = PCI_DEVICE(dev);
|
|
||||||
uint8_t *conf = d->config;
|
|
||||||
|
|
||||||
rpc->parent_reset(dev);
|
|
||||||
|
|
||||||
pci_byte_test_and_set_mask(conf + PCI_IO_BASE,
|
|
||||||
PCI_IO_RANGE_MASK & 0xff);
|
|
||||||
pci_byte_test_and_clear_mask(conf + PCI_IO_LIMIT,
|
|
||||||
PCI_IO_RANGE_MASK & 0xff);
|
|
||||||
pci_set_word(conf + PCI_MEMORY_BASE, 0);
|
|
||||||
pci_set_word(conf + PCI_MEMORY_LIMIT, 0xfff0);
|
|
||||||
pci_set_word(conf + PCI_PREF_MEMORY_BASE, 0x1);
|
|
||||||
pci_set_word(conf + PCI_PREF_MEMORY_LIMIT, 0xfff1);
|
|
||||||
pci_set_long(conf + PCI_PREF_BASE_UPPER32, 0x1); /* Hack */
|
|
||||||
pci_set_long(conf + PCI_PREF_LIMIT_UPPER32, 0xffffffff);
|
|
||||||
pci_config_set_interrupt_pin(conf, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void pnv_phb4_root_port_realize(DeviceState *dev, Error **errp)
|
|
||||||
{
|
|
||||||
PCIERootPortClass *rpc = PCIE_ROOT_PORT_GET_CLASS(dev);
|
|
||||||
Error *local_err = NULL;
|
|
||||||
|
|
||||||
rpc->parent_realize(dev, &local_err);
|
|
||||||
if (local_err) {
|
|
||||||
error_propagate(errp, local_err);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void pnv_phb4_root_port_class_init(ObjectClass *klass, void *data)
|
|
||||||
{
|
|
||||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
||||||
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
|
|
||||||
PCIERootPortClass *rpc = PCIE_ROOT_PORT_CLASS(klass);
|
|
||||||
|
|
||||||
dc->desc = "IBM PHB4 PCIE Root Port";
|
|
||||||
dc->user_creatable = false;
|
|
||||||
|
|
||||||
device_class_set_parent_realize(dc, pnv_phb4_root_port_realize,
|
|
||||||
&rpc->parent_realize);
|
|
||||||
device_class_set_parent_reset(dc, pnv_phb4_root_port_reset,
|
|
||||||
&rpc->parent_reset);
|
|
||||||
|
|
||||||
k->vendor_id = PCI_VENDOR_ID_IBM;
|
|
||||||
k->device_id = PNV_PHB4_DEVICE_ID;
|
|
||||||
k->revision = 0;
|
|
||||||
|
|
||||||
rpc->exp_offset = 0x48;
|
|
||||||
rpc->aer_offset = 0x100;
|
|
||||||
|
|
||||||
dc->reset = &pnv_phb4_root_port_reset;
|
|
||||||
}
|
|
||||||
|
|
||||||
static const TypeInfo pnv_phb4_root_port_info = {
|
|
||||||
.name = TYPE_PNV_PHB4_ROOT_PORT,
|
|
||||||
.parent = TYPE_PCIE_ROOT_PORT,
|
|
||||||
.instance_size = sizeof(PnvPHB4RootPort),
|
|
||||||
.class_init = pnv_phb4_root_port_class_init,
|
|
||||||
};
|
|
||||||
|
|
||||||
static void pnv_phb5_root_port_class_init(ObjectClass *klass, void *data)
|
|
||||||
{
|
|
||||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
||||||
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
|
|
||||||
|
|
||||||
dc->desc = "IBM PHB5 PCIE Root Port";
|
|
||||||
dc->user_creatable = false;
|
|
||||||
|
|
||||||
k->vendor_id = PCI_VENDOR_ID_IBM;
|
|
||||||
k->device_id = PNV_PHB5_DEVICE_ID;
|
|
||||||
}
|
|
||||||
|
|
||||||
static const TypeInfo pnv_phb5_root_port_info = {
|
|
||||||
.name = TYPE_PNV_PHB5_ROOT_PORT,
|
|
||||||
.parent = TYPE_PNV_PHB4_ROOT_PORT,
|
|
||||||
.instance_size = sizeof(PnvPHB4RootPort),
|
|
||||||
.class_init = pnv_phb5_root_port_class_init,
|
|
||||||
};
|
|
||||||
|
|
||||||
static void pnv_phb4_register_types(void)
|
static void pnv_phb4_register_types(void)
|
||||||
{
|
{
|
||||||
type_register_static(&pnv_phb4_root_bus_info);
|
type_register_static(&pnv_phb4_root_bus_info);
|
||||||
type_register_static(&pnv_phb5_root_port_info);
|
|
||||||
type_register_static(&pnv_phb4_root_port_info);
|
|
||||||
type_register_static(&pnv_phb4_type_info);
|
type_register_static(&pnv_phb4_type_info);
|
||||||
type_register_static(&pnv_phb5_type_info);
|
type_register_static(&pnv_phb5_type_info);
|
||||||
type_register_static(&pnv_phb4_iommu_memory_region_info);
|
type_register_static(&pnv_phb4_iommu_memory_region_info);
|
||||||
|
@ -260,7 +260,7 @@ static void pnv_pec_class_init(ObjectClass *klass, void *data)
|
|||||||
pecc->version = PNV_PHB4_VERSION;
|
pecc->version = PNV_PHB4_VERSION;
|
||||||
pecc->phb_type = TYPE_PNV_PHB4;
|
pecc->phb_type = TYPE_PNV_PHB4;
|
||||||
pecc->num_phbs = pnv_pec_num_phbs;
|
pecc->num_phbs = pnv_pec_num_phbs;
|
||||||
pecc->rp_model = TYPE_PNV_PHB4_ROOT_PORT;
|
pecc->rp_model = TYPE_PNV_PHB_ROOT_PORT;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const TypeInfo pnv_pec_type_info = {
|
static const TypeInfo pnv_pec_type_info = {
|
||||||
@ -313,7 +313,7 @@ static void pnv_phb5_pec_class_init(ObjectClass *klass, void *data)
|
|||||||
pecc->version = PNV_PHB5_VERSION;
|
pecc->version = PNV_PHB5_VERSION;
|
||||||
pecc->phb_type = TYPE_PNV_PHB5;
|
pecc->phb_type = TYPE_PNV_PHB5;
|
||||||
pecc->num_phbs = pnv_phb5_pec_num_stacks;
|
pecc->num_phbs = pnv_phb5_pec_num_stacks;
|
||||||
pecc->rp_model = TYPE_PNV_PHB5_ROOT_PORT;
|
pecc->rp_model = TYPE_PNV_PHB_ROOT_PORT;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const TypeInfo pnv_phb5_pec_type_info = {
|
static const TypeInfo pnv_phb5_pec_type_info = {
|
||||||
|
@ -2153,6 +2153,7 @@ static void pnv_machine_power9_class_init(ObjectClass *oc, void *data)
|
|||||||
|
|
||||||
static GlobalProperty phb_compat[] = {
|
static GlobalProperty phb_compat[] = {
|
||||||
{ TYPE_PNV_PHB, "version", "4" },
|
{ TYPE_PNV_PHB, "version", "4" },
|
||||||
|
{ TYPE_PNV_PHB_ROOT_PORT, "version", "4" },
|
||||||
};
|
};
|
||||||
|
|
||||||
mc->desc = "IBM PowerNV (Non-Virtualized) POWER9";
|
mc->desc = "IBM PowerNV (Non-Virtualized) POWER9";
|
||||||
@ -2177,6 +2178,7 @@ static void pnv_machine_power10_class_init(ObjectClass *oc, void *data)
|
|||||||
|
|
||||||
static GlobalProperty phb_compat[] = {
|
static GlobalProperty phb_compat[] = {
|
||||||
{ TYPE_PNV_PHB, "version", "5" },
|
{ TYPE_PNV_PHB, "version", "5" },
|
||||||
|
{ TYPE_PNV_PHB_ROOT_PORT, "version", "5" },
|
||||||
};
|
};
|
||||||
|
|
||||||
mc->desc = "IBM PowerNV (Non-Virtualized) POWER10";
|
mc->desc = "IBM PowerNV (Non-Virtualized) POWER10";
|
||||||
|
@ -45,16 +45,7 @@ typedef struct PnvPhb4DMASpace {
|
|||||||
QLIST_ENTRY(PnvPhb4DMASpace) list;
|
QLIST_ENTRY(PnvPhb4DMASpace) list;
|
||||||
} PnvPhb4DMASpace;
|
} PnvPhb4DMASpace;
|
||||||
|
|
||||||
/*
|
|
||||||
* PHB4 PCIe Root port
|
|
||||||
*/
|
|
||||||
#define TYPE_PNV_PHB4_ROOT_BUS "pnv-phb4-root"
|
#define TYPE_PNV_PHB4_ROOT_BUS "pnv-phb4-root"
|
||||||
#define TYPE_PNV_PHB4_ROOT_PORT "pnv-phb4-root-port"
|
|
||||||
#define TYPE_PNV_PHB5_ROOT_PORT "pnv-phb5-root-port"
|
|
||||||
|
|
||||||
typedef struct PnvPHB4RootPort {
|
|
||||||
PCIESlot parent_obj;
|
|
||||||
} PnvPHB4RootPort;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* PHB4 PCIe Host Bridge for PowerNV machines (POWER9)
|
* PHB4 PCIe Host Bridge for PowerNV machines (POWER9)
|
||||||
|
Loading…
Reference in New Issue
Block a user