Commit 504ce971 authored by Jacob Keller's avatar Jacob Keller Committed by Tony Nguyen
Browse files

ice: re-order ice_mbx_reset_snapshot function 



A future change is going to refactor the VF mailbox overflow detection
logic, including modifying ice_mbx_reset_snapshot and its callers. To make
this change easier to review, first move the ice_mbx_reset_snapshot
function higher in the ice_vf_mbx.c file.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: default avatarMarek Szlosek <marek.szlosek@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 95b74450

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

+24 −24
Original line number Diff line number Diff line
@@ -130,6 +130,30 @@ u32 ice_conv_link_speed_to_virtchnl(bool adv_link_support, u16 link_speed) 
 */

#define ICE_IGNORE_MAX_MSG_CNT	0xFFFF



/**

 * ice_mbx_reset_snapshot - Reset mailbox snapshot structure

 * @snap: pointer to mailbox snapshot structure in the ice_hw struct

 *

 * Reset the mailbox snapshot structure and clear VF counter array.

 */

static void ice_mbx_reset_snapshot(struct ice_mbx_snapshot *snap)

{

	u32 vfcntr_len;



	if (!snap || !snap->mbx_vf.vf_cntr)

		return;



	/* Clear VF counters. */

	vfcntr_len = snap->mbx_vf.vfcntr_len;

	if (vfcntr_len)

		memset(snap->mbx_vf.vf_cntr, 0,

		       (vfcntr_len * sizeof(*snap->mbx_vf.vf_cntr)));



	/* Reset mailbox snapshot for a new capture. */

	memset(&snap->mbx_buf, 0, sizeof(snap->mbx_buf));

	snap->mbx_buf.state = ICE_MAL_VF_DETECT_STATE_NEW_SNAPSHOT;

}



/**

 * ice_mbx_traverse - Pass through mailbox snapshot

 * @hw: pointer to the HW struct
@@ -201,30 +225,6 @@ ice_mbx_detect_malvf(struct ice_hw *hw, u16 vf_id, 
	return 0;

}



/**

 * ice_mbx_reset_snapshot - Reset mailbox snapshot structure

 * @snap: pointer to mailbox snapshot structure in the ice_hw struct

 *

 * Reset the mailbox snapshot structure and clear VF counter array.

 */

static void ice_mbx_reset_snapshot(struct ice_mbx_snapshot *snap)

{

	u32 vfcntr_len;



	if (!snap || !snap->mbx_vf.vf_cntr)

		return;



	/* Clear VF counters. */

	vfcntr_len = snap->mbx_vf.vfcntr_len;

	if (vfcntr_len)

		memset(snap->mbx_vf.vf_cntr, 0,

		       (vfcntr_len * sizeof(*snap->mbx_vf.vf_cntr)));



	/* Reset mailbox snapshot for a new capture. */

	memset(&snap->mbx_buf, 0, sizeof(snap->mbx_buf));

	snap->mbx_buf.state = ICE_MAL_VF_DETECT_STATE_NEW_SNAPSHOT;

}



/**

 * ice_mbx_vf_state_handler - Handle states of the overflow algorithm

 * @hw: pointer to the HW struct