|
@@ -27,10 +27,6 @@
|
|
|
#include "debug.h"
|
|
|
#include "hif-ops.h"
|
|
|
|
|
|
-static unsigned int testmode;
|
|
|
-
|
|
|
-module_param(testmode, uint, 0644);
|
|
|
-
|
|
|
static const struct ath6kl_hw hw_list[] = {
|
|
|
{
|
|
|
.id = AR6003_HW_2_0_VERSION,
|
|
@@ -731,39 +727,54 @@ static int ath6kl_fetch_otp_file(struct ath6kl *ar)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int ath6kl_fetch_fw_file(struct ath6kl *ar)
|
|
|
+static int ath6kl_fetch_testmode_file(struct ath6kl *ar)
|
|
|
{
|
|
|
char filename[100];
|
|
|
int ret;
|
|
|
|
|
|
- if (ar->fw != NULL)
|
|
|
+ if (ar->testmode == 0)
|
|
|
return 0;
|
|
|
|
|
|
- if (testmode) {
|
|
|
- ath6kl_dbg(ATH6KL_DBG_BOOT, "testmode %d\n",
|
|
|
- testmode);
|
|
|
- if (testmode == 2) {
|
|
|
- if (ar->hw.fw.utf == NULL) {
|
|
|
- ath6kl_warn("testmode 2 not supported\n");
|
|
|
- return -EOPNOTSUPP;
|
|
|
- }
|
|
|
+ ath6kl_dbg(ATH6KL_DBG_BOOT, "testmode %d\n", ar->testmode);
|
|
|
|
|
|
- snprintf(filename, sizeof(filename), "%s/%s",
|
|
|
- ar->hw.fw.dir, ar->hw.fw.utf);
|
|
|
- } else {
|
|
|
- if (ar->hw.fw.tcmd == NULL) {
|
|
|
- ath6kl_warn("testmode 1 not supported\n");
|
|
|
- return -EOPNOTSUPP;
|
|
|
- }
|
|
|
+ if (ar->testmode == 2) {
|
|
|
+ if (ar->hw.fw.utf == NULL) {
|
|
|
+ ath6kl_warn("testmode 2 not supported\n");
|
|
|
+ return -EOPNOTSUPP;
|
|
|
+ }
|
|
|
|
|
|
- snprintf(filename, sizeof(filename), "%s/%s",
|
|
|
- ar->hw.fw.dir, ar->hw.fw.tcmd);
|
|
|
+ snprintf(filename, sizeof(filename), "%s/%s",
|
|
|
+ ar->hw.fw.dir, ar->hw.fw.utf);
|
|
|
+ } else {
|
|
|
+ if (ar->hw.fw.tcmd == NULL) {
|
|
|
+ ath6kl_warn("testmode 1 not supported\n");
|
|
|
+ return -EOPNOTSUPP;
|
|
|
}
|
|
|
- set_bit(TESTMODE, &ar->flag);
|
|
|
|
|
|
- goto get_fw;
|
|
|
+ snprintf(filename, sizeof(filename), "%s/%s",
|
|
|
+ ar->hw.fw.dir, ar->hw.fw.tcmd);
|
|
|
}
|
|
|
|
|
|
+ set_bit(TESTMODE, &ar->flag);
|
|
|
+
|
|
|
+ ret = ath6kl_get_fw(ar, filename, &ar->fw, &ar->fw_len);
|
|
|
+ if (ret) {
|
|
|
+ ath6kl_err("Failed to get testmode %d firmware file %s: %d\n",
|
|
|
+ ar->testmode, filename, ret);
|
|
|
+ return ret;
|
|
|
+ }
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+static int ath6kl_fetch_fw_file(struct ath6kl *ar)
|
|
|
+{
|
|
|
+ char filename[100];
|
|
|
+ int ret;
|
|
|
+
|
|
|
+ if (ar->fw != NULL)
|
|
|
+ return 0;
|
|
|
+
|
|
|
/* FIXME: remove WARN_ON() as we won't support FW API 1 for long */
|
|
|
if (WARN_ON(ar->hw.fw.fw == NULL))
|
|
|
return -EINVAL;
|
|
@@ -771,7 +782,6 @@ static int ath6kl_fetch_fw_file(struct ath6kl *ar)
|
|
|
snprintf(filename, sizeof(filename), "%s/%s",
|
|
|
ar->hw.fw.dir, ar->hw.fw.fw);
|
|
|
|
|
|
-get_fw:
|
|
|
ret = ath6kl_get_fw(ar, filename, &ar->fw, &ar->fw_len);
|
|
|
if (ret) {
|
|
|
ath6kl_err("Failed to get firmware file %s: %d\n",
|
|
@@ -812,7 +822,7 @@ static int ath6kl_fetch_testscript_file(struct ath6kl *ar)
|
|
|
char filename[100];
|
|
|
int ret;
|
|
|
|
|
|
- if (testmode != 2)
|
|
|
+ if (ar->testmode != 2)
|
|
|
return 0;
|
|
|
|
|
|
if (ar->fw_testscript != NULL)
|
|
@@ -927,6 +937,10 @@ static int ath6kl_fetch_fw_apin(struct ath6kl *ar, const char *name)
|
|
|
ath6kl_dbg(ATH6KL_DBG_BOOT, "found fw image ie (%zd B)\n",
|
|
|
ie_len);
|
|
|
|
|
|
+ /* in testmode we already might have a fw file */
|
|
|
+ if (ar->fw != NULL)
|
|
|
+ break;
|
|
|
+
|
|
|
ar->fw = kmemdup(data, ie_len, GFP_KERNEL);
|
|
|
|
|
|
if (ar->fw == NULL) {
|
|
@@ -1038,6 +1052,10 @@ int ath6kl_init_fetch_firmwares(struct ath6kl *ar)
|
|
|
if (ret)
|
|
|
return ret;
|
|
|
|
|
|
+ ret = ath6kl_fetch_testmode_file(ar);
|
|
|
+ if (ret)
|
|
|
+ return ret;
|
|
|
+
|
|
|
ret = ath6kl_fetch_fw_apin(ar, ATH6KL_FW_API3_FILE);
|
|
|
if (ret == 0) {
|
|
|
ar->fw_api = 3;
|
|
@@ -1283,7 +1301,7 @@ static int ath6kl_upload_testscript(struct ath6kl *ar)
|
|
|
u32 address, param;
|
|
|
int ret;
|
|
|
|
|
|
- if (testmode != 2)
|
|
|
+ if (ar->testmode != 2)
|
|
|
return 0;
|
|
|
|
|
|
if (ar->fw_testscript == NULL)
|