Commit ccf531b2 authored by Michal Swiatkowski's avatar Michal Swiatkowski Committed by Tony Nguyen
Browse files

ice: update VSI instead of init in some case 



ice_vsi_cfg() is called from different contexts:
1) VSI exsist in HW, but it is reconfigured, because of changing queues
   for example -> update instead of init should be used
2) VSI doesn't exsist, because rest has happened -> init command should
   be sent

To support both cases pass boolean value which will store information
what type of command has to be sent to HW.

Signed-off-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 227bf450

drivers/net/ethernet/intel/ice/ice_lib.c

+10 −6
Original line number Diff line number Diff line
@@ -2705,9 +2705,11 @@ static int ice_vsi_cfg_tc_lan(struct ice_pf *pf, struct ice_vsi *vsi) 
 * @vf: pointer to VF to which this VSI connects. This field is used primarily

 *      for the ICE_VSI_VF type. Other VSI types should pass NULL.

 * @ch: ptr to channel

 * @init_vsi: is this an initialization or a reconfigure of the VSI

 */

static int

ice_vsi_cfg_def(struct ice_vsi *vsi, struct ice_vf *vf, struct ice_channel *ch)

ice_vsi_cfg_def(struct ice_vsi *vsi, struct ice_vf *vf, struct ice_channel *ch,

		int init_vsi)

{

	struct device *dev = ice_pf_to_dev(vsi->back);

	struct ice_pf *pf = vsi->back;
@@ -2738,7 +2740,7 @@ ice_vsi_cfg_def(struct ice_vsi *vsi, struct ice_vf *vf, struct ice_channel *ch) 
	ice_vsi_set_tc_cfg(vsi);



	/* create the VSI */

	ret = ice_vsi_init(vsi, true);

	ret = ice_vsi_init(vsi, init_vsi);

	if (ret)

		goto unroll_get_qs;
@@ -2866,12 +2868,14 @@ ice_vsi_cfg_def(struct ice_vsi *vsi, struct ice_vf *vf, struct ice_channel *ch) 
 * @vf: pointer to VF to which this VSI connects. This field is used primarily

 *      for the ICE_VSI_VF type. Other VSI types should pass NULL.

 * @ch: ptr to channel

 * @init_vsi: is this an initialization or a reconfigure of the VSI

 */

int ice_vsi_cfg(struct ice_vsi *vsi, struct ice_vf *vf, struct ice_channel *ch)

int ice_vsi_cfg(struct ice_vsi *vsi, struct ice_vf *vf, struct ice_channel *ch,

		int init_vsi)

{

	int ret;



	ret = ice_vsi_cfg_def(vsi, vf, ch);

	ret = ice_vsi_cfg_def(vsi, vf, ch, init_vsi);

	if (ret)

		return ret;
@@ -2968,7 +2972,7 @@ ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi, 
		return NULL;

	}



	ret = ice_vsi_cfg(vsi, vf, ch);

	ret = ice_vsi_cfg(vsi, vf, ch, ICE_VSI_FLAG_INIT);

	if (ret)

		goto err_vsi_cfg;
@@ -3502,7 +3506,7 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, int init_vsi) 
	prev_rxq = vsi->num_rxq;



	ice_vsi_decfg(vsi);

	ret = ice_vsi_cfg_def(vsi, vsi->vf, vsi->ch);

	ret = ice_vsi_cfg_def(vsi, vsi->vf, vsi->ch, init_vsi);

	if (ret)

		goto err_vsi_cfg;

drivers/net/ethernet/intel/ice/ice_lib.h

+2 −2
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ int ice_vsi_release(struct ice_vsi *vsi); 


void ice_vsi_close(struct ice_vsi *vsi);



int ice_vsi_cfg(struct ice_vsi *vsi, struct ice_vf *vf,

		struct ice_channel *ch);

int ice_ena_vsi(struct ice_vsi *vsi, bool locked);



void ice_vsi_decfg(struct ice_vsi *vsi);
@@ -75,6 +73,8 @@ ice_get_res(struct ice_pf *pf, struct ice_res_tracker *res, u16 needed, u16 id); 
#define ICE_VSI_FLAG_INIT	BIT(0)

#define ICE_VSI_FLAG_NO_INIT	0

int ice_vsi_rebuild(struct ice_vsi *vsi, int init_vsi);

int ice_vsi_cfg(struct ice_vsi *vsi, struct ice_vf *vf,

		struct ice_channel *ch, int init_vsi);



bool ice_is_reset_in_progress(unsigned long *state);

int ice_wait_for_reset(struct ice_pf *pf, unsigned long timeout);

drivers/net/ethernet/intel/ice/ice_main.c

+1 −1
Original line number Diff line number Diff line
@@ -5014,7 +5014,7 @@ int ice_load(struct ice_pf *pf) 
		return err;



	vsi = ice_get_main_vsi(pf);

	err = ice_vsi_cfg(vsi, NULL, NULL);

	err = ice_vsi_cfg(vsi, NULL, NULL, ICE_VSI_FLAG_INIT);

	if (err)

		goto err_vsi_cfg;