leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ath10k: move fw_version inside struct ath10k_fw_file

Browse Source 
Preparation for testmode.c to use ath10k_core_fetch_board_data_api_n().

Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Kalle Valo 2016-04-20 19:45:05 +03:00
parent 7ebf721d0d
commit 4531735502
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/wireless/ath/ath10k/core.c
View File

@ -1039,15 +1039,15 @@ static int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name,
switch (ie_id) { switch (ie_id) {
case ATH10K_FW_IE_FW_VERSION: case ATH10K_FW_IE_FW_VERSION:
if (ie_len > sizeof(ar->hw->wiphy->fw_version) - 1) if (ie_len > sizeof(fw_file->fw_version) - 1)
break; break;
memcpy(ar->hw->wiphy->fw_version, data, ie_len); memcpy(fw_file->fw_version, data, ie_len);
ar->hw->wiphy->fw_version[ie_len] = '\0'; fw_file->fw_version[ie_len] = '\0';
ath10k_dbg(ar, ATH10K_DBG_BOOT, ath10k_dbg(ar, ATH10K_DBG_BOOT,
"found fw version %s\n", "found fw version %s\n",
ar->hw->wiphy->fw_version); fw_file->fw_version);
break; break;
case ATH10K_FW_IE_TIMESTAMP: case ATH10K_FW_IE_TIMESTAMP:
if (ie_len != sizeof(u32)) if (ie_len != sizeof(u32))
@ -1866,6 +1866,11 @@ static int ath10k_core_probe_fw(struct ath10k *ar)
goto err_power_down; goto err_power_down;
} }
BUILD_BUG_ON(sizeof(ar->hw->wiphy->fw_version) !=
sizeof(ar->normal_mode_fw.fw_file.fw_version));
memcpy(ar->hw->wiphy->fw_version, ar->normal_mode_fw.fw_file.fw_version,
sizeof(ar->hw->wiphy->fw_version));
ath10k_debug_print_hwfw_info(ar); ath10k_debug_print_hwfw_info(ar);
ret = ath10k_core_pre_cal_download(ar); ret = ath10k_core_pre_cal_download(ar);

3
drivers/net/wireless/ath/ath10k/core.h
View File

@ -630,6 +630,8 @@ enum ath10k_tx_pause_reason {
struct ath10k_fw_file { struct ath10k_fw_file {
const struct firmware *firmware; const struct firmware *firmware;
char fw_version[ETHTOOL_FWVERS_LEN];
const void *firmware_data; const void *firmware_data;
size_t firmware_len; size_t firmware_len;
@ -893,7 +895,6 @@ struct ath10k {
struct { struct {
/* protected by conf_mutex */ /* protected by conf_mutex */
struct ath10k_fw_components utf_mode_fw; struct ath10k_fw_components utf_mode_fw;
char utf_version[32];
DECLARE_BITMAP(orig_fw_features, ATH10K_FW_FEATURE_COUNT); DECLARE_BITMAP(orig_fw_features, ATH10K_FW_FEATURE_COUNT);
enum ath10k_fw_wmi_op_version orig_wmi_op_version; enum ath10k_fw_wmi_op_version orig_wmi_op_version;
enum ath10k_fw_wmi_op_version op_version; enum ath10k_fw_wmi_op_version op_version;

12
drivers/net/wireless/ath/ath10k/testmode.c
View File

@ -205,15 +205,15 @@ static int ath10k_tm_fetch_utf_firmware_api_2(struct ath10k *ar,
switch (ie_id) { switch (ie_id) {
case ATH10K_FW_IE_FW_VERSION: case ATH10K_FW_IE_FW_VERSION:
if (ie_len > sizeof(ar->testmode.utf_version) - 1) if (ie_len > sizeof(fw_file->fw_version) - 1)
break; break;
memcpy(ar->testmode.utf_version, data, ie_len); memcpy(fw_file->fw_version, data, ie_len);
ar->testmode.utf_version[ie_len] = '\0'; fw_file->fw_version[ie_len] = '\0';
ath10k_dbg(ar, ATH10K_DBG_TESTMODE, ath10k_dbg(ar, ATH10K_DBG_TESTMODE,
"testmode found fw utf version %s\n", "testmode found fw utf version %s\n",
ar->testmode.utf_version); fw_file->fw_version);
break; break;
case ATH10K_FW_IE_TIMESTAMP: case ATH10K_FW_IE_TIMESTAMP:
/* ignore timestamp, but don't warn about it either */ /* ignore timestamp, but don't warn about it either */
@ -392,8 +392,8 @@ static int ath10k_tm_cmd_utf_start(struct ath10k *ar, struct nlattr *tb[])
ar->state = ATH10K_STATE_UTF; ar->state = ATH10K_STATE_UTF;
if (strlen(ar->testmode.utf_version) > 0) if (strlen(ar->testmode.utf_mode_fw.fw_file.fw_version) > 0)
ver = ar->testmode.utf_version; ver = ar->testmode.utf_mode_fw.fw_file.fw_version;
else else
ver = "API 1"; ver = "API 1";