Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11fe1b3a authored by Dan Nowlin's avatar Dan Nowlin Committed by Jeff Kirsher
Browse files

ice: Add ice_get_fw_log_cfg to init FW logging 



In order to initialize the current status of the FW logging,
this patch adds ice_get_fw_log_cfg. The function retrieves
the current setting of the FW logging from HW and updates the
ice_hw structure accordingly.

Signed-off-by: default avatarDan Nowlin <dan.nowlin@intel.com>
Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 1eb11036

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

+1 −0
Original line number Diff line number Diff line
@@ -1694,6 +1694,7 @@ enum ice_adminq_opc { 


	/* debug commands */

	ice_aqc_opc_fw_logging				= 0xFF09,

	ice_aqc_opc_fw_logging_info			= 0xFF10,

};



#endif /* _ICE_ADMINQ_CMD_H_ */

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

+48 −0
Original line number Diff line number Diff line
@@ -472,6 +472,49 @@ static void ice_cleanup_fltr_mgmt_struct(struct ice_hw *hw) 
#define ICE_FW_LOG_DESC_SIZE_MAX	\

	ICE_FW_LOG_DESC_SIZE(ICE_AQC_FW_LOG_ID_MAX)



/**

 * ice_get_fw_log_cfg - get FW logging configuration

 * @hw: pointer to the HW struct

 */

static enum ice_status ice_get_fw_log_cfg(struct ice_hw *hw)

{

	struct ice_aqc_fw_logging_data *config;

	struct ice_aq_desc desc;

	enum ice_status status;

	u16 size;



	size = ICE_FW_LOG_DESC_SIZE_MAX;

	config = devm_kzalloc(ice_hw_to_dev(hw), size, GFP_KERNEL);

	if (!config)

		return ICE_ERR_NO_MEMORY;



	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_fw_logging_info);



	desc.flags |= cpu_to_le16(ICE_AQ_FLAG_BUF);

	desc.flags |= cpu_to_le16(ICE_AQ_FLAG_RD);



	status = ice_aq_send_cmd(hw, &desc, config, size, NULL);

	if (!status) {

		u16 i;



		/* Save fw logging information into the hw structure */

		for (i = 0; i < ICE_AQC_FW_LOG_ID_MAX; i++) {

			u16 v, m, flgs;



			v = le16_to_cpu(config->entry[i]);

			m = (v & ICE_AQC_FW_LOG_ID_M) >> ICE_AQC_FW_LOG_ID_S;

			flgs = (v & ICE_AQC_FW_LOG_EN_M) >> ICE_AQC_FW_LOG_EN_S;



			if (m < ICE_AQC_FW_LOG_ID_MAX)

				hw->fw_log.evnts[m].cur = flgs;

		}

	}



	devm_kfree(ice_hw_to_dev(hw), config);



	return status;

}



/**

 * ice_cfg_fw_log - configure FW logging

 * @hw: pointer to the HW struct
@@ -526,6 +569,11 @@ static enum ice_status ice_cfg_fw_log(struct ice_hw *hw, bool enable) 
	    (!hw->fw_log.actv_evnts || !ice_check_sq_alive(hw, &hw->adminq)))

		return 0;



	/* Get current FW log settings */

	status = ice_get_fw_log_cfg(hw);

	if (status)

		return status;



	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_fw_logging);

	cmd = &desc.params.fw_logging;