[PATCH kernel] powerpc/powernv/ioda1: Remove dead code for a single device PE

[PATCH kernel] powerpc/powernv/ioda1: Remove dead code for a single device PE

[Alexey Kardashevskiy]

At the moment PNV_IODA_PE_DEV is only used for NPU PEs which are not
present on IODA1 machines (i.e. POWER7) so let's remove a piece of
dead code.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---

We might actually want to get rid of the entire IODA1 there.
---
 arch/powerpc/platforms/powernv/pci-ioda.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index cde7102..78b61f0 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -2367,15 +2367,7 @@ static void pnv_pci_ioda1_setup_dma_pe(struct pnv_phb *phb,
 	pe->table_group.tce32_size = tbl->it_size << tbl->it_page_shift;
 	iommu_init_table(tbl, phb->hose->node);
 
-	if (pe->flags & PNV_IODA_PE_DEV) {
-		/*
-		 * Setting table base here only for carrying iommu_group
-		 * further down to let iommu_add_device() do the job.
-		 * pnv_pci_ioda_dma_dev_setup will override it later anyway.
-		 */
-		set_iommu_table_base(&pe->pdev->dev, tbl);
-		iommu_add_device(&pe->pdev->dev);
-	} else if (pe->flags & (PNV_IODA_PE_BUS | PNV_IODA_PE_BUS_ALL))
+	if (pe->flags & (PNV_IODA_PE_BUS | PNV_IODA_PE_BUS_ALL))
 		pnv_ioda_setup_bus_dma(pe, pe->pbus, true);
 
 	return;
-- 
2.11.0

Re: [PATCH kernel] powerpc/powernv/ioda1: Remove dead code for a single device PE

[Alexey Kardashevskiy]

Ping?


On 16/10/2018 13:30, Alexey Kardashevskiy wrote:
> At the moment PNV_IODA_PE_DEV is only used for NPU PEs which are not
> present on IODA1 machines (i.e. POWER7) so let's remove a piece of
> dead code.
> 
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> ---
> 
> We might actually want to get rid of the entire IODA1 there.
> ---
>  arch/powerpc/platforms/powernv/pci-ioda.c | 10 +---------
>  1 file changed, 1 insertion(+), 9 deletions(-)
> 
> diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
> index cde7102..78b61f0 100644
> --- a/arch/powerpc/platforms/powernv/pci-ioda.c
> +++ b/arch/powerpc/platforms/powernv/pci-ioda.c
> @@ -2367,15 +2367,7 @@ static void pnv_pci_ioda1_setup_dma_pe(struct pnv_phb *phb,
>  	pe->table_group.tce32_size = tbl->it_size << tbl->it_page_shift;
>  	iommu_init_table(tbl, phb->hose->node);
>  
> -	if (pe->flags & PNV_IODA_PE_DEV) {
> -		/*
> -		 * Setting table base here only for carrying iommu_group
> -		 * further down to let iommu_add_device() do the job.
> -		 * pnv_pci_ioda_dma_dev_setup will override it later anyway.
> -		 */
> -		set_iommu_table_base(&pe->pdev->dev, tbl);
> -		iommu_add_device(&pe->pdev->dev);
> -	} else if (pe->flags & (PNV_IODA_PE_BUS | PNV_IODA_PE_BUS_ALL))
> +	if (pe->flags & (PNV_IODA_PE_BUS | PNV_IODA_PE_BUS_ALL))
>  		pnv_ioda_setup_bus_dma(pe, pe->pbus, true);
>  
>  	return;
> 

-- 
Alexey

Re: [PATCH kernel] powerpc/powernv/ioda1: Remove dead code for a single device PE

[Sam Bobroff]

[-- Attachment #1: Type: text/plain, Size: 1826 bytes --]

On Thu, Nov 08, 2018 at 04:45:04PM +1100, Alexey Kardashevskiy wrote:
> Ping?
> 
> 
> On 16/10/2018 13:30, Alexey Kardashevskiy wrote:
> > At the moment PNV_IODA_PE_DEV is only used for NPU PEs which are not
> > present on IODA1 machines (i.e. POWER7) so let's remove a piece of
> > dead code.
> > 
> > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> > ---
> > 
> > We might actually want to get rid of the entire IODA1 there.
> > ---
> >  arch/powerpc/platforms/powernv/pci-ioda.c | 10 +---------
> >  1 file changed, 1 insertion(+), 9 deletions(-)
> > 
> > diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
> > index cde7102..78b61f0 100644
> > --- a/arch/powerpc/platforms/powernv/pci-ioda.c
> > +++ b/arch/powerpc/platforms/powernv/pci-ioda.c
> > @@ -2367,15 +2367,7 @@ static void pnv_pci_ioda1_setup_dma_pe(struct pnv_phb *phb,
> >  	pe->table_group.tce32_size = tbl->it_size << tbl->it_page_shift;
> >  	iommu_init_table(tbl, phb->hose->node);
> >  
> > -	if (pe->flags & PNV_IODA_PE_DEV) {
> > -		/*
> > -		 * Setting table base here only for carrying iommu_group
> > -		 * further down to let iommu_add_device() do the job.
> > -		 * pnv_pci_ioda_dma_dev_setup will override it later anyway.
> > -		 */
> > -		set_iommu_table_base(&pe->pdev->dev, tbl);
> > -		iommu_add_device(&pe->pdev->dev);
> > -	} else if (pe->flags & (PNV_IODA_PE_BUS | PNV_IODA_PE_BUS_ALL))
> > +	if (pe->flags & (PNV_IODA_PE_BUS | PNV_IODA_PE_BUS_ALL))
> >  		pnv_ioda_setup_bus_dma(pe, pe->pbus, true);
> >  
> >  	return;
> > 
> 
> -- 
> Alexey
> 

Looks good to me. It's pretty easy to see that PNV_IODA_PE_DEV is only
set for PHBs that are PNV_PHB_NPU_NVLINK or PNV_PHB_NPU_OCAPI, so:

Reviewed-by: Sam Bobroff <sbobroff@linux.ibm.com>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [kernel] powerpc/powernv/ioda1: Remove dead code for a single device PE

[Michael Ellerman]

On Tue, 2018-10-16 at 02:30:03 UTC, Alexey Kardashevskiy wrote:
> At the moment PNV_IODA_PE_DEV is only used for NPU PEs which are not
> present on IODA1 machines (i.e. POWER7) so let's remove a piece of
> dead code.
> 
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> Reviewed-by: Sam Bobroff <sbobroff@linux.ibm.com>

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/f21b0a45e4e48eafca38f11612244c

cheers