[PATCH 5/7] powerpc/powernv/pci: Delete old iommu recursive iommu setup

[Alexey Kardashevskiy]

On 06/04/2020 13:07, Oliver O'Halloran wrote:
> No longer used.
> 
> Signed-off-by: Oliver O'Halloran <oohall at gmail.com>


Nit: you could fold it into 4/7.


Reviewed-by: Alexey Kardashevskiy <aik at ozlabs.ru>



> ---
>  arch/powerpc/platforms/powernv/pci-ioda.c | 32 -----------------------
>  1 file changed, 32 deletions(-)
> 
> diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
> index 9198b7882b57..8b45b8e561e9 100644
> --- a/arch/powerpc/platforms/powernv/pci-ioda.c
> +++ b/arch/powerpc/platforms/powernv/pci-ioda.c
> @@ -1550,11 +1550,6 @@ void pnv_pci_sriov_disable(struct pci_dev *pdev)
>  
>  static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb,
>  				       struct pnv_ioda_pe *pe);
> -#ifdef CONFIG_IOMMU_API
> -static void pnv_ioda_setup_bus_iommu_group(struct pnv_ioda_pe *pe,
> -		struct iommu_table_group *table_group, struct pci_bus *bus);
> -
> -#endif
>  static void pnv_ioda_setup_vf_PE(struct pci_dev *pdev, u16 num_vfs)
>  {
>  	struct pci_bus        *bus;
> @@ -2590,33 +2585,6 @@ static struct iommu_table_group_ops pnv_pci_ioda2_ops = {
>  	.release_ownership = pnv_ioda2_release_ownership,
>  };
>  
> -static void pnv_ioda_setup_bus_iommu_group_add_devices(struct pnv_ioda_pe *pe,
> -		struct iommu_table_group *table_group,
> -		struct pci_bus *bus)
> -{
> -	struct pci_dev *dev;
> -
> -	list_for_each_entry(dev, &bus->devices, bus_list) {
> -		iommu_add_device(table_group, &dev->dev);
> -
> -		if ((pe->flags & PNV_IODA_PE_BUS_ALL) && dev->subordinate)
> -			pnv_ioda_setup_bus_iommu_group_add_devices(pe,
> -					table_group, dev->subordinate);
> -	}
> -}
> -
> -static void pnv_ioda_setup_bus_iommu_group(struct pnv_ioda_pe *pe,
> -		struct iommu_table_group *table_group, struct pci_bus *bus)
> -{
> -
> -	if (pe->flags & PNV_IODA_PE_DEV)
> -		iommu_add_device(table_group, &pe->pdev->dev);
> -
> -	if ((pe->flags & (PNV_IODA_PE_BUS | PNV_IODA_PE_BUS_ALL)) || bus)
> -		pnv_ioda_setup_bus_iommu_group_add_devices(pe, table_group,
> -				bus);
> -}
> -
>  static unsigned long pnv_ioda_parse_tce_sizes(struct pnv_phb *phb);
>  
>  static void pnv_pci_ioda_setup_iommu_api(void)
> 

-- 
Alexey