Commit 3d9f9990 authored by Brett Creeley's avatar Brett Creeley Committed by Jeff Kirsher
Browse files

ice: Remove ice_dev_onetime_setup() 



ice_dev_onetime_setup contains driver workarounds needed for
firmware limitations. These issues have now been resolved in newer
NVMs so remove the function.

Signed-off-by: default avatarBrett Creeley <brett.creeley@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 168983a8

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

+0 −16
Original line number Diff line number Diff line
@@ -24,20 +24,6 @@ static enum ice_status ice_set_mac_type(struct ice_hw *hw) 
	return 0;

}



/**

 * ice_dev_onetime_setup - Temporary HW/FW workarounds

 * @hw: pointer to the HW structure

 *

 * This function provides temporary workarounds for certain issues

 * that are expected to be fixed in the HW/FW.

 */

void ice_dev_onetime_setup(struct ice_hw *hw)

{

#define MBX_PF_VT_PFALLOC	0x00231E80

	/* set VFs per PF */

	wr32(hw, MBX_PF_VT_PFALLOC, rd32(hw, PF_VT_PFALLOC_HIF));

}



/**

 * ice_clear_pf_cfg - Clear PF configuration

 * @hw: pointer to the hardware structure
@@ -763,8 +749,6 @@ enum ice_status ice_init_hw(struct ice_hw *hw) 
	if (status)

		goto err_unroll_sched;



	ice_dev_onetime_setup(hw);



	/* Get MAC information */

	/* A single port can report up to two (LAN and WoL) addresses */

	mac_buf = devm_kcalloc(ice_hw_to_dev(hw), 2,

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

+0 −2
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ enum ice_status ice_get_caps(struct ice_hw *hw); 


void ice_set_safe_mode_caps(struct ice_hw *hw);



void ice_dev_onetime_setup(struct ice_hw *hw);



enum ice_status

ice_write_rxq_ctx(struct ice_hw *hw, struct ice_rlan_ctx *rlan_ctx,

		  u32 rxq_index);

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

+0 −1
Original line number Diff line number Diff line
@@ -331,7 +331,6 @@ 
#define GLV_TEPC(_VSI)				(0x00312000 + ((_VSI) * 4))

#define GLV_UPRCL(_i)				(0x003B2000 + ((_i) * 8))

#define GLV_UPTCL(_i)				(0x0030A000 + ((_i) * 8))

#define PF_VT_PFALLOC_HIF			0x0009DD80

#define VSIQF_HKEY_MAX_INDEX			12

#define VSIQF_HLUT_MAX_INDEX			15

#define VFINT_DYN_CTLN(_i)			(0x00003800 + ((_i) * 4))

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

+0 −1
Original line number Diff line number Diff line
@@ -2686,7 +2686,6 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, bool init_vsi) 
	ice_vsi_put_qs(vsi);

	ice_vsi_clear_rings(vsi);

	ice_vsi_free_arrays(vsi);

	ice_dev_onetime_setup(&pf->hw);

	if (vsi->type == ICE_VSI_VF)

		ice_vsi_set_num_qs(vsi, vf->vf_id);

	else