| Message ID | 20190821062655.19735-3-oohall@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a4af49f34f76f1e6125b22b50d18580426d935e0 |
| 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/build-ppc64le | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 30 lines checked |
On Wed, Aug 21, 2019 at 04:26:55PM +1000, Oliver O'Halloran wrote: > These functions can only be used on a SR-IOV capable physical function and > they're only called in pcibios_sriov_enable / disable. Make them emit a > warning in the future if they're used incorrectly and remove the dead > code that checks if the device is a VF. > > Signed-off-by: Oliver O'Halloran <oohall@gmail.com> Looks good, but you might want to consider using WARN_ON_ONCE() just in case it gets hit a lot. Reviewed-by: Sam Bobroff <sbobroff@linux.ibm.com> > --- > arch/powerpc/kernel/pci_dn.c | 17 +++-------------- > 1 file changed, 3 insertions(+), 14 deletions(-) > > diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c > index 24da1d8..69dafc3 100644 > --- a/arch/powerpc/kernel/pci_dn.c > +++ b/arch/powerpc/kernel/pci_dn.c > @@ -158,8 +158,8 @@ struct pci_dn *add_sriov_vf_pdns(struct pci_dev *pdev) > int i; > > /* Only support IOV for now */ > - if (!pdev->is_physfn) > - return pci_get_pdn(pdev); > + if (WARN_ON(!pdev->is_physfn)) > + return NULL; > > /* Check if VFs have been populated */ > pdn = pci_get_pdn(pdev); > @@ -199,19 +199,8 @@ void remove_sriov_vf_pdns(struct pci_dev *pdev) > struct pci_dn *pdn, *tmp; > int i; > > - /* > - * VF and VF PE are created/released dynamically, so we need to > - * bind/unbind them. Otherwise the VF and VF PE would be mismatched > - * when re-enabling SR-IOV. > - */ > - if (pdev->is_virtfn) { > - pdn = pci_get_pdn(pdev); > - pdn->pe_number = IODA_INVALID_PE; > - return; > - } > - > /* Only support IOV PF for now */ > - if (!pdev->is_physfn) > + if (WARN_ON(!pdev->is_physfn)) > return; > > /* Check if VFs have been populated */ > -- > 2.9.5 >
diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c index 24da1d8..69dafc3 100644 --- a/arch/powerpc/kernel/pci_dn.c +++ b/arch/powerpc/kernel/pci_dn.c @@ -158,8 +158,8 @@ struct pci_dn *add_sriov_vf_pdns(struct pci_dev *pdev) int i; /* Only support IOV for now */ - if (!pdev->is_physfn) - return pci_get_pdn(pdev); + if (WARN_ON(!pdev->is_physfn)) + return NULL; /* Check if VFs have been populated */ pdn = pci_get_pdn(pdev); @@ -199,19 +199,8 @@ void remove_sriov_vf_pdns(struct pci_dev *pdev) struct pci_dn *pdn, *tmp; int i; - /* - * VF and VF PE are created/released dynamically, so we need to - * bind/unbind them. Otherwise the VF and VF PE would be mismatched - * when re-enabling SR-IOV. - */ - if (pdev->is_virtfn) { - pdn = pci_get_pdn(pdev); - pdn->pe_number = IODA_INVALID_PE; - return; - } - /* Only support IOV PF for now */ - if (!pdev->is_physfn) + if (WARN_ON(!pdev->is_physfn)) return; /* Check if VFs have been populated */
These functions can only be used on a SR-IOV capable physical function and they're only called in pcibios_sriov_enable / disable. Make them emit a warning in the future if they're used incorrectly and remove the dead code that checks if the device is a VF. Signed-off-by: Oliver O'Halloran <oohall@gmail.com> --- arch/powerpc/kernel/pci_dn.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)