Commit 53522982 authored by Andrew Donnellan's avatar Andrew Donnellan Committed by Michael Ellerman
Browse files

powerpc/powernv: move dma_get_required_mask from pnv_phb to pci_controller_ops 



Simplify the dma_get_required_mask call chain by moving it from pnv_phb to
pci_controller_ops, similar to commit 763d2d8d ("powerpc/powernv:
Move dma_set_mask from pnv_phb to pci_controller_ops").

Previous call chain:

  0) call dma_get_required_mask() (kernel/dma.c)
  1) call ppc_md.dma_get_required_mask, if it exists. On powernv, that
     points to pnv_dma_get_required_mask() (platforms/powernv/setup.c)
  2) device is PCI, therefore call pnv_pci_dma_get_required_mask()
     (platforms/powernv/pci.c)
  3) call phb->dma_get_required_mask if it exists
  4) it only exists in the ioda case, where it points to
       pnv_pci_ioda_dma_get_required_mask() (platforms/powernv/pci-ioda.c)

New call chain:

  0) call dma_get_required_mask() (kernel/dma.c)
  1) device is PCI, therefore call pci_controller_ops.dma_get_required_mask
     if it exists
  2) in the ioda case, that points to pnv_pci_ioda_dma_get_required_mask()
     (platforms/powernv/pci-ioda.c)

In the p5ioc2 case, the call chain remains the same -
dma_get_required_mask() does not find either a ppc_md call or
pci_controller_ops call, so it calls __dma_get_required_mask().

Signed-off-by: default avatarAndrew Donnellan <andrew.donnellan@au1.ibm.com>
Reviewed-by: default avatarDaniel Axtens <dja@axtens.net>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 73b341ef

arch/powerpc/include/asm/pci-bridge.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ struct pci_controller_ops { 
#endif



	int             (*dma_set_mask)(struct pci_dev *dev, u64 dma_mask);

	u64		(*dma_get_required_mask)(struct pci_dev *dev);



	void		(*shutdown)(struct pci_controller *);

};

arch/powerpc/kernel/dma.c

+7 −0
Original line number Diff line number Diff line
@@ -353,6 +353,13 @@ u64 dma_get_required_mask(struct device *dev) 
	if (ppc_md.dma_get_required_mask)

		return ppc_md.dma_get_required_mask(dev);



	if (dev_is_pci(dev)) {

		struct pci_dev *pdev = to_pci_dev(dev);

		struct pci_controller *phb = pci_bus_to_host(pdev->bus);

		if (phb->controller_ops.dma_get_required_mask)

			return phb->controller_ops.dma_get_required_mask(pdev);

	}



	return __dma_get_required_mask(dev);

}

EXPORT_SYMBOL_GPL(dma_get_required_mask);

arch/powerpc/platforms/powernv/pci-ioda.c

+4 −3
Original line number Diff line number Diff line
@@ -1597,9 +1597,10 @@ static int pnv_pci_ioda_dma_set_mask(struct pci_dev *pdev, u64 dma_mask) 
	return 0;

}



static u64 pnv_pci_ioda_dma_get_required_mask(struct pnv_phb *phb,

					      struct pci_dev *pdev)

static u64 pnv_pci_ioda_dma_get_required_mask(struct pci_dev *pdev)

{

	struct pci_controller *hose = pci_bus_to_host(pdev->bus);

	struct pnv_phb *phb = hose->private_data;

	struct pci_dn *pdn = pci_get_pdn(pdev);

	struct pnv_ioda_pe *pe;

	u64 end, mask;
@@ -3024,6 +3025,7 @@ static const struct pci_controller_ops pnv_pci_ioda_controller_ops = { 
       .window_alignment = pnv_pci_window_alignment,

       .reset_secondary_bus = pnv_pci_reset_secondary_bus,

       .dma_set_mask = pnv_pci_ioda_dma_set_mask,

       .dma_get_required_mask = pnv_pci_ioda_dma_get_required_mask,

       .shutdown = pnv_pci_ioda_shutdown,

};
@@ -3170,7 +3172,6 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np, 


	/* Setup TCEs */

	phb->dma_dev_setup = pnv_pci_ioda_dma_dev_setup;

	phb->dma_get_required_mask = pnv_pci_ioda_dma_get_required_mask;



	/* Setup MSI support */

	pnv_pci_init_ioda_msis(phb);

arch/powerpc/platforms/powernv/pci.c

+0 −11
Original line number Diff line number Diff line
@@ -761,17 +761,6 @@ void pnv_pci_dma_dev_setup(struct pci_dev *pdev) 
		phb->dma_dev_setup(phb, pdev);

}



u64 pnv_pci_dma_get_required_mask(struct pci_dev *pdev)

{

	struct pci_controller *hose = pci_bus_to_host(pdev->bus);

	struct pnv_phb *phb = hose->private_data;



	if (phb && phb->dma_get_required_mask)

		return phb->dma_get_required_mask(phb, pdev);



	return __dma_get_required_mask(&pdev->dev);

}



void pnv_pci_shutdown(void)

{

	struct pci_controller *hose;

arch/powerpc/platforms/powernv/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -105,8 +105,6 @@ struct pnv_phb { 
			 unsigned int hwirq, unsigned int virq,

			 unsigned int is_64, struct msi_msg *msg);

	void (*dma_dev_setup)(struct pnv_phb *phb, struct pci_dev *pdev);

	u64 (*dma_get_required_mask)(struct pnv_phb *phb,

				     struct pci_dev *pdev);

	void (*fixup_phb)(struct pci_controller *hose);

	u32 (*bdfn_to_pe)(struct pnv_phb *phb, struct pci_bus *bus, u32 devfn);

	int (*init_m64)(struct pnv_phb *phb);

CRA Git | Maintained and supported by SUSTech CRA and CCSE