summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-10-18 02:00:40 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-10-18 02:00:40 -0700
commit20caa060844314aa4a2cd2e50c9e82eb12d57b34 (patch)
treebbbc568d4db5da898beb3cd1da8af3b7a68fa141
parent8fa49f2cb14b97e1f75f94801bf49a606db6c050 (diff)
parentb8e1d2e9dfac1a7c1484f7491b2bb42b27f74c66 (diff)
Merge "cnss2: Support multiple recoveries when using CORE only firmware"
-rw-r--r--drivers/net/wireless/cnss2/main.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/cnss2/main.c b/drivers/net/wireless/cnss2/main.c
index 6b966c5b24fe..d3afb516b119 100644
--- a/drivers/net/wireless/cnss2/main.c
+++ b/drivers/net/wireless/cnss2/main.c
@@ -58,6 +58,7 @@ MODULE_PARM_DESC(enable_waltest, "Enable to handle firmware waltest");
enum cnss_debug_quirks {
LINK_DOWN_SELF_RECOVERY,
SKIP_DEVICE_BOOT,
+ USE_CORE_ONLY_FW,
};
unsigned long quirks;
@@ -1113,6 +1114,12 @@ static int cnss_qca6290_powerup(struct cnss_plat_data *plat_priv)
return 0;
}
+ if (test_bit(USE_CORE_ONLY_FW, &quirks)) {
+ clear_bit(CNSS_FW_BOOT_RECOVERY, &plat_priv->driver_state);
+ clear_bit(CNSS_DRIVER_RECOVERY, &plat_priv->driver_state);
+ return 0;
+ }
+
cnss_set_pin_connect_status(plat_priv);
if (qmi_bypass) {