niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

powerpc/powernv/idoa: Remove unnecessary pcidev from pci_dn

Browse source 
The pcidev value stored in pci_dn is only used for NPU/NPU2
initialization. We can easily drop the cached pointer and
use an ancient helper - pci_get_domain_bus_and_slot() instead in order
to reduce complexity.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Acked-by: Russell Currey <ruscur@russell.cc>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Alexey Kardashevskiy 2017-10-23 19:07:02 +11:00 • committed by Michael Ellerman
parent 5c8136fa1a
commit 902bdc5745
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/powerpc/include/asm/pci-bridge.h
View file

@ -197,8 +197,6 @@ struct pci_dn {
struct iommu_table_group *table_group; /* for phb's or bridges */ struct iommu_table_group *table_group; /* for phb's or bridges */
int pci_ext_config_space; /* for pci devices */ int pci_ext_config_space; /* for pci devices */
struct pci_dev *pcidev; /* back-pointer to the pci device */
#ifdef CONFIG_EEH #ifdef CONFIG_EEH
struct eeh_dev *edev; /* eeh device */ struct eeh_dev *edev; /* eeh device */
#endif #endif

5
arch/powerpc/platforms/powernv/npu-dma.c
View file

@ -39,7 +39,10 @@
*/ */
static struct pci_dev *get_pci_dev(struct device_node *dn) static struct pci_dev *get_pci_dev(struct device_node *dn)
{ {
return PCI_DN(dn)->pcidev; struct pci_dn *pdn = PCI_DN(dn);
return pci_get_domain_bus_and_slot(pci_domain_nr(pdn->phb->bus),
pdn->busno, pdn->devfn);
} }
/* Given a NPU device get the associated PCI device. */ /* Given a NPU device get the associated PCI device. */

3
arch/powerpc/platforms/powernv/pci-ioda.c
View file

@ -1082,7 +1082,6 @@ static struct pnv_ioda_pe *pnv_ioda_setup_dev_PE(struct pci_dev *dev)
* At some point we want to remove the PDN completely anyways * At some point we want to remove the PDN completely anyways
*/ */
pci_dev_get(dev); pci_dev_get(dev);
pdn->pcidev = dev;
pdn->pe_number = pe->pe_number; pdn->pe_number = pe->pe_number;
pe->flags = PNV_IODA_PE_DEV; pe->flags = PNV_IODA_PE_DEV;
pe->pdev = dev; pe->pdev = dev;
@ -1129,7 +1128,6 @@ static void pnv_ioda_setup_same_PE(struct pci_bus *bus, struct pnv_ioda_pe *pe)
continue; continue;
pe->device_count++; pe->device_count++;
pdn->pcidev = dev;
pdn->pe_number = pe->pe_number; pdn->pe_number = pe->pe_number;
if ((pe->flags & PNV_IODA_PE_BUS_ALL) && dev->subordinate) if ((pe->flags & PNV_IODA_PE_BUS_ALL) && dev->subordinate)
pnv_ioda_setup_same_PE(dev->subordinate, pe); pnv_ioda_setup_same_PE(dev->subordinate, pe);
@ -1244,7 +1242,6 @@ static struct pnv_ioda_pe *pnv_ioda_setup_npu_PE(struct pci_dev *npu_pdev)
pci_dev_get(npu_pdev); pci_dev_get(npu_pdev);
npu_pdn = pci_get_pdn(npu_pdev); npu_pdn = pci_get_pdn(npu_pdev);
rid = npu_pdev->bus->number << 8 | npu_pdn->devfn; rid = npu_pdev->bus->number << 8 | npu_pdn->devfn;
npu_pdn->pcidev = npu_pdev;
npu_pdn->pe_number = pe_num; npu_pdn->pe_number = pe_num;
phb->ioda.pe_rmap[rid] = pe->pe_number; phb->ioda.pe_rmap[rid] = pe->pe_number;