Commit 7dbc63f0 authored by Tony Nguyen's avatar Tony Nguyen
Browse files

ice: Misc minor fixes 



This is a collection of minor fixes including typos, white space, and
style. No functional changes.

Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
parent 6a2c2b2c

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

+2 −3
Original line number Diff line number Diff line
@@ -1718,8 +1718,7 @@ ice_alloc_hw_res(struct ice_hw *hw, u16 type, u16 num, bool btm, u16 *res) 
 * @num: number of resources

 * @res: pointer to array that contains the resources to free

 */

enum ice_status

ice_free_hw_res(struct ice_hw *hw, u16 type, u16 num, u16 *res)

enum ice_status ice_free_hw_res(struct ice_hw *hw, u16 type, u16 num, u16 *res)

{

	struct ice_aqc_alloc_free_res_elem *buf;

	enum ice_status status;
@@ -2121,7 +2120,7 @@ ice_parse_fdir_dev_caps(struct ice_hw *hw, struct ice_hw_dev_caps *dev_p, 
 * @cap_count: the number of capabilities

 *

 * Helper device to parse device (0x000B) capabilities list. For

 * capabilities shared between device and device, this relies on

 * capabilities shared between device and function, this relies on

 * ice_parse_common_caps.

 *

 * Loop through the list of provided capabilities and extract the relevant

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

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ void ice_devlink_unregister(struct ice_pf *pf) 
 *

 * Create and register a devlink_port for this PF. Note that although each

 * physical function is connected to a separate devlink instance, the port

 * will still be numbered according to the physical function id.

 * will still be numbered according to the physical function ID.

 *

 * Return: zero on success or an error code on failure.

 */

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

+1 −1
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ static bool ice_bits_max_set(const u8 *mask, u16 size, u16 max) 
 * This function generates a key from a value, a don't care mask and a never

 * match mask.

 * upd, dc, and nm are optional parameters, and can be NULL:

 *	upd == NULL --> udp mask is all 1's (update all bits)

 *	upd == NULL --> upd mask is all 1's (update all bits)

 *	dc == NULL --> dc mask is all 0's (no don't care bits)

 *	nm == NULL --> nm mask is all 0's (no never match bits)

 */

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

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
#define PRTDCB_GENS				0x00083020

#define PRTDCB_GENS_DCBX_STATUS_S		0

#define PRTDCB_GENS_DCBX_STATUS_M		ICE_M(0x7, 0)

#define PRTDCB_TUP2TC				0x001D26C0 /* Reset Source: CORER */

#define PRTDCB_TUP2TC				0x001D26C0

#define GL_PREEXT_L2_PMASK0(_i)			(0x0020F0FC + ((_i) * 4))

#define GL_PREEXT_L2_PMASK1(_i)			(0x0020F108 + ((_i) * 4))

#define GLFLXP_RXDID_FLX_WRD_0(_i)		(0x0045c800 + ((_i) * 4))
@@ -362,6 +362,7 @@ 
#define GLV_TEPC(_VSI)				(0x00312000 + ((_VSI) * 4))

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

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

#define PRTRPB_RDPC				0x000AC260

#define VSIQF_FD_CNT(_VSI)			(0x00464000 + ((_VSI) * 4))

#define VSIQF_FD_CNT_FD_GCNT_S			0

#define VSIQF_FD_CNT_FD_GCNT_M			ICE_M(0x3FFF, 0)
@@ -378,6 +379,5 @@ 
#define PFPM_WUS_FW_RST_WK_M			BIT(31)

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

#define VFINT_DYN_CTLN_CLEARPBA_M		BIT(1)

#define PRTRPB_RDPC				0x000AC260



#endif /* _ICE_HW_AUTOGEN_H_ */

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

+2 −2
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ ice_sched_add_node(struct ice_port_info *pi, u8 layer, 
		return ICE_ERR_PARAM;

	}



	/* query the current node information from FW  before additing it

	/* query the current node information from FW before adding it

	 * to the SW DB

	 */

	status = ice_sched_query_elem(hw, le32_to_cpu(info->node_teid), &elem);