| Message ID | 1462344751-28281-7-git-send-email-aik@ozlabs.ru |
|---|---|
| State | New |
| Headers | show |
On Wed, May 04, 2016 at 04:52:18PM +1000, Alexey Kardashevskiy wrote: > The user could have picked LIOBN via the CLI but the device tree > rendering code would still use the value derived from the PHB index > (which is the default fallback if LIOBN is not set in the CLI). > > This replaces SPAPR_PCI_LIOBN() with the actual DMA LIOBN value. > > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Applied to ppc-for-2.7. > --- > Changes: > v16: > * new in the series > --- > hw/ppc/spapr_pci.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c > index 573e635..742d127 100644 > --- a/hw/ppc/spapr_pci.c > +++ b/hw/ppc/spapr_pci.c > @@ -1815,7 +1815,7 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb, > _FDT(fdt_setprop(fdt, bus_off, "interrupt-map", &interrupt_map, > sizeof(interrupt_map))); > > - tcet = spapr_tce_find_by_liobn(SPAPR_PCI_LIOBN(phb->index, 0)); > + tcet = spapr_tce_find_by_liobn(phb->dma_liobn); > if (!tcet) { > return -1; > }
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 573e635..742d127 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -1815,7 +1815,7 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb, _FDT(fdt_setprop(fdt, bus_off, "interrupt-map", &interrupt_map, sizeof(interrupt_map))); - tcet = spapr_tce_find_by_liobn(SPAPR_PCI_LIOBN(phb->index, 0)); + tcet = spapr_tce_find_by_liobn(phb->dma_liobn); if (!tcet) { return -1; }
The user could have picked LIOBN via the CLI but the device tree rendering code would still use the value derived from the PHB index (which is the default fallback if LIOBN is not set in the CLI). This replaces SPAPR_PCI_LIOBN() with the actual DMA LIOBN value. Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> --- Changes: v16: * new in the series --- hw/ppc/spapr_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)