powerpc/powernv/pci: add ifdef to avoid dead code
PATCH 1/1 powerpc/powernv/pci: add ifdef to avoid dead code
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 withoutCONFIG_IOMMU_API see:
arch/powerpc/platforms/powernv/pci-ioda.c:1888:13: error: 'pnv_ioda_setup_bus_dma' defined but not used
Add CONFIG_IOMMU_API ifdef guard to avoid dead code.
--- arch/powerpc/platforms/powernv/pci-ioda.c | 2 ++ 1 file changed, 2 insertions(+)
arch/powerpc/platforms/powernv/pci-ioda.c +2 -0
@@ -1885,6 +1885,7 @@ static bool pnv_pci_ioda_iommu_bypass_supported(struct pci_dev *pdev,return false; } +#ifdef CONFIG_IOMMU_API static void pnv_ioda_setup_bus_dma (struct pnv_ioda_pe *pe,struct pci_bus *bus) {struct pci_dev *dev;
@@ -1897,6 +1898,7 @@ static void pnv_ioda_setup_bus_dma(struct pnv_ioda_pe *pe, struct pci_bus *bus) pnv_ioda_setup_bus_dma(pe, dev->subordinate); } } +#endif static inline __be64 __iomem *pnv_ioda_get_inval_reg (struct pnv_phb *phb,bool real_mode)
Signature · 1 line
2.27.0.290.gba653c62da-goog
Hi,
Le 14/06/2020 à 07:54, Greg Thelen a écrit :
Quoted 7 lines
Commit
dc3d8f85bb57("powerpc/powernv/pci: Re-work bus PE
configuration") removed a couplepnv_ioda_setup_bus_dma()calls. The
only remaining calls are behindCONFIG_IOMMU_API. Thus builds withoutCONFIG_IOMMU_APIsee:
arch/powerpc/platforms/powernv/pci-ioda.c:1888:13: error: 'pnv_ioda_setup_bus_dma' defined but not usedAdd
CONFIG_IOMMU_APIifdef guard to avoid dead code.
I think you should move the function down into the same ifdef as the callers instead of adding a new ifdef.
Christophe
Quoted 28 lines
Fixes dc3d8f85bb57 ("powerpc/powernv/pci: Re-work bus PE configuration")Signed-off-by Greg Thelen <[email protected]>--- arch/powerpc/platforms/powernv/pci-ioda.c | 2 ++ 1 file changed, 2 insertions(+)arch/powerpc/platforms/powernv/pci-ioda.c +2
-0@@ -1885,6 +1885,7 @@ static bool pnv_pci_ioda_iommu_bypass_supported(struct pci_dev *pdev,return false; } +#ifdef CONFIG_IOMMU_API static void pnv_ioda_setup_bus_dma (struct pnv_ioda_pe *pe,struct pci_bus *bus) {struct pci_dev *dev;@@ -1897,6 +1898,7 @@ static void pnv_ioda_setup_bus_dma(struct pnv_ioda_pe *pe, struct pci_bus *bus) pnv_ioda_setup_bus_dma(pe, dev->subordinate); } } +#endif static inline __be64 __iomem *pnv_ioda_get_inval_reg (struct pnv_phb *phb,bool real_mode)
PATCH v2 1/1 powerpc/powernv/pci: use ifdef to avoid dead code
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 withoutCONFIG_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.
--- arch/powerpc/platforms/powernv/pci-ioda.c | 26 +++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-)
arch/powerpc/platforms/powernv/pci-ioda.c +13 -13
@@ -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) {
Signature · 1 line
2.27.0.290.gba653c62da-goog
Re: [PATCH v2] powerpc/powernv/pci: use ifdef to avoid dead code
Quoted 8 lines · Greg Thelen
Commit
dc3d8f85bb57("powerpc/powernv/pci: Re-work bus PE
configuration") removed a couplepnv_ioda_setup_bus_dma()calls. The
only remaining calls are behindCONFIG_IOMMU_API. Thus builds withoutCONFIG_IOMMU_APIsee:
arch/powerpc/platforms/powernv/pci-ioda.c:1888:13: error: 'pnv_ioda_setup_bus_dma' defined but not usedMove
pnv_ioda_setup_bus_dma()underCONFIG_IOMMU_APIto avoid dead code.
Doh! Thanks for the fix.
Re: [PATCH v2] powerpc/powernv/pci: use ifdef to avoid dead code
Quoted 8 lines · Oliver O'Halloran
Quoted 7 lines · Greg Thelen
Commit
dc3d8f85bb57("powerpc/powernv/pci: Re-work bus PE
configuration") removed a couplepnv_ioda_setup_bus_dma()calls. The
only remaining calls are behindCONFIG_IOMMU_API. Thus builds withoutCONFIG_IOMMU_APIsee:
arch/powerpc/platforms/powernv/pci-ioda.c:1888:13: error: 'pnv_ioda_setup_bus_dma' defined but not used
Quoted 5 lines
Quoted 1 line
Move
pnv_ioda_setup_bus_dma()underCONFIG_IOMMU_APIto avoid dead code.Doh! Thanks for the fix.
Reviewed-by Oliver O'Halloran <[email protected]>
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.
Re: [PATCH v2] powerpc/powernv/pci: use ifdef to avoid dead code
Quoted 11 lines · Greg Thelen
Quoted 8 lines · Oliver O'Halloran
Quoted 7 lines · Greg Thelen
Commit
dc3d8f85bb57("powerpc/powernv/pci: Re-work bus PE
configuration") removed a couplepnv_ioda_setup_bus_dma()calls. The
only remaining calls are behindCONFIG_IOMMU_API. Thus builds withoutCONFIG_IOMMU_APIsee:
arch/powerpc/platforms/powernv/pci-ioda.c:1888:13: error: 'pnv_ioda_setup_bus_dma' defined but not used
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Move
pnv_ioda_setup_bus_dma()underCONFIG_IOMMU_APIto avoid dead code.Doh! Thanks for the fix.
Reviewed-by Oliver O'Halloran <[email protected]>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