Commit e75bc5f3 authored by Mukesh Sisodiya's avatar Mukesh Sisodiya Committed by Luca Coelho
Browse files

iwlwifi: yoyo: cleanup internal buffer allocation in D3 



With recent changes in the firmware SRAM debug during D3 is
enabled by default and need not be enabled by driver.
cleaning the code to align the same.

Signed-off-by: default avatarMukesh Sisodiya <mukesh.sisodiya@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210802215208.8535203d0ef7.Ib1695ce5de921b0472d0b1052e729e071573b863@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 10516783

drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h

+0 −2
Original line number Diff line number Diff line
@@ -249,7 +249,6 @@ struct iwl_fw_ini_hcmd_tlv { 
 * @IWL_FW_INI_ALLOCATION_ID_DBGC1: allocation meant for DBGC1 configuration

 * @IWL_FW_INI_ALLOCATION_ID_DBGC2: allocation meant for DBGC2 configuration

 * @IWL_FW_INI_ALLOCATION_ID_DBGC3: allocation meant for DBGC3 configuration

 * @IWL_FW_INI_ALLOCATION_ID_INTERNAL: allocation meant for Intreanl SMEM in D3

 * @IWL_FW_INI_ALLOCATION_NUM: number of allocation ids

*/

enum iwl_fw_ini_allocation_id {
@@ -257,7 +256,6 @@ enum iwl_fw_ini_allocation_id { 
	IWL_FW_INI_ALLOCATION_ID_DBGC1,

	IWL_FW_INI_ALLOCATION_ID_DBGC2,

	IWL_FW_INI_ALLOCATION_ID_DBGC3,

	IWL_FW_INI_ALLOCATION_ID_INTERNAL,

	IWL_FW_INI_ALLOCATION_NUM,

}; /* FW_DEBUG_TLV_ALLOCATION_ID_E_VER_1 */

drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c

+1 −2
Original line number Diff line number Diff line
@@ -131,8 +131,7 @@ static int iwl_dbg_tlv_alloc_buf_alloc(struct iwl_trans *trans, 
		goto err;



	if (buf_location == IWL_FW_INI_LOCATION_SRAM_PATH &&

	    alloc_id != IWL_FW_INI_ALLOCATION_ID_DBGC1 &&

	    alloc_id != IWL_FW_INI_ALLOCATION_ID_INTERNAL)

	    alloc_id != IWL_FW_INI_ALLOCATION_ID_DBGC1)

		goto err;



	trans->dbg.fw_mon_cfg[alloc_id] = *alloc;

drivers/net/wireless/intel/iwlwifi/mvm/ops.c

+1 −5
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ module_exit(iwl_mvm_exit); 
static void iwl_mvm_nic_config(struct iwl_op_mode *op_mode)

{

	struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);

	struct iwl_trans_debug *dbg = &mvm->trans->dbg;

	u8 radio_cfg_type, radio_cfg_step, radio_cfg_dash;

	u32 reg_val = 0;

	u32 phy_config = iwl_mvm_get_phy_config(mvm);
@@ -115,10 +114,7 @@ static void iwl_mvm_nic_config(struct iwl_op_mode *op_mode) 
	if (mvm->trans->trans_cfg->device_family < IWL_DEVICE_FAMILY_8000)

		reg_val |= CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI;



	if (iwl_fw_dbg_is_d3_debug_enabled(&mvm->fwrt) ||

	    (iwl_trans_dbg_ini_valid(mvm->trans) &&

	     dbg->fw_mon_cfg[IWL_FW_INI_ALLOCATION_ID_INTERNAL].buf_location)

	    )

	if (iwl_fw_dbg_is_d3_debug_enabled(&mvm->fwrt))

		reg_val |= CSR_HW_IF_CONFIG_REG_D3_DEBUG;



	iwl_trans_set_bits_mask(mvm->trans, CSR_HW_IF_CONFIG_REG,