spapr_pci: add an extra 'nr_msis' argument to spapr_populate_pci_dt
PATCH 1/1 spapr_pci: add an extra 'nr_msis' argument to spapr_populate_pci_dt
So that we don't have to call qdev_get_machine() to get the machine class and the sPAPRIrq backend holding the number of MSIs.
Signed-off-by Cédric Le Goater <[email protected]>
--- include/hw/pci-host/spapr.h | 5 ++--- hw/ppc/spapr.c | 2 +- hw/ppc/spapr_pci.c | 9 +++------ 3 files changed, 6 insertions(+), 10 deletions(-)
include/hw/pci-host/spapr.h +2 -3
@@ -113,9 +113,8 @@ static inline qemu_irq spapr_phb_lsi_qirq(struct sPAPRPHBState *phb, int pin)PCIHostState *spapr_create_phb (sPAPRMachineState *spapr,int index); -int spapr_populate_pci_dt (sPAPRPHBState *phb, -uint32_t xics_phandle, -void *fdt); +int spapr_populate_pci_dt (sPAPRPHBState *phb,uint32_t xics_phandle,void *fdt, +uint32_t nr_msis);void spapr_pci_rtas_init (void );
hw/ppc/spapr.c +1 -1
@@ -1267,7 +1267,7 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr, } QLIST_FOREACH(phb, &spapr->phbs, list) { - ret =spapr_populate_pci_dt (phb,PHANDLE_XICP , fdt); + ret =spapr_populate_pci_dt (phb,PHANDLE_XICP , fdt, smc->irq->nr_msis);if (ret <0 ) {error_report ("couldn't setup PCI devices in fdt" );exit (1 );
hw/ppc/spapr_pci.c +3 -6
@@ -2069,9 +2069,8 @@ static void spapr_phb_pci_enumerate(sPAPRPHBState *phb) } -int spapr_populate_pci_dt (sPAPRPHBState *phb, -uint32_t xics_phandle, -void *fdt) +int spapr_populate_pci_dt (sPAPRPHBState *phb,uint32_t xics_phandle,void *fdt, +uint32_t nr_msis) {int bus_off, i, j, ret;gchar *nodename;
@@ -2121,7 +2120,6 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb,sPAPRTCETable *tcet;PCIBus *bus =PCI_HOST_BRIDGE (phb)->bus;sPAPRFDT s_fdt; -sPAPRMachineClass *smc =SPAPR_MACHINE_GET_CLASS (qdev_get_machine ());/* Start populating the FDT */ nodename =g_strdup_printf ("pci@%" PRIx64, phb->buid);
@@ -2139,8 +2137,7 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb,_FDT (fdt_setprop (fdt, bus_off,"ranges" , &ranges, sizeof_ranges));_FDT (fdt_setprop (fdt, bus_off,"reg" , &bus_reg,sizeof (bus_reg)));_FDT (fdt_setprop_cell (fdt, bus_off,"ibm,pci-config-space-type" ,0x1 )); -_FDT (fdt_setprop_cell (fdt, bus_off,"ibm,pe-total-#msi" , - smc->irq->nr_msis)); +_FDT (fdt_setprop_cell (fdt, bus_off,"ibm,pe-total-#msi" , nr_msis));/* Dynamic DMA window */ if (phb->ddw_enabled) {
Signature · 1 line
2.17.1
Quoted 5 lines · On Thu, 13 Sep 2018 07:16:05 +0200 Cédric Le Goater <[email protected]> wrote:
So that we don't have to call
qdev_get_machine()to get the machine class and the sPAPRIrq backend holding the number of MSIs.Signed-off-by Cédric Le Goater <[email protected]>---
Reviewed-by Greg Kurz <[email protected]>
Quoted 68 lines
include/hw/pci-host/spapr.h | 5 ++--- hw/ppc/spapr.c | 2 +- hw/ppc/spapr_pci.c | 9 +++------ 3 files changed, 6 insertions(+), 10 deletions(-)include/hw/pci-host/spapr.h +2
-3@@ -113,9 +113,8 @@ static inline qemu_irq spapr_phb_lsi_qirq(struct sPAPRPHBState *phb, int pin)PCIHostState *spapr_create_phb (sPAPRMachineState *spapr,int index); -int spapr_populate_pci_dt (sPAPRPHBState *phb, -uint32_t xics_phandle, -void *fdt); +int spapr_populate_pci_dt (sPAPRPHBState *phb,uint32_t xics_phandle,void *fdt, +uint32_t nr_msis);void spapr_pci_rtas_init (void );hw/ppc/spapr.c +1
-1@@ -1267,7 +1267,7 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr, } QLIST_FOREACH(phb, &spapr->phbs, list) { - ret =spapr_populate_pci_dt (phb,PHANDLE_XICP , fdt); + ret =spapr_populate_pci_dt (phb,PHANDLE_XICP , fdt, smc->irq->nr_msis);if (ret <0 ) {error_report ("couldn't setup PCI devices in fdt" );exit (1 );hw/ppc/spapr_pci.c +3
-6@@ -2069,9 +2069,8 @@ static void spapr_phb_pci_enumerate(sPAPRPHBState *phb) } -int spapr_populate_pci_dt (sPAPRPHBState *phb, -uint32_t xics_phandle, -void *fdt) +int spapr_populate_pci_dt (sPAPRPHBState *phb,uint32_t xics_phandle,void *fdt, +uint32_t nr_msis) {int bus_off, i, j, ret;gchar *nodename;@@ -2121,7 +2120,6 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb,sPAPRTCETable *tcet;PCIBus *bus =PCI_HOST_BRIDGE (phb)->bus;sPAPRFDT s_fdt; -sPAPRMachineClass *smc =SPAPR_MACHINE_GET_CLASS (qdev_get_machine ());/* Start populating the FDT */ nodename =g_strdup_printf ("pci@%" PRIx64, phb->buid);@@ -2139,8 +2137,7 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb,_FDT (fdt_setprop (fdt, bus_off,"ranges" , &ranges, sizeof_ranges));_FDT (fdt_setprop (fdt, bus_off,"reg" , &bus_reg,sizeof (bus_reg)));_FDT (fdt_setprop_cell (fdt, bus_off,"ibm,pci-config-space-type" ,0x1 )); -_FDT (fdt_setprop_cell (fdt, bus_off,"ibm,pe-total-#msi" , - smc->irq->nr_msis)); +_FDT (fdt_setprop_cell (fdt, bus_off,"ibm,pe-total-#msi" , nr_msis));/* Dynamic DMA window */ if (phb->ddw_enabled) {
David Gibson
AppliedQuoted 4 lines · Cédric Le Goater
So that we don't have to call
qdev_get_machine()to get the machine class and the sPAPRIrq backend holding the number of MSIs.Signed-off-by Cédric Le Goater <[email protected]>
Applied, thanks.
Quoted 69 lines
--- include/hw/pci-host/spapr.h | 5 ++--- hw/ppc/spapr.c | 2 +- hw/ppc/spapr_pci.c | 9 +++------ 3 files changed, 6 insertions(+), 10 deletions(-)include/hw/pci-host/spapr.h +2
-3@@ -113,9 +113,8 @@ static inline qemu_irq spapr_phb_lsi_qirq(struct sPAPRPHBState *phb, int pin)PCIHostState *spapr_create_phb (sPAPRMachineState *spapr,int index); -int spapr_populate_pci_dt (sPAPRPHBState *phb, -uint32_t xics_phandle, -void *fdt); +int spapr_populate_pci_dt (sPAPRPHBState *phb,uint32_t xics_phandle,void *fdt, +uint32_t nr_msis);void spapr_pci_rtas_init (void );hw/ppc/spapr.c +1
-1@@ -1267,7 +1267,7 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr, } QLIST_FOREACH(phb, &spapr->phbs, list) { - ret =spapr_populate_pci_dt (phb,PHANDLE_XICP , fdt); + ret =spapr_populate_pci_dt (phb,PHANDLE_XICP , fdt, smc->irq->nr_msis);if (ret <0 ) {error_report ("couldn't setup PCI devices in fdt" );exit (1 );hw/ppc/spapr_pci.c +3
-6@@ -2069,9 +2069,8 @@ static void spapr_phb_pci_enumerate(sPAPRPHBState *phb) } -int spapr_populate_pci_dt (sPAPRPHBState *phb, -uint32_t xics_phandle, -void *fdt) +int spapr_populate_pci_dt (sPAPRPHBState *phb,uint32_t xics_phandle,void *fdt, +uint32_t nr_msis) {int bus_off, i, j, ret;gchar *nodename;@@ -2121,7 +2120,6 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb,sPAPRTCETable *tcet;PCIBus *bus =PCI_HOST_BRIDGE (phb)->bus;sPAPRFDT s_fdt; -sPAPRMachineClass *smc =SPAPR_MACHINE_GET_CLASS (qdev_get_machine ());/* Start populating the FDT */ nodename =g_strdup_printf ("pci@%" PRIx64, phb->buid);@@ -2139,8 +2137,7 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb,_FDT (fdt_setprop (fdt, bus_off,"ranges" , &ranges, sizeof_ranges));_FDT (fdt_setprop (fdt, bus_off,"reg" , &bus_reg,sizeof (bus_reg)));_FDT (fdt_setprop_cell (fdt, bus_off,"ibm,pci-config-space-type" ,0x1 )); -_FDT (fdt_setprop_cell (fdt, bus_off,"ibm,pe-total-#msi" , - smc->irq->nr_msis)); +_FDT (fdt_setprop_cell (fdt, bus_off,"ibm,pe-total-#msi" , nr_msis));/* Dynamic DMA window */ if (phb->ddw_enabled) {
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson