@@ -936,14 +936,17 @@ static void populate_resource_props(PCIDevice *d, ResourceProps *rp)
rp->assigned_len = assigned_idx * sizeof(ResourceFields);
}
+static uint32_t spapr_phb_get_pci_drc_index(sPAPRPHBState *phb,
+ PCIDevice *pdev);
+
static int spapr_populate_pci_child_dt(PCIDevice *dev, void *fdt, int offset,
- int phb_index, int drc_index,
sPAPRPHBState *sphb)
{
ResourceProps rp;
bool is_bridge = false;
int pci_status;
char *buf = NULL;
+ uint32_t drc_index = spapr_phb_get_pci_drc_index(sphb, dev);
if (pci_default_read_config(dev, PCI_HEADER_TYPE, 1) ==
PCI_HEADER_TYPE_BRIDGE) {
@@ -1038,9 +1041,6 @@ typedef struct sPAPRFDT {
sPAPRPHBState *sphb;
} sPAPRFDT;
-static uint32_t spapr_phb_get_pci_drc_index(sPAPRPHBState *phb,
- PCIDevice *pdev);
-
/* create OF node for pci device and required OF DT properties */
static int spapr_create_pci_child_dt(PCIDevice *dev, sPAPRFDT *p)
{
@@ -1048,7 +1048,6 @@ static int spapr_create_pci_child_dt(PCIDevice *dev, sPAPRFDT *p)
int slot = PCI_SLOT(dev->devfn);
int func = PCI_FUNC(dev->devfn);
char nodename[FDT_NAME_MAX];
- uint32_t drc_index = spapr_phb_get_pci_drc_index(p->sphb, dev);
if (func != 0) {
snprintf(nodename, FDT_NAME_MAX, "pci@%x,%x", slot, func);
@@ -1056,8 +1055,7 @@ static int spapr_create_pci_child_dt(PCIDevice *dev, sPAPRFDT *p)
snprintf(nodename, FDT_NAME_MAX, "pci@%x", slot);
}
offset = fdt_add_subnode(p->fdt, p->node_off, nodename);
- ret = spapr_populate_pci_child_dt(dev, p->fdt, offset, p->sphb->index,
- drc_index, p->sphb);
+ ret = spapr_populate_pci_child_dt(dev, p->fdt, offset, p->sphb);
g_assert(!ret);
if (ret) {
return 0;
* phb_index is not being used and if required can be obtained from sphb * use helper to get drc_index in this function Suggested-by: Alexey Kardashevskiy <aik@ozlabs.ru> Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com> --- hw/ppc/spapr_pci.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)