shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ice: Fix ice VF reset during iavf initialization"

Browse Source 
[ Upstream commit 0ecff05e6c ]

This reverts commit 7255355a06.

After this commit we are not able to attach VF to VM:
virsh attach-interface v0 hostdev --managed 0000:41:01.0 --mac 52:52:52:52:52:52
error: Failed to attach interface
error: Cannot set interface MAC to 52:52:52:52:52:52 for ifname enp65s0f0np0 vf 0: Resource temporarily unavailable

ice_check_vf_ready_for_cfg() already contain waiting for reset.
New condition in ice_check_vf_ready_for_reset() causing only problems.

Fixes: 7255355a06 ("ice: Fix ice VF reset during iavf initialization")
Signed-off-by: Petr Oros <poros@redhat.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Petr Oros
2023-08-11 10:07:01 +02:00
committed by Greg Kroah-Hartman
parent 1188e9dd7a
commit 7cddaed2a3
4 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/intel/ice/ice_sriov.c
View File

@@ -1240,7 +1240,7 @@ int ice_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool ena)
if (!vf) if (!vf)
return -EINVAL; return -EINVAL;
ret = ice_check_vf_ready_for_reset(vf); ret = ice_check_vf_ready_for_cfg(vf);
if (ret) if (ret)
goto out_put_vf; goto out_put_vf;
@@ -1355,7 +1355,7 @@ int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)
goto out_put_vf; goto out_put_vf;
} }
ret = ice_check_vf_ready_for_reset(vf); ret = ice_check_vf_ready_for_cfg(vf);
if (ret) if (ret)
goto out_put_vf; goto out_put_vf;
@@ -1409,7 +1409,7 @@ int ice_set_vf_trust(struct net_device *netdev, int vf_id, bool trusted)
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
ret = ice_check_vf_ready_for_reset(vf); ret = ice_check_vf_ready_for_cfg(vf);
if (ret) if (ret)
goto out_put_vf; goto out_put_vf;
@@ -1722,7 +1722,7 @@ ice_set_vf_port_vlan(struct net_device *netdev, int vf_id, u16 vlan_id, u8 qos,
if (!vf) if (!vf)
return -EINVAL; return -EINVAL;
ret = ice_check_vf_ready_for_reset(vf); ret = ice_check_vf_ready_for_cfg(vf);
if (ret) if (ret)
goto out_put_vf; goto out_put_vf;

19
drivers/net/ethernet/intel/ice/ice_vf_lib.c
View File

@@ -185,25 +185,6 @@ int ice_check_vf_ready_for_cfg(struct ice_vf *vf)
return 0; return 0;
} }
/**
* ice_check_vf_ready_for_reset - check if VF is ready to be reset
* @vf: VF to check if it's ready to be reset
*
* The purpose of this function is to ensure that the VF is not in reset,
* disabled, and is both initialized and active, thus enabling us to safely
* initialize another reset.
*/
int ice_check_vf_ready_for_reset(struct ice_vf *vf)
{
int ret;
ret = ice_check_vf_ready_for_cfg(vf);
if (!ret && !test_bit(ICE_VF_STATE_ACTIVE, vf->vf_states))
ret = -EAGAIN;
return ret;
}
/** /**
* ice_trigger_vf_reset - Reset a VF on HW * ice_trigger_vf_reset - Reset a VF on HW
* @vf: pointer to the VF structure * @vf: pointer to the VF structure

1
drivers/net/ethernet/intel/ice/ice_vf_lib.h
View File

@@ -214,7 +214,6 @@ u16 ice_get_num_vfs(struct ice_pf *pf);
struct ice_vsi *ice_get_vf_vsi(struct ice_vf *vf); struct ice_vsi *ice_get_vf_vsi(struct ice_vf *vf);
bool ice_is_vf_disabled(struct ice_vf *vf); bool ice_is_vf_disabled(struct ice_vf *vf);
int ice_check_vf_ready_for_cfg(struct ice_vf *vf); int ice_check_vf_ready_for_cfg(struct ice_vf *vf);
int ice_check_vf_ready_for_reset(struct ice_vf *vf);
void ice_set_vf_state_dis(struct ice_vf *vf); void ice_set_vf_state_dis(struct ice_vf *vf);
bool ice_is_any_vf_in_unicast_promisc(struct ice_pf *pf); bool ice_is_any_vf_in_unicast_promisc(struct ice_pf *pf);
void void

1
drivers/net/ethernet/intel/ice/ice_virtchnl.c
View File

@@ -3722,7 +3722,6 @@ error_handler:
ice_vc_notify_vf_link_state(vf); ice_vc_notify_vf_link_state(vf);
break; break;
case VIRTCHNL_OP_RESET_VF: case VIRTCHNL_OP_RESET_VF:
clear_bit(ICE_VF_STATE_ACTIVE, vf->vf_states);
ops->reset_vf(vf); ops->reset_vf(vf);
break; break;
case VIRTCHNL_OP_ADD_ETH_ADDR: case VIRTCHNL_OP_ADD_ETH_ADDR: