Commit 792a2fdc authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-for-kalle-2019-04-19' of... 

Merge tag 'iwlwifi-for-kalle-2019-04-19' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

Third batch of iwlwifi fixes intended for v5.1

* Fix an oops when creating debugfs entries;
* Fix bug when trying to capture debugging info while in rfkill;
* Prevent potential uninitialized memory dumps into debugging logs;
* Fix some initialization parameters for AX210 devices;
* Fix an oops with non-MSIX devices;
parents 614c70f3 c537e07b

drivers/net/wireless/intel/iwlwifi/cfg/22000.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
#define IWL_DEVICE_AX210						\

	IWL_DEVICE_AX200_COMMON,					\

	.device_family = IWL_DEVICE_FAMILY_AX210,			\

	.base_params = &iwl_22000_base_params,				\

	.base_params = &iwl_22560_base_params,				\

	.csr = &iwl_csr_v1,						\

	.min_txq_size = 128

drivers/net/wireless/intel/iwlwifi/fw/file.h

+9 −6
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ struct iwl_ucode_header { 
	} u;

};



#define IWL_UCODE_INI_TLV_GROUP	BIT(24)

#define IWL_UCODE_INI_TLV_GROUP	0x1000000



/*

 * new TLV uCode file layout
@@ -148,11 +148,14 @@ enum iwl_ucode_tlv_type { 
	IWL_UCODE_TLV_UMAC_DEBUG_ADDRS	= 54,

	IWL_UCODE_TLV_LMAC_DEBUG_ADDRS	= 55,

	IWL_UCODE_TLV_FW_RECOVERY_INFO	= 57,

	IWL_UCODE_TLV_TYPE_BUFFER_ALLOCATION	= IWL_UCODE_INI_TLV_GROUP | 0x1,

	IWL_UCODE_TLV_TYPE_HCMD			= IWL_UCODE_INI_TLV_GROUP | 0x2,

	IWL_UCODE_TLV_TYPE_REGIONS		= IWL_UCODE_INI_TLV_GROUP | 0x3,

	IWL_UCODE_TLV_TYPE_TRIGGERS		= IWL_UCODE_INI_TLV_GROUP | 0x4,

	IWL_UCODE_TLV_TYPE_DEBUG_FLOW		= IWL_UCODE_INI_TLV_GROUP | 0x5,



	IWL_UCODE_TLV_TYPE_BUFFER_ALLOCATION	= IWL_UCODE_INI_TLV_GROUP + 0x1,

	IWL_UCODE_TLV_DEBUG_BASE = IWL_UCODE_TLV_TYPE_BUFFER_ALLOCATION,

	IWL_UCODE_TLV_TYPE_HCMD			= IWL_UCODE_INI_TLV_GROUP + 0x2,

	IWL_UCODE_TLV_TYPE_REGIONS		= IWL_UCODE_INI_TLV_GROUP + 0x3,

	IWL_UCODE_TLV_TYPE_TRIGGERS		= IWL_UCODE_INI_TLV_GROUP + 0x4,

	IWL_UCODE_TLV_TYPE_DEBUG_FLOW		= IWL_UCODE_INI_TLV_GROUP + 0x5,

	IWL_UCODE_TLV_DEBUG_MAX = IWL_UCODE_TLV_TYPE_DEBUG_FLOW,



	/* TLVs 0x1000-0x2000 are for internal driver usage */

	IWL_UCODE_TLV_FW_DBG_DUMP_LST	= 0x1000,

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

+2 −1
Original line number Diff line number Diff line
@@ -126,7 +126,8 @@ void iwl_alloc_dbg_tlv(struct iwl_trans *trans, size_t len, const u8 *data, 
		len -= ALIGN(tlv_len, 4);

		data += sizeof(*tlv) + ALIGN(tlv_len, 4);



		if (!(tlv_type & IWL_UCODE_INI_TLV_GROUP))

		if (tlv_type < IWL_UCODE_TLV_DEBUG_BASE ||

		    tlv_type > IWL_UCODE_TLV_DEBUG_MAX)

			continue;



		hdr = (void *)&tlv->data[0];

drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c

+5 −0
Original line number Diff line number Diff line
@@ -774,6 +774,11 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 
		return;



	mvmvif->dbgfs_dir = debugfs_create_dir("iwlmvm", dbgfs_dir);

	if (IS_ERR_OR_NULL(mvmvif->dbgfs_dir)) {

		IWL_ERR(mvm, "Failed to create debugfs directory under %pd\n",

			dbgfs_dir);

		return;

	}



	if (!mvmvif->dbgfs_dir) {

		IWL_ERR(mvm, "Failed to create debugfs directory under %pd\n",

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

+3 −1
Original line number Diff line number Diff line
@@ -1121,7 +1121,9 @@ int iwl_mvm_up(struct iwl_mvm *mvm) 
	ret = iwl_mvm_load_rt_fw(mvm);

	if (ret) {

		IWL_ERR(mvm, "Failed to start RT ucode: %d\n", ret);

		iwl_fw_dbg_error_collect(&mvm->fwrt, FW_DBG_TRIGGER_DRIVER);

		if (ret != -ERFKILL)

			iwl_fw_dbg_error_collect(&mvm->fwrt,

						 FW_DBG_TRIGGER_DRIVER);

		goto error;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE