From: Maya Erez <qca_merez@qca.qualcomm.com>
To: Kalle Valo <kvalo@codeaurora.org>
Cc: Dedy Lansky <qca_dlansky@qualcomm.com>,
linux-wireless@vger.kernel.org, wil6210@qca.qualcomm.com,
Maya Erez <qca_merez@qca.qualcomm.com>
Subject: [PATCH 05/12] wil6210: support new WMI-only FW capability
Date: Wed, 11 Jan 2017 18:12:41 +0200 [thread overview]
Message-ID: <1484151168-894-6-git-send-email-qca_merez@qca.qualcomm.com> (raw)
In-Reply-To: <1484151168-894-1-git-send-email-qca_merez@qca.qualcomm.com>
From: Dedy Lansky <qca_dlansky@qca.qualcomm.com>
WMI_ONLY FW is used for testing in production. It cannot be used for
scan/connect, etc.
In case FW reports this capability, driver will not allow interface up.
Signed-off-by: Dedy Lansky <qca_dlansky@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
---
drivers/net/wireless/ath/wil6210/netdev.c | 5 +++--
drivers/net/wireless/ath/wil6210/pcie_bus.c | 10 +++++++---
drivers/net/wireless/ath/wil6210/wmi.h | 1 +
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/ath/wil6210/netdev.c b/drivers/net/wireless/ath/wil6210/netdev.c
index 353cd71..a92d7bb 100644
--- a/drivers/net/wireless/ath/wil6210/netdev.c
+++ b/drivers/net/wireless/ath/wil6210/netdev.c
@@ -24,8 +24,9 @@ static int wil_open(struct net_device *ndev)
wil_dbg_misc(wil, "open\n");
- if (debug_fw) {
- wil_err(wil, "while in debug_fw mode\n");
+ if (debug_fw ||
+ test_bit(WMI_FW_CAPABILITY_WMI_ONLY, wil->fw_capabilities)) {
+ wil_err(wil, "while in debug_fw or wmi_only mode\n");
return -EINVAL;
}
diff --git a/drivers/net/wireless/ath/wil6210/pcie_bus.c b/drivers/net/wireless/ath/wil6210/pcie_bus.c
index d186115..d6c65a9 100644
--- a/drivers/net/wireless/ath/wil6210/pcie_bus.c
+++ b/drivers/net/wireless/ath/wil6210/pcie_bus.c
@@ -99,8 +99,10 @@ static int wil_if_pcie_enable(struct wil6210_priv *wil)
*/
int msi_only = pdev->msi_enabled;
bool _use_msi = use_msi;
+ bool wmi_only = test_bit(WMI_FW_CAPABILITY_WMI_ONLY,
+ wil->fw_capabilities);
- wil_dbg_misc(wil, "if_pcie_enable\n");
+ wil_dbg_misc(wil, "if_pcie_enable, wmi_only %d\n", wmi_only);
pdev->msi_enabled = 0;
@@ -123,9 +125,11 @@ static int wil_if_pcie_enable(struct wil6210_priv *wil)
if (rc)
goto stop_master;
- /* need reset here to obtain MAC */
+ /* need reset here to obtain MAC or in case of WMI-only FW, full reset
+ * and fw loading takes place
+ */
mutex_lock(&wil->mutex);
- rc = wil_reset(wil, false);
+ rc = wil_reset(wil, wmi_only);
mutex_unlock(&wil->mutex);
if (rc)
goto release_irq;
diff --git a/drivers/net/wireless/ath/wil6210/wmi.h b/drivers/net/wireless/ath/wil6210/wmi.h
index 4996fc8..ad2782f 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.h
+++ b/drivers/net/wireless/ath/wil6210/wmi.h
@@ -57,6 +57,7 @@ enum wmi_fw_capability {
WMI_FW_CAPABILITY_RF_SECTORS = 2,
WMI_FW_CAPABILITY_MGMT_RETRY_LIMIT = 3,
WMI_FW_CAPABILITY_DISABLE_AP_SME = 4,
+ WMI_FW_CAPABILITY_WMI_ONLY = 5,
WMI_FW_CAPABILITY_MAX,
};
--
1.9.1
next prev parent reply other threads:[~2017-01-11 16:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-11 16:12 [PATCH 00/12] wil6210 patches Maya Erez
2017-01-11 16:12 ` [PATCH 01/12] wil6210: add sysfs file for FTM calibration Maya Erez
2017-01-11 16:12 ` [PATCH 02/12] wil6210: add disable_ap_sme module parameter Maya Erez
2017-01-11 16:12 ` [PATCH 03/12] wil6210: support loading dedicated image for sparrow-plus devices Maya Erez
2017-01-11 16:12 ` [PATCH 04/12] wil6210: remove __func__ from debug printouts Maya Erez
2017-01-11 16:12 ` Maya Erez [this message]
2017-01-11 16:12 ` [PATCH 06/12] wil6210: missing reinit_completion in wmi_call Maya Erez
2017-01-11 16:12 ` [PATCH 07/12] wil6210: protect against false interrupt during reset sequence Maya Erez
2017-01-11 16:12 ` [PATCH 08/12] wil6210: fix for broadcast workaround in PBSS Maya Erez
2017-01-11 16:12 ` [PATCH 09/12] wil6210: align to latest auto generated wmi.h Maya Erez
2017-01-11 16:12 ` [PATCH 10/12] wil6210: report association ID (AID) per station in debugfs Maya Erez
2017-01-11 16:12 ` [PATCH 11/12] wil6210: option to override A-BFT length in start AP/PCP Maya Erez
2017-01-11 16:12 ` [PATCH 12/12] wil6210: set dma mask to reflect device capability Maya Erez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1484151168-894-6-git-send-email-qca_merez@qca.qualcomm.com \
--to=qca_merez@qca.qualcomm.com \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
--cc=qca_dlansky@qualcomm.com \
--cc=wil6210@qca.qualcomm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox