Commit 946743d0 authored by Oliver O'Halloran's avatar Oliver O'Halloran Committed by Michael Ellerman
Browse files

powernv/pci: Move pnv_pci_dma_bus_setup() to pci-ioda.c 



This is only used in pci-ioda.c so move it there and rename it to match.

Signed-off-by: default avatarOliver O'Halloran <oohall@gmail.com>
Reviewed-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200110070207.439-6-oohall@gmail.com
parent 0a25d9c4

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

+21 −1
Original line number Diff line number Diff line
@@ -3691,9 +3691,29 @@ static void pnv_pci_ioda_shutdown(struct pci_controller *hose) 
		       OPAL_ASSERT_RESET);

}



static void pnv_pci_ioda_dma_bus_setup(struct pci_bus *bus)

{

	struct pci_controller *hose = bus->sysdata;

	struct pnv_phb *phb = hose->private_data;

	struct pnv_ioda_pe *pe;



	list_for_each_entry(pe, &phb->ioda.pe_list, list) {

		if (!(pe->flags & (PNV_IODA_PE_BUS | PNV_IODA_PE_BUS_ALL)))

			continue;



		if (!pe->pbus)

			continue;



		if (bus->number == ((pe->rid >> 8) & 0xFF)) {

			pe->pbus = bus;

			break;

		}

	}

}



static const struct pci_controller_ops pnv_pci_ioda_controller_ops = {

	.dma_dev_setup		= pnv_pci_ioda_dma_dev_setup,

	.dma_bus_setup		= pnv_pci_dma_bus_setup,

	.dma_bus_setup		= pnv_pci_ioda_dma_bus_setup,

	.iommu_bypass_supported	= pnv_pci_ioda_iommu_bypass_supported,

	.setup_msi_irqs		= pnv_setup_msi_irqs,

	.teardown_msi_irqs	= pnv_teardown_msi_irqs,

arch/powerpc/platforms/powernv/pci.c

+0 −20
Original line number Diff line number Diff line
@@ -814,26 +814,6 @@ struct iommu_table *pnv_pci_table_alloc(int nid) 
	return tbl;

}



void pnv_pci_dma_bus_setup(struct pci_bus *bus)

{

	struct pci_controller *hose = bus->sysdata;

	struct pnv_phb *phb = hose->private_data;

	struct pnv_ioda_pe *pe;



	list_for_each_entry(pe, &phb->ioda.pe_list, list) {

		if (!(pe->flags & (PNV_IODA_PE_BUS | PNV_IODA_PE_BUS_ALL)))

			continue;



		if (!pe->pbus)

			continue;



		if (bus->number == ((pe->rid >> 8) & 0xFF)) {

			pe->pbus = bus;

			break;

		}

	}

}



struct device_node *pnv_pci_get_phb_node(struct pci_dev *dev)

{

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

arch/powerpc/platforms/powernv/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -188,7 +188,6 @@ extern void pnv_npu2_map_lpar(struct pnv_ioda_pe *gpe, unsigned long msr); 
extern void pnv_pci_reset_secondary_bus(struct pci_dev *dev);

extern int pnv_eeh_phb_reset(struct pci_controller *hose, int option);



extern void pnv_pci_dma_bus_setup(struct pci_bus *bus);

extern int pnv_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type);

extern void pnv_teardown_msi_irqs(struct pci_dev *pdev);

extern struct pnv_ioda_pe *pnv_ioda_get_pe(struct pci_dev *dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE