powerpc/powernv: Make pnv_pci_sriov_enable() and friends static
PATCH 1/2 powerpc/powernv: Make pnv_pci_sriov_enable() and friends static
The kernel test robot noticed these are non-static which causes Clang to print some warnings. These are called via ppc_md function pointers so there's no need for them to be non-static.
--- arch/powerpc/platforms/powernv/pci-ioda.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/powerpc/platforms/powernv/pci-ioda.c +4 -4
@@ -1490,7 +1490,7 @@ static void pnv_ioda_release_vf_PE(struct pci_dev *pdev) } } -void pnv_pci_sriov_disable (struct pci_dev *pdev) +static void pnv_pci_sriov_disable (struct pci_dev *pdev) {struct pci_bus *bus;struct pci_controller *hose;
@@ -1600,7 +1600,7 @@ static void pnv_ioda_setup_vf_PE(struct pci_dev *pdev, u16 num_vfs) } } -int pnv_pci_sriov_enable (struct pci_dev *pdev,u16 num_vfs) +static int pnv_pci_sriov_enable (struct pci_dev *pdev,u16 num_vfs) {struct pci_bus *bus;struct pci_controller *hose;
@@ -1715,7 +1715,7 @@ int pnv_pci_sriov_enable(struct pci_dev *pdev, u16 num_vfs)return ret; } -int pnv_pcibios_sriov_disable (struct pci_dev *pdev) +static int pnv_pcibios_sriov_disable (struct pci_dev *pdev) {pnv_pci_sriov_disable (pdev);
@@ -1724,7 +1724,7 @@ int pnv_pcibios_sriov_disable(struct pci_dev *pdev)return 0 ; } -int pnv_pcibios_sriov_enable (struct pci_dev *pdev,u16 num_vfs) +static int pnv_pcibios_sriov_enable (struct pci_dev *pdev,u16 num_vfs) {/* Allocate PCI data */ add_sriov_vf_pdns (pdev);
Signature · 1 line
2.26.2
PATCH 2/2 powerpc/powernv: Move pnv_ioda_setup_bus_dma under CONFIG_IOMMU_API
pnv_ioda_setup_bus_dma() is only used when a passed through PE is returned to the host. If the kernel is built without IOMMU support this is dead code. Move it under the #ifdef with the rest of the IOMMU API support.
--- 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) {
@@ -2547,6 +2534,19 @@ static long pnv_pci_ioda2_create_table_userspace(return ret; } +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 void pnv_ioda2_take_ownership (struct iommu_table_group *table_group) { struct pnv_ioda_pe *pe = container_of(table_group, struct pnv_ioda_pe,
Signature · 1 line
2.26.2
Re: [PATCH 2/2] powerpc/powernv: Move pnv_ioda_setup_bus_dma under CONFIG_IOMMU_API
Quoted 3 lines · Oliver O'Halloran
pnv_ioda_setup_bus_dma()is only used when a passed through PE is returned to the host. If the kernel is built without IOMMU support this is dead code.
True.
Quoted 54 lines
Move it under the #ifdef with the rest of the
IOMMU API support.Reported-by kernel test robot <[email protected]>Signed-off-by Oliver O'Halloran <[email protected]>--- 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) {@@ -2547,6 +2534,19 @@ static long pnv_pci_ioda2_create_table_userspace(return ret; } +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 void pnv_ioda2_take_ownership (struct iommu_table_group *table_group) { struct pnv_ioda_pe *pe = container_of(table_group, struct pnv_ioda_pe,
Signature · 1 line
Alexey
Michael Ellerman
AppliedQuoted 3 lines · Oliver O'Halloran
The kernel test robot noticed these are non-static which causes Clang to print some warnings. These are called via
ppc_mdfunction pointers so there's no need for them to be non-static.
Applied to powerpc/next.
[1/2] powerpc/powernv: Make pnv_pci_sriov_enable() and friends static
https://git.kernel.org/powerpc/c/93eacd94e09db2b1bb0343f8115385e5c34abf0a [2/2] powerpc/powernv: Move pnv_ioda_setup_bus_dma under CONFIG_IOMMU_API https://git.kernel.org/powerpc/c/e3417faec526cbf97773dca691dcd743f5bfeb64
cheers