110 lines
3.9 KiB
Diff
110 lines
3.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: "Dutta, Ranjan" <ranjan.dutta@intel.com>
|
|
Date: Tue, 10 Mar 2020 21:59:22 +0800
|
|
Subject: [PATCH] Revert "iwlwifi: nvm: get num of hw addresses from firmware"
|
|
|
|
This reverts commit 11b1ef19429d08014b42f7e4ee88796193058e60.
|
|
|
|
Tracked-On: PKT-3177
|
|
---
|
|
.../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 14 +++++++-------
|
|
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 10 +---------
|
|
2 files changed, 8 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h b/drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h
|
|
index d22c1eefba6a..6c5338364794 100644
|
|
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h
|
|
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h
|
|
@@ -165,7 +165,7 @@ struct iwl_nvm_access_resp {
|
|
*/
|
|
struct iwl_nvm_get_info {
|
|
__le32 reserved;
|
|
-} __packed; /* REGULATORY_NVM_GET_INFO_CMD_API_S_VER_1 */
|
|
+} __packed; /* GRP_REGULATORY_NVM_GET_INFO_CMD_S_VER_1 */
|
|
|
|
/**
|
|
* enum iwl_nvm_info_general_flags - flags in NVM_GET_INFO resp
|
|
@@ -180,14 +180,14 @@ enum iwl_nvm_info_general_flags {
|
|
* @flags: bit 0: 1 - empty, 0 - non-empty
|
|
* @nvm_version: nvm version
|
|
* @board_type: board type
|
|
- * @n_hw_addrs: number of reserved MAC addresses
|
|
+ * @reserved: reserved
|
|
*/
|
|
struct iwl_nvm_get_info_general {
|
|
__le32 flags;
|
|
__le16 nvm_version;
|
|
u8 board_type;
|
|
- u8 n_hw_addrs;
|
|
-} __packed; /* REGULATORY_NVM_GET_INFO_GENERAL_S_VER_2 */
|
|
+ u8 reserved;
|
|
+} __packed; /* GRP_REGULATORY_NVM_GET_INFO_GENERAL_S_VER_1 */
|
|
|
|
/**
|
|
* enum iwl_nvm_mac_sku_flags - flags in &iwl_nvm_get_info_sku
|
|
@@ -231,7 +231,7 @@ struct iwl_nvm_get_info_sku {
|
|
struct iwl_nvm_get_info_phy {
|
|
__le32 tx_chains;
|
|
__le32 rx_chains;
|
|
-} __packed; /* REGULATORY_NVM_GET_INFO_PHY_SKU_SECTION_S_VER_1 */
|
|
+} __packed; /* GRP_REGULATORY_NVM_GET_INFO_PHY_SKU_SECTION_S_VER_1 */
|
|
|
|
#define IWL_NUM_CHANNELS (51)
|
|
|
|
@@ -245,7 +245,7 @@ struct iwl_nvm_get_info_regulatory {
|
|
__le32 lar_enabled;
|
|
__le16 channel_profile[IWL_NUM_CHANNELS];
|
|
__le16 reserved;
|
|
-} __packed; /* REGULATORY_NVM_GET_INFO_REGULATORY_S_VER_1 */
|
|
+} __packed; /* GRP_REGULATORY_NVM_GET_INFO_REGULATORY_S_VER_1 */
|
|
|
|
/**
|
|
* struct iwl_nvm_get_info_rsp - response to get NVM data
|
|
@@ -259,7 +259,7 @@ struct iwl_nvm_get_info_rsp {
|
|
struct iwl_nvm_get_info_sku mac_sku;
|
|
struct iwl_nvm_get_info_phy phy_sku;
|
|
struct iwl_nvm_get_info_regulatory regulatory;
|
|
-} __packed; /* REGULATORY_NVM_GET_INFO_RSP_API_S_VER_3 */
|
|
+} __packed; /* GRP_REGULATORY_NVM_GET_INFO_CMD_RSP_S_VER_2 */
|
|
|
|
/**
|
|
* struct iwl_nvm_access_complete_cmd - NVM_ACCESS commands are completed
|
|
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
|
|
index a6e64787a345..a80fd0743748 100644
|
|
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
|
|
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
|
|
@@ -1359,7 +1359,6 @@ struct iwl_nvm_data *iwl_get_nvm(struct iwl_trans *trans,
|
|
bool lar_fw_supported = !iwlwifi_mod_params.lar_disable &&
|
|
fw_has_capa(&fw->ucode_capa,
|
|
IWL_UCODE_TLV_CAPA_LAR_SUPPORT);
|
|
- bool empty_otp;
|
|
u32 mac_flags;
|
|
u32 sbands_flags = 0;
|
|
|
|
@@ -1375,9 +1374,7 @@ struct iwl_nvm_data *iwl_get_nvm(struct iwl_trans *trans,
|
|
}
|
|
|
|
rsp = (void *)hcmd.resp_pkt->data;
|
|
- empty_otp = !!(le32_to_cpu(rsp->general.flags) &
|
|
- NVM_GENERAL_FLAGS_EMPTY_OTP);
|
|
- if (empty_otp)
|
|
+ if (le32_to_cpu(rsp->general.flags) & NVM_GENERAL_FLAGS_EMPTY_OTP)
|
|
IWL_INFO(trans, "OTP is empty\n");
|
|
|
|
nvm = kzalloc(sizeof(*nvm) +
|
|
@@ -1401,11 +1398,6 @@ struct iwl_nvm_data *iwl_get_nvm(struct iwl_trans *trans,
|
|
|
|
/* Initialize general data */
|
|
nvm->nvm_version = le16_to_cpu(rsp->general.nvm_version);
|
|
- nvm->n_hw_addrs = rsp->general.n_hw_addrs;
|
|
- if (nvm->n_hw_addrs == 0)
|
|
- IWL_WARN(trans,
|
|
- "Firmware declares no reserved mac addresses. OTP is empty: %d\n",
|
|
- empty_otp);
|
|
|
|
/* Initialize MAC sku data */
|
|
mac_flags = le32_to_cpu(rsp->mac_sku.mac_sku_flags);
|
|
--
|
|
https://clearlinux.org
|
|
|