| Message ID | 20230531123642.20246-1-przemyslaw.kitszel@intel.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [iwl-next,v2] ice: clean up freeing SR-IOV VFs | expand |
> -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of > Przemek Kitszel > Sent: środa, 31 maja 2023 14:37 > To: intel-wired-lan@lists.osuosl.org > Cc: Simon Horman <simon.horman@corigine.com>; > netdev@vger.kernel.org; Kitszel, Przemyslaw > <przemyslaw.kitszel@intel.com> > Subject: [Intel-wired-lan] [PATCH iwl-next v2] ice: clean up freeing SR-IOV > VFs > > The check for existing VFs was redundant since very inception of SR-IOV > sysfs interface in the kernel, see commit 1789382a72a5 ("PCI: SRIOV control > and status via sysfs"). > > v2: sending to proper IWL address > > Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com> > Reviewed-by: Simon Horman <simon.horman@corigine.com> > Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> > --- > drivers/net/ethernet/intel/ice/ice_sriov.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/intel/ice/ice_sriov.c > b/drivers/net/ethernet/intel/ice/ice_sriov.c > index 2ea6d24977a6..1f66914c7a20 100644 > --- a/drivers/net/ethernet/intel/ice/ice_sriov.c > +++ b/drivers/net/ethernet/intel/ice/ice_sriov.c > @@ -905,14 +905,13 @@ static int ice_ena_vfs(struct ice_pf *pf, u16 > num_vfs) > */ > static int ice_pci_sriov_ena(struct ice_pf *pf, int num_vfs) { > - int pre_existing_vfs = pci_num_vf(pf->pdev); > struct device *dev = ice_pf_to_dev(pf); > int err; > > - if (pre_existing_vfs && pre_existing_vfs != num_vfs) > + if (!num_vfs) { > ice_free_vfs(pf); > - else if (pre_existing_vfs && pre_existing_vfs == num_vfs) > return 0; > + } > > if (num_vfs > pf->vfs.num_supported) { > dev_err(dev, "Can't enable %d VFs, max VFs supported is > %d\n", > -- > 2.38.1 > > _______________________________________________ > Intel-wired-lan mailing list > Intel-wired-lan@osuosl.org > https://lists.osuosl.org/mailman/listinfo/intel-wired-lan Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
diff --git a/drivers/net/ethernet/intel/ice/ice_sriov.c b/drivers/net/ethernet/intel/ice/ice_sriov.c index 2ea6d24977a6..1f66914c7a20 100644 --- a/drivers/net/ethernet/intel/ice/ice_sriov.c +++ b/drivers/net/ethernet/intel/ice/ice_sriov.c @@ -905,14 +905,13 @@ static int ice_ena_vfs(struct ice_pf *pf, u16 num_vfs) */ static int ice_pci_sriov_ena(struct ice_pf *pf, int num_vfs) { - int pre_existing_vfs = pci_num_vf(pf->pdev); struct device *dev = ice_pf_to_dev(pf); int err; - if (pre_existing_vfs && pre_existing_vfs != num_vfs) + if (!num_vfs) { ice_free_vfs(pf); - else if (pre_existing_vfs && pre_existing_vfs == num_vfs) return 0; + } if (num_vfs > pf->vfs.num_supported) { dev_err(dev, "Can't enable %d VFs, max VFs supported is %d\n",
The check for existing VFs was redundant since very inception of SR-IOV sysfs interface in the kernel, see commit 1789382a72a5 ("PCI: SRIOV control and status via sysfs"). v2: sending to proper IWL address Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com> Reviewed-by: Simon Horman <simon.horman@corigine.com> Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> --- drivers/net/ethernet/intel/ice/ice_sriov.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)