openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mwifiex: parse API version from FW 

This patch adds support to parse FW API version TLVs.
Currently only API version for key_material is supported.

Signed-off-by: Avinash Patil <patila@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Avinash Patil 2014-02-07 16:30:42 -08:00 committed by John W. Linville
parent be104b916c
commit 7f445d0435
4 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/net/wireless/mwifiex/cmdevt.c
View File

@ -1455,7 +1455,10 @@ int mwifiex_ret_get_hw_spec(struct mwifiex_private *priv,
{ {
struct host_cmd_ds_get_hw_spec *hw_spec = &resp->params.hw_spec; struct host_cmd_ds_get_hw_spec *hw_spec = &resp->params.hw_spec;
struct mwifiex_adapter *adapter = priv->adapter; struct mwifiex_adapter *adapter = priv->adapter;
int i; struct mwifiex_ie_types_header *tlv;
struct hw_spec_fw_api_rev *api_rev;
u16 resp_size, api_id;
int i, left_len, parsed_len = 0;
adapter->fw_cap_info = le32_to_cpu(hw_spec->fw_cap_info); adapter->fw_cap_info = le32_to_cpu(hw_spec->fw_cap_info);
@ -1513,6 +1516,46 @@ int mwifiex_ret_get_hw_spec(struct mwifiex_private *priv,
adapter->is_hw_11ac_capable = false; adapter->is_hw_11ac_capable = false;
} }
resp_size = le16_to_cpu(resp->size) - S_DS_GEN;
if (resp_size > sizeof(struct host_cmd_ds_get_hw_spec)) {
/* we have variable HW SPEC information */
left_len = resp_size - sizeof(struct host_cmd_ds_get_hw_spec);
while (left_len > sizeof(struct mwifiex_ie_types_header)) {
tlv = (void *)&hw_spec->tlvs + parsed_len;
switch (le16_to_cpu(tlv->type)) {
case TLV_TYPE_FW_API_REV:
api_rev = (struct hw_spec_fw_api_rev *)tlv;
api_id = le16_to_cpu(api_rev->api_id);
switch (api_id) {
case KEY_API_VER_ID:
adapter->fw_key_api_major_ver =
api_rev->major_ver;
adapter->fw_key_api_minor_ver =
api_rev->minor_ver;
dev_dbg(adapter->dev,
"fw_key_api v%d.%d\n",
adapter->fw_key_api_major_ver,
adapter->fw_key_api_minor_ver);
break;
default:
dev_warn(adapter->dev,
"Unknown FW api_id: %d\n",
api_id);
break;
}
break;
default:
dev_warn(adapter->dev,
"Unknown GET_HW_SPEC TLV type: %#x\n",
le16_to_cpu(tlv->type));
break;
}
parsed_len += le16_to_cpu(tlv->len) +
sizeof(struct mwifiex_ie_types_header);
left_len -= parsed_len;
}
}
dev_dbg(adapter->dev, "info: GET_HW_SPEC: fw_release_number- %#x\n", dev_dbg(adapter->dev, "info: GET_HW_SPEC: fw_release_number- %#x\n",
adapter->fw_release_number); adapter->fw_release_number);
dev_dbg(adapter->dev, "info: GET_HW_SPEC: permanent addr: %pM\n", dev_dbg(adapter->dev, "info: GET_HW_SPEC: permanent addr: %pM\n",

13
drivers/net/wireless/mwifiex/fw.h
View File

@ -159,6 +159,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {
#define TLV_TYPE_PWK_CIPHER (PROPRIETARY_TLV_BASE_ID + 145) #define TLV_TYPE_PWK_CIPHER (PROPRIETARY_TLV_BASE_ID + 145)
#define TLV_TYPE_GWK_CIPHER (PROPRIETARY_TLV_BASE_ID + 146) #define TLV_TYPE_GWK_CIPHER (PROPRIETARY_TLV_BASE_ID + 146)
#define TLV_TYPE_COALESCE_RULE (PROPRIETARY_TLV_BASE_ID + 154) #define TLV_TYPE_COALESCE_RULE (PROPRIETARY_TLV_BASE_ID + 154)
#define TLV_TYPE_FW_API_REV (PROPRIETARY_TLV_BASE_ID + 199)
#define MWIFIEX_TX_DATA_BUF_SIZE_2K 2048 #define MWIFIEX_TX_DATA_BUF_SIZE_2K 2048
@ -751,6 +752,17 @@ struct host_cmd_ds_802_11_ps_mode_enh {
} params; } params;
} __packed; } __packed;
enum FW_API_VER_ID {
KEY_API_VER_ID = 1,
};
struct hw_spec_fw_api_rev {
struct mwifiex_ie_types_header header;
__le16 api_id;
u8 major_ver;
u8 minor_ver;
} __packed;
struct host_cmd_ds_get_hw_spec { struct host_cmd_ds_get_hw_spec {
__le16 hw_if_version; __le16 hw_if_version;
__le16 version; __le16 version;
@ -772,6 +784,7 @@ struct host_cmd_ds_get_hw_spec {
__le32 reserved_6; __le32 reserved_6;
__le32 dot_11ac_dev_cap; __le32 dot_11ac_dev_cap;
__le32 dot_11ac_mcs_support; __le32 dot_11ac_mcs_support;
u8 tlvs[0];
} __packed; } __packed;
struct host_cmd_ds_802_11_rssi_info { struct host_cmd_ds_802_11_rssi_info {

2
drivers/net/wireless/mwifiex/init.c
View File

@ -283,6 +283,8 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)
adapter->max_mgmt_ie_index = MAX_MGMT_IE_INDEX; adapter->max_mgmt_ie_index = MAX_MGMT_IE_INDEX;
adapter->empty_tx_q_cnt = 0; adapter->empty_tx_q_cnt = 0;
adapter->ext_scan = true; adapter->ext_scan = true;
adapter->fw_key_api_major_ver = 0;
adapter->fw_key_api_minor_ver = 0;
} }
/* /*

1
drivers/net/wireless/mwifiex/main.h
View File

@ -801,6 +801,7 @@ struct mwifiex_adapter {
atomic_t pending_bridged_pkts; atomic_t pending_bridged_pkts;
struct semaphore *card_sem; struct semaphore *card_sem;
bool ext_scan; bool ext_scan;
u8 fw_key_api_major_ver, fw_key_api_minor_ver;
}; };
int mwifiex_init_lock_list(struct mwifiex_adapter *adapter); int mwifiex_init_lock_list(struct mwifiex_adapter *adapter);