| Message ID | 20190821062655.19735-2-oohall@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8cd6aacc640116213f9373808a627ecd3728accc |
| Headers | show |
| Series | [1/3] powerpc/sriov: Remove VF eeh_dev state when disabling SR-IOV | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch next (c9633332103e55bc73d80d07ead28b95a22a85a3) |
| snowpatch_ozlabs/checkpatch | warning | total: 0 errors, 1 warnings, 0 checks, 101 lines checked |
On Wed, Aug 21, 2019 at 04:26:54PM +1000, Oliver O'Halloran wrote: > The powerpc PCI code requires that a pci_dn structure exists for all > devices in the system. This is fine for real devices since at boot a pci_dn > is created for each PCI device in the DT and it's fine for hotplugged devices > since the hotplug slot driver will manage the pci_dn's devices in hotplug > slots. For SR-IOV, we need the platform / pcibios to manage the pci_dn for > virtual functions since firmware is unaware of VFs, and they aren't > "hot plugged" in the traditional sense. > > Management of the pci_dn is handled by the, poorly named, functions: > add_pci_dev_data() and remove_pci_dev_data(). The entire body of these > functions is #ifdef`ed around CONFIG_PCI_IOV and they cannot be used > in any other context, so make them only available when CONFIG_PCI_IOV > is selected, and rename them to reflect their actual usage rather than > having them masquerade as generic code. > > Signed-off-by: Oliver O'Halloran <oohall@gmail.com> Nice cleanup, Reviewed-by: Sam Bobroff <sbobroff@linux.ibm.com> > --- > arch/powerpc/include/asm/pci-bridge.h | 7 +++++-- > arch/powerpc/kernel/pci_dn.c | 15 +++++---------- > arch/powerpc/platforms/powernv/pci-ioda.c | 4 ++-- > arch/powerpc/platforms/pseries/pci.c | 4 ++-- > 4 files changed, 14 insertions(+), 16 deletions(-) > > diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h > index ea6ec65..69f4cb3 100644 > --- a/arch/powerpc/include/asm/pci-bridge.h > +++ b/arch/powerpc/include/asm/pci-bridge.h > @@ -223,12 +223,15 @@ struct pci_dn { > extern struct pci_dn *pci_get_pdn_by_devfn(struct pci_bus *bus, > int devfn); > extern struct pci_dn *pci_get_pdn(struct pci_dev *pdev); > -extern struct pci_dn *add_dev_pci_data(struct pci_dev *pdev); > -extern void remove_dev_pci_data(struct pci_dev *pdev); > extern struct pci_dn *pci_add_device_node_info(struct pci_controller *hose, > struct device_node *dn); > extern void pci_remove_device_node_info(struct device_node *dn); > > +#ifdef CONFIG_PCI_IOV > +struct pci_dn *add_sriov_vf_pdns(struct pci_dev *pdev); > +void remove_sriov_vf_pdns(struct pci_dev *pdev); > +#endif > + > static inline int pci_device_from_OF_node(struct device_node *np, > u8 *bus, u8 *devfn) > { > diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c > index 795c4e3..24da1d8 100644 > --- a/arch/powerpc/kernel/pci_dn.c > +++ b/arch/powerpc/kernel/pci_dn.c > @@ -125,7 +125,7 @@ struct pci_dn *pci_get_pdn(struct pci_dev *pdev) > } > > #ifdef CONFIG_PCI_IOV > -static struct pci_dn *add_one_dev_pci_data(struct pci_dn *parent, > +static struct pci_dn *add_one_sriov_vf_pdn(struct pci_dn *parent, > int vf_index, > int busno, int devfn) > { > @@ -151,11 +151,9 @@ static struct pci_dn *add_one_dev_pci_data(struct pci_dn *parent, > > return pdn; > } > -#endif > > -struct pci_dn *add_dev_pci_data(struct pci_dev *pdev) > +struct pci_dn *add_sriov_vf_pdns(struct pci_dev *pdev) > { > -#ifdef CONFIG_PCI_IOV > struct pci_dn *parent, *pdn; > int i; > > @@ -176,7 +174,7 @@ struct pci_dn *add_dev_pci_data(struct pci_dev *pdev) > for (i = 0; i < pci_sriov_get_totalvfs(pdev); i++) { > struct eeh_dev *edev __maybe_unused; > > - pdn = add_one_dev_pci_data(parent, i, > + pdn = add_one_sriov_vf_pdn(parent, i, > pci_iov_virtfn_bus(pdev, i), > pci_iov_virtfn_devfn(pdev, i)); > if (!pdn) { > @@ -192,14 +190,11 @@ struct pci_dn *add_dev_pci_data(struct pci_dev *pdev) > edev->physfn = pdev; > #endif /* CONFIG_EEH */ > } > -#endif /* CONFIG_PCI_IOV */ > - > return pci_get_pdn(pdev); > } > > -void remove_dev_pci_data(struct pci_dev *pdev) > +void remove_sriov_vf_pdns(struct pci_dev *pdev) > { > -#ifdef CONFIG_PCI_IOV > struct pci_dn *parent; > struct pci_dn *pdn, *tmp; > int i; > @@ -271,8 +266,8 @@ void remove_dev_pci_data(struct pci_dev *pdev) > kfree(pdn); > } > } > -#endif /* CONFIG_PCI_IOV */ > } > +#endif /* CONFIG_PCI_IOV */ > > struct pci_dn *pci_add_device_node_info(struct pci_controller *hose, > struct device_node *dn) > diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c > index d8080558d0..f1fa489 100644 > --- a/arch/powerpc/platforms/powernv/pci-ioda.c > +++ b/arch/powerpc/platforms/powernv/pci-ioda.c > @@ -1719,14 +1719,14 @@ int pnv_pcibios_sriov_disable(struct pci_dev *pdev) > pnv_pci_sriov_disable(pdev); > > /* Release PCI data */ > - remove_dev_pci_data(pdev); > + remove_sriov_vf_pdns(pdev); > return 0; > } > > int pnv_pcibios_sriov_enable(struct pci_dev *pdev, u16 num_vfs) > { > /* Allocate PCI data */ > - add_dev_pci_data(pdev); > + add_sriov_vf_pdns(pdev); > > return pnv_pci_sriov_enable(pdev, num_vfs); > } > diff --git a/arch/powerpc/platforms/pseries/pci.c b/arch/powerpc/platforms/pseries/pci.c > index 7228309..911534b 100644 > --- a/arch/powerpc/platforms/pseries/pci.c > +++ b/arch/powerpc/platforms/pseries/pci.c > @@ -192,7 +192,7 @@ int pseries_pci_sriov_enable(struct pci_dev *pdev, u16 num_vfs) > int pseries_pcibios_sriov_enable(struct pci_dev *pdev, u16 num_vfs) > { > /* Allocate PCI data */ > - add_dev_pci_data(pdev); > + add_sriov_vf_pdns(pdev); > return pseries_pci_sriov_enable(pdev, num_vfs); > } > > @@ -204,7 +204,7 @@ int pseries_pcibios_sriov_disable(struct pci_dev *pdev) > /* Releasing pe_num_map */ > kfree(pdn->pe_num_map); > /* Release PCI data */ > - remove_dev_pci_data(pdev); > + remove_sriov_vf_pdns(pdev); > pci_vf_drivers_autoprobe(pdev, true); > return 0; > } > -- > 2.9.5 >
diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h index ea6ec65..69f4cb3 100644 --- a/arch/powerpc/include/asm/pci-bridge.h +++ b/arch/powerpc/include/asm/pci-bridge.h @@ -223,12 +223,15 @@ struct pci_dn { extern struct pci_dn *pci_get_pdn_by_devfn(struct pci_bus *bus, int devfn); extern struct pci_dn *pci_get_pdn(struct pci_dev *pdev); -extern struct pci_dn *add_dev_pci_data(struct pci_dev *pdev); -extern void remove_dev_pci_data(struct pci_dev *pdev); extern struct pci_dn *pci_add_device_node_info(struct pci_controller *hose, struct device_node *dn); extern void pci_remove_device_node_info(struct device_node *dn); +#ifdef CONFIG_PCI_IOV +struct pci_dn *add_sriov_vf_pdns(struct pci_dev *pdev); +void remove_sriov_vf_pdns(struct pci_dev *pdev); +#endif + static inline int pci_device_from_OF_node(struct device_node *np, u8 *bus, u8 *devfn) { diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c index 795c4e3..24da1d8 100644 --- a/arch/powerpc/kernel/pci_dn.c +++ b/arch/powerpc/kernel/pci_dn.c @@ -125,7 +125,7 @@ struct pci_dn *pci_get_pdn(struct pci_dev *pdev) } #ifdef CONFIG_PCI_IOV -static struct pci_dn *add_one_dev_pci_data(struct pci_dn *parent, +static struct pci_dn *add_one_sriov_vf_pdn(struct pci_dn *parent, int vf_index, int busno, int devfn) { @@ -151,11 +151,9 @@ static struct pci_dn *add_one_dev_pci_data(struct pci_dn *parent, return pdn; } -#endif -struct pci_dn *add_dev_pci_data(struct pci_dev *pdev) +struct pci_dn *add_sriov_vf_pdns(struct pci_dev *pdev) { -#ifdef CONFIG_PCI_IOV struct pci_dn *parent, *pdn; int i; @@ -176,7 +174,7 @@ struct pci_dn *add_dev_pci_data(struct pci_dev *pdev) for (i = 0; i < pci_sriov_get_totalvfs(pdev); i++) { struct eeh_dev *edev __maybe_unused; - pdn = add_one_dev_pci_data(parent, i, + pdn = add_one_sriov_vf_pdn(parent, i, pci_iov_virtfn_bus(pdev, i), pci_iov_virtfn_devfn(pdev, i)); if (!pdn) { @@ -192,14 +190,11 @@ struct pci_dn *add_dev_pci_data(struct pci_dev *pdev) edev->physfn = pdev; #endif /* CONFIG_EEH */ } -#endif /* CONFIG_PCI_IOV */ - return pci_get_pdn(pdev); } -void remove_dev_pci_data(struct pci_dev *pdev) +void remove_sriov_vf_pdns(struct pci_dev *pdev) { -#ifdef CONFIG_PCI_IOV struct pci_dn *parent; struct pci_dn *pdn, *tmp; int i; @@ -271,8 +266,8 @@ void remove_dev_pci_data(struct pci_dev *pdev) kfree(pdn); } } -#endif /* CONFIG_PCI_IOV */ } +#endif /* CONFIG_PCI_IOV */ struct pci_dn *pci_add_device_node_info(struct pci_controller *hose, struct device_node *dn) diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index d8080558d0..f1fa489 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -1719,14 +1719,14 @@ int pnv_pcibios_sriov_disable(struct pci_dev *pdev) pnv_pci_sriov_disable(pdev); /* Release PCI data */ - remove_dev_pci_data(pdev); + remove_sriov_vf_pdns(pdev); return 0; } int pnv_pcibios_sriov_enable(struct pci_dev *pdev, u16 num_vfs) { /* Allocate PCI data */ - add_dev_pci_data(pdev); + add_sriov_vf_pdns(pdev); return pnv_pci_sriov_enable(pdev, num_vfs); } diff --git a/arch/powerpc/platforms/pseries/pci.c b/arch/powerpc/platforms/pseries/pci.c index 7228309..911534b 100644 --- a/arch/powerpc/platforms/pseries/pci.c +++ b/arch/powerpc/platforms/pseries/pci.c @@ -192,7 +192,7 @@ int pseries_pci_sriov_enable(struct pci_dev *pdev, u16 num_vfs) int pseries_pcibios_sriov_enable(struct pci_dev *pdev, u16 num_vfs) { /* Allocate PCI data */ - add_dev_pci_data(pdev); + add_sriov_vf_pdns(pdev); return pseries_pci_sriov_enable(pdev, num_vfs); } @@ -204,7 +204,7 @@ int pseries_pcibios_sriov_disable(struct pci_dev *pdev) /* Releasing pe_num_map */ kfree(pdn->pe_num_map); /* Release PCI data */ - remove_dev_pci_data(pdev); + remove_sriov_vf_pdns(pdev); pci_vf_drivers_autoprobe(pdev, true); return 0; }
The powerpc PCI code requires that a pci_dn structure exists for all devices in the system. This is fine for real devices since at boot a pci_dn is created for each PCI device in the DT and it's fine for hotplugged devices since the hotplug slot driver will manage the pci_dn's devices in hotplug slots. For SR-IOV, we need the platform / pcibios to manage the pci_dn for virtual functions since firmware is unaware of VFs, and they aren't "hot plugged" in the traditional sense. Management of the pci_dn is handled by the, poorly named, functions: add_pci_dev_data() and remove_pci_dev_data(). The entire body of these functions is #ifdef`ed around CONFIG_PCI_IOV and they cannot be used in any other context, so make them only available when CONFIG_PCI_IOV is selected, and rename them to reflect their actual usage rather than having them masquerade as generic code. Signed-off-by: Oliver O'Halloran <oohall@gmail.com> --- arch/powerpc/include/asm/pci-bridge.h | 7 +++++-- arch/powerpc/kernel/pci_dn.c | 15 +++++---------- arch/powerpc/platforms/powernv/pci-ioda.c | 4 ++-- arch/powerpc/platforms/pseries/pci.c | 4 ++-- 4 files changed, 14 insertions(+), 16 deletions(-)