| Message ID | 20200614233235.121432-1-gthelen@google.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] powerpc/powernv/pci: use ifdef to avoid dead code | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (062ce06f9dcd140b6cd97102fec593a57c5fb397) |
| snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 38 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch fixes a commit that hasn't been released yet |
On Mon, Jun 15, 2020 at 9:33 AM Greg Thelen <gthelen@google.com> wrote: > > Commit dc3d8f85bb57 ("powerpc/powernv/pci: Re-work bus PE > configuration") removed a couple pnv_ioda_setup_bus_dma() calls. The > only remaining calls are behind CONFIG_IOMMU_API. Thus builds without > CONFIG_IOMMU_API see: > arch/powerpc/platforms/powernv/pci-ioda.c:1888:13: error: 'pnv_ioda_setup_bus_dma' defined but not used > > Move pnv_ioda_setup_bus_dma() under CONFIG_IOMMU_API to avoid dead code. Doh! Thanks for the fix. Reviewed-by: Oliver O'Halloran <oohall@gmail.com>
Oliver O'Halloran <oohall@gmail.com> wrote: > On Mon, Jun 15, 2020 at 9:33 AM Greg Thelen <gthelen@google.com> wrote: >> >> Commit dc3d8f85bb57 ("powerpc/powernv/pci: Re-work bus PE >> configuration") removed a couple pnv_ioda_setup_bus_dma() calls. The >> only remaining calls are behind CONFIG_IOMMU_API. Thus builds without >> CONFIG_IOMMU_API see: >> arch/powerpc/platforms/powernv/pci-ioda.c:1888:13: error: 'pnv_ioda_setup_bus_dma' defined but not used >> >> Move pnv_ioda_setup_bus_dma() under CONFIG_IOMMU_API to avoid dead code. > > Doh! Thanks for the fix. > > Reviewed-by: Oliver O'Halloran <oohall@gmail.com> Is there anything else needed from me on this patch? Given that it fixes a 5.8 commit I figured it'd be 5.8 material.
On Sun, Jul 19, 2020 at 5:13 AM Greg Thelen <gthelen@google.com> wrote: > > Oliver O'Halloran <oohall@gmail.com> wrote: > > > On Mon, Jun 15, 2020 at 9:33 AM Greg Thelen <gthelen@google.com> wrote: > >> > >> Commit dc3d8f85bb57 ("powerpc/powernv/pci: Re-work bus PE > >> configuration") removed a couple pnv_ioda_setup_bus_dma() calls. The > >> only remaining calls are behind CONFIG_IOMMU_API. Thus builds without > >> CONFIG_IOMMU_API see: > >> arch/powerpc/platforms/powernv/pci-ioda.c:1888:13: error: 'pnv_ioda_setup_bus_dma' defined but not used > >> > >> Move pnv_ioda_setup_bus_dma() under CONFIG_IOMMU_API to avoid dead code. > > > > Doh! Thanks for the fix. > > > > Reviewed-by: Oliver O'Halloran <oohall@gmail.com> > > Is there anything else needed from me on this patch? > Given that it fixes a 5.8 commit I figured it'd be 5.8 material. Oh sorry, I completely forgot about this patch. I sent another series that included a more-or-less identical fix after the kbuild robot sent a reminder: http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=187630&state=* That's current in powerpc/next, but if it's causing a build break then I agree it should probably go into 5.8 too. Oliver
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index 73a63efcf855..743d840712da 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -1885,19 +1885,6 @@ static bool pnv_pci_ioda_iommu_bypass_supported(struct pci_dev *pdev, return false; } -static void pnv_ioda_setup_bus_dma(struct pnv_ioda_pe *pe, struct pci_bus *bus) -{ - struct pci_dev *dev; - - list_for_each_entry(dev, &bus->devices, bus_list) { - set_iommu_table_base(&dev->dev, pe->table_group.tables[0]); - dev->dev.archdata.dma_offset = pe->tce_bypass_base; - - if ((pe->flags & PNV_IODA_PE_BUS_ALL) && dev->subordinate) - pnv_ioda_setup_bus_dma(pe, dev->subordinate); - } -} - static inline __be64 __iomem *pnv_ioda_get_inval_reg(struct pnv_phb *phb, bool real_mode) { @@ -2501,6 +2488,19 @@ static long pnv_pci_ioda2_unset_window(struct iommu_table_group *table_group, #endif #ifdef CONFIG_IOMMU_API +static void pnv_ioda_setup_bus_dma(struct pnv_ioda_pe *pe, struct pci_bus *bus) +{ + struct pci_dev *dev; + + list_for_each_entry(dev, &bus->devices, bus_list) { + set_iommu_table_base(&dev->dev, pe->table_group.tables[0]); + dev->dev.archdata.dma_offset = pe->tce_bypass_base; + + if ((pe->flags & PNV_IODA_PE_BUS_ALL) && dev->subordinate) + pnv_ioda_setup_bus_dma(pe, dev->subordinate); + } +} + unsigned long pnv_pci_ioda2_get_table_size(__u32 page_shift, __u64 window_size, __u32 levels) {
Commit dc3d8f85bb57 ("powerpc/powernv/pci: Re-work bus PE configuration") removed a couple pnv_ioda_setup_bus_dma() calls. The only remaining calls are behind CONFIG_IOMMU_API. Thus builds without CONFIG_IOMMU_API see: arch/powerpc/platforms/powernv/pci-ioda.c:1888:13: error: 'pnv_ioda_setup_bus_dma' defined but not used Move pnv_ioda_setup_bus_dma() under CONFIG_IOMMU_API to avoid dead code. Fixes: dc3d8f85bb57 ("powerpc/powernv/pci: Re-work bus PE configuration") Signed-off-by: Greg Thelen <gthelen@google.com> --- arch/powerpc/platforms/powernv/pci-ioda.c | 26 +++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-)