Add dump_survey cfg80211 ops for HostApd AutoChannelSelection.
And fix related bug.
Changes in v2:
- refine error handling in brcmf_parse_dump_obss
- delare variable by using stack memory in brcmf_cfg80211_dump_survey
- provide debug message in error case of cfg80211_set_channel
- remove unnecessary NULL assignment in brcmf_cfg80211_attach
Double Lo (1):
brcmfmac: fix CERT-P2P:5.1.10 failure
Ramesh Rangavittal (1):
brcmfmac: Fix authentication latency caused by OBSS stats survey
Wright Feng (2):
brcmfmac: Add dump_survey cfg80211 ops for HostApd
AutoChannelSelection
brcmfmac: fix firmware trap while dumping obss stats
.../broadcom/brcm80211/brcmfmac/cfg80211.c | 258 ++++++++++++++++++
.../broadcom/brcm80211/brcmfmac/feature.c | 3 +-
.../broadcom/brcm80211/brcmfmac/feature.h | 4 +-
3 files changed, 263 insertions(+), 2 deletions(-)
--
2.25.0
From: Wright Feng <[email protected]>
When doing dump_survey, host will call "dump_obss" iovar to firmware
side. Host need to make sure the HW clock in dongle is on, or there is
high probability that firmware gets trap because register or shared
memory access failed. To fix this, we disable mpc when doing dump obss
and set it back after that.
[28350.512799] brcmfmac: brcmf_dump_obss: dump_obss error (-52)
[28743.402314] ieee80211 phy0: brcmf_fw_crashed: Firmware has halted or
crashed
[28745.869430] brcmfmac: brcmf_sdio_bus_rxctl: resumed on timeout
[28745.877546] brcmfmac: brcmf_sdio_checkdied: firmware trap in dongle
Signed-off-by: Wright Feng <[email protected]>
Signed-off-by: Chi-hsien Lin <[email protected]>
Signed-off-by: Ian Lin <[email protected]>
---
.../broadcom/brcm80211/brcmfmac/cfg80211.c | 38 +++++++++----------
1 file changed, 17 insertions(+), 21 deletions(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index f16dad462eb2..9f2f2a990f20 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -7659,16 +7659,15 @@ brcmf_dump_obss(struct brcmf_if *ifp, struct cca_msrmnt_query req,
int err;
buf = kzalloc(sizeof(char) * BRCMF_DCMD_MEDLEN, GFP_KERNEL);
- if (unlikely(!buf)) {
- brcmf_err("%s: buf alloc failed\n", __func__);
+ if (!buf)
return -ENOMEM;
- }
memcpy(buf, &req, sizeof(struct cca_msrmnt_query));
err = brcmf_fil_iovar_data_get(ifp, "dump_obss",
buf, BRCMF_DCMD_MEDLEN);
- if (err < 0) {
+ if (err) {
brcmf_err("dump_obss error (%d)\n", err);
+ err = -EINVAL;
goto exit;
}
results = (struct cca_stats_n_flags *)(buf);
@@ -7676,11 +7675,9 @@ brcmf_dump_obss(struct brcmf_if *ifp, struct cca_msrmnt_query req,
if (req.msrmnt_query)
brcmf_parse_dump_obss(results->buf, survey);
- kfree(buf);
- return 0;
exit:
kfree(buf);
- return -EINVAL;
+ return err;
}
static s32
@@ -7719,7 +7716,7 @@ brcmf_cfg80211_dump_survey(struct wiphy *wiphy, struct net_device *ndev,
struct ieee80211_supported_band *band;
struct ieee80211_channel *chan;
struct cca_msrmnt_query req;
- u32 val, noise;
+ u32 noise;
int err;
brcmf_dbg(TRACE, "Enter: channel idx=%d\n", idx);
@@ -7745,23 +7742,20 @@ brcmf_cfg80211_dump_survey(struct wiphy *wiphy, struct net_device *ndev,
return 0;
}
- if (!idx) {
- /* Disable mpc */
- val = 0;
- brcmf_set_mpc(ifp, val);
- /* Set interface up, explicitly. */
- val = 1;
- err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_UP, val);
- if (err) {
- brcmf_err("BRCMF_C_UP error (%d)\n", err);
- return -EIO;
- }
+ /* Disable mpc */
+ brcmf_set_mpc(ifp, 0);
+
+ /* Set interface up, explicitly. */
+ err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_UP, 1);
+ if (err) {
+ brcmf_err("set interface up failed, err = %d\n", err);
+ goto exit;
}
/* Get noise value */
err = brcmf_fil_cmd_int_get(ifp, BRCMF_C_GET_PHY_NOISE, &noise);
if (err) {
- brcmf_err("Get Phy Noise failed, error = %d\n", err);
+ brcmf_err("Get Phy Noise failed, use dummy value\n");
noise = CHAN_NOISE_DUMMY;
}
@@ -7778,7 +7772,7 @@ brcmf_cfg80211_dump_survey(struct wiphy *wiphy, struct net_device *ndev,
/* Issue IOVAR to collect measurement results */
req.msrmnt_query = 1;
err = brcmf_dump_obss(ifp, req, &survey);
- if (err < 0)
+ if (err)
goto exit;
info->channel = chan;
@@ -7799,6 +7793,8 @@ brcmf_cfg80211_dump_survey(struct wiphy *wiphy, struct net_device *ndev,
info->noise, info->time_busy, info->time_rx, info->time_tx);
exit:
+ if (!brcmf_is_apmode(ifp->vif))
+ brcmf_set_mpc(ifp, 1);
return err;
}
--
2.25.0
From: Wright Feng <[email protected]>
To enable ACS feature in Hostap daemon, dump_survey cfg80211 ops and dump
obss survey command in firmware side are needed. This patch is for adding
dump_survey feature and adding DUMP_OBSS feature flag to check if
firmware supports dump_obss iovar.
Signed-off-by: Wright Feng <[email protected]>
Signed-off-by: Chi-hsien Lin <[email protected]>
Signed-off-by: Ian Lin <[email protected]>
---
.../broadcom/brcm80211/brcmfmac/cfg80211.c | 256 ++++++++++++++++++
.../broadcom/brcm80211/brcmfmac/feature.c | 3 +-
.../broadcom/brcm80211/brcmfmac/feature.h | 4 +-
3 files changed, 261 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 42068145a447..f16dad462eb2 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -88,9 +88,39 @@
#define BRCMF_PS_MAX_TIMEOUT_MS 2000
+/* Dump obss definitions */
+#define ACS_MSRMNT_DELAY 100
+#define CHAN_NOISE_DUMMY (-80)
+#define OBSS_TOKEN_IDX 15
+#define IBSS_TOKEN_IDX 15
+#define TX_TOKEN_IDX 14
+#define CTG_TOKEN_IDX 13
+#define PKT_TOKEN_IDX 15
+#define IDLE_TOKEN_IDX 12
+
#define BRCMF_ASSOC_PARAMS_FIXED_SIZE \
(sizeof(struct brcmf_assoc_params_le) - sizeof(u16))
+struct brcmf_dump_survey {
+ u32 obss;
+ u32 ibss;
+ u32 no_ctg;
+ u32 no_pckt;
+ u32 tx;
+ u32 idle;
+};
+
+struct cca_stats_n_flags {
+ u32 msrmnt_time; /* Time for Measurement (msec) */
+ u32 msrmnt_done; /* flag set when measurement complete */
+ char buf[1];
+};
+
+struct cca_msrmnt_query {
+ u32 msrmnt_query;
+ u32 time_req;
+};
+
static bool check_vif_up(struct brcmf_cfg80211_vif *vif)
{
if (!test_bit(BRCMF_VIF_STATUS_READY, &vif->sme_state)) {
@@ -7549,6 +7579,229 @@ static s32 brcmf_translate_country_code(struct brcmf_pub *drvr, char alpha2[2],
return 0;
}
+static int
+brcmf_parse_dump_obss(char *buf, struct brcmf_dump_survey *survey)
+{
+ int i;
+ char *token;
+ char delim[] = "\n ";
+ unsigned long val;
+ int err = 0;
+
+ token = strsep(&buf, delim);
+ while (token) {
+ if (!strcmp(token, "OBSS")) {
+ for (i = 0; i < OBSS_TOKEN_IDX; i++)
+ token = strsep(&buf, delim);
+ err = kstrtoul(token, 10, &val);
+ if (err)
+ break;
+ survey->obss = val;
+ }
+
+ if (!strcmp(token, "IBSS")) {
+ for (i = 0; i < IBSS_TOKEN_IDX; i++)
+ token = strsep(&buf, delim);
+ err = kstrtoul(token, 10, &val);
+ if (err)
+ break;
+ survey->ibss = val;
+ }
+
+ if (!strcmp(token, "TXDur")) {
+ for (i = 0; i < TX_TOKEN_IDX; i++)
+ token = strsep(&buf, delim);
+ err = kstrtoul(token, 10, &val);
+ if (err)
+ break;
+ survey->tx = val;
+ }
+
+ if (!strcmp(token, "Category")) {
+ for (i = 0; i < CTG_TOKEN_IDX; i++)
+ token = strsep(&buf, delim);
+ err = kstrtoul(token, 10, &val);
+ if (err)
+ break;
+ survey->no_ctg = val;
+ }
+
+ if (!strcmp(token, "Packet")) {
+ for (i = 0; i < PKT_TOKEN_IDX; i++)
+ token = strsep(&buf, delim);
+ err = kstrtoul(token, 10, &val);
+ if (err)
+ break;
+ survey->no_pckt = val;
+ }
+
+ if (!strcmp(token, "Opp(time):")) {
+ for (i = 0; i < IDLE_TOKEN_IDX; i++)
+ token = strsep(&buf, delim);
+ err = kstrtoul(token, 10, &val);
+ if (err)
+ break;
+ survey->idle = val;
+ }
+
+ token = strsep(&buf, delim);
+ }
+
+ return err;
+}
+
+static int
+brcmf_dump_obss(struct brcmf_if *ifp, struct cca_msrmnt_query req,
+ struct brcmf_dump_survey *survey)
+{
+ struct cca_stats_n_flags *results;
+ char *buf;
+ int err;
+
+ buf = kzalloc(sizeof(char) * BRCMF_DCMD_MEDLEN, GFP_KERNEL);
+ if (unlikely(!buf)) {
+ brcmf_err("%s: buf alloc failed\n", __func__);
+ return -ENOMEM;
+ }
+
+ memcpy(buf, &req, sizeof(struct cca_msrmnt_query));
+ err = brcmf_fil_iovar_data_get(ifp, "dump_obss",
+ buf, BRCMF_DCMD_MEDLEN);
+ if (err < 0) {
+ brcmf_err("dump_obss error (%d)\n", err);
+ goto exit;
+ }
+ results = (struct cca_stats_n_flags *)(buf);
+
+ if (req.msrmnt_query)
+ brcmf_parse_dump_obss(results->buf, survey);
+
+ kfree(buf);
+ return 0;
+exit:
+ kfree(buf);
+ return -EINVAL;
+}
+
+static s32
+cfg80211_set_channel(struct wiphy *wiphy, struct net_device *dev,
+ struct ieee80211_channel *chan,
+ enum nl80211_channel_type channel_type)
+{
+ u16 chspec = 0;
+ int err = 0;
+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+ struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));
+
+ /* set_channel */
+ chspec = channel_to_chanspec(&cfg->d11inf, chan);
+ if (chspec != INVCHANSPEC) {
+ err = brcmf_fil_iovar_int_set(ifp, "chanspec", chspec);
+ if (err) {
+ err = -EINVAL;
+ brcmf_err("set chanspec 0x%04x fail\n", chspec);
+ }
+ } else {
+ brcmf_err("failed to convert host chanspec to fw chanspec\n");
+ err = -EINVAL;
+ }
+
+ return err;
+}
+
+static int
+brcmf_cfg80211_dump_survey(struct wiphy *wiphy, struct net_device *ndev,
+ int idx, struct survey_info *info)
+{
+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+ struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));
+ struct brcmf_dump_survey survey = {};
+ struct ieee80211_supported_band *band;
+ struct ieee80211_channel *chan;
+ struct cca_msrmnt_query req;
+ u32 val, noise;
+ int err;
+
+ brcmf_dbg(TRACE, "Enter: channel idx=%d\n", idx);
+
+ band = wiphy->bands[NL80211_BAND_2GHZ];
+ if (band && idx >= band->n_channels) {
+ idx -= band->n_channels;
+ band = NULL;
+ }
+
+ if (!band || idx >= band->n_channels) {
+ band = wiphy->bands[NL80211_BAND_5GHZ];
+ if (idx >= band->n_channels)
+ return -ENOENT;
+ }
+
+ /* Setting current channel to the requested channel */
+ chan = &band->channels[idx];
+ err = cfg80211_set_channel(wiphy, ndev, chan, NL80211_CHAN_HT20);
+ if (err) {
+ info->channel = chan;
+ info->filled = 0;
+ return 0;
+ }
+
+ if (!idx) {
+ /* Disable mpc */
+ val = 0;
+ brcmf_set_mpc(ifp, val);
+ /* Set interface up, explicitly. */
+ val = 1;
+ err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_UP, val);
+ if (err) {
+ brcmf_err("BRCMF_C_UP error (%d)\n", err);
+ return -EIO;
+ }
+ }
+
+ /* Get noise value */
+ err = brcmf_fil_cmd_int_get(ifp, BRCMF_C_GET_PHY_NOISE, &noise);
+ if (err) {
+ brcmf_err("Get Phy Noise failed, error = %d\n", err);
+ noise = CHAN_NOISE_DUMMY;
+ }
+
+ /* Start Measurement for obss stats on current channel */
+ req.msrmnt_query = 0;
+ req.time_req = ACS_MSRMNT_DELAY;
+ err = brcmf_dump_obss(ifp, req, &survey);
+ if (err)
+ goto exit;
+
+ /* Add 10 ms for IOVAR completion */
+ msleep(ACS_MSRMNT_DELAY + 10);
+
+ /* Issue IOVAR to collect measurement results */
+ req.msrmnt_query = 1;
+ err = brcmf_dump_obss(ifp, req, &survey);
+ if (err < 0)
+ goto exit;
+
+ info->channel = chan;
+ info->noise = noise;
+ info->time = ACS_MSRMNT_DELAY;
+ info->time_busy = ACS_MSRMNT_DELAY - survey.idle;
+ info->time_rx = survey.obss + survey.ibss + survey.no_ctg +
+ survey.no_pckt;
+ info->time_tx = survey.tx;
+ info->filled = SURVEY_INFO_NOISE_DBM | SURVEY_INFO_TIME |
+ SURVEY_INFO_TIME_BUSY | SURVEY_INFO_TIME_RX |
+ SURVEY_INFO_TIME_TX;
+
+ brcmf_dbg(INFO, "OBSS dump: channel %d: survey duraion %d\n",
+ ieee80211_frequency_to_channel(chan->center_freq),
+ ACS_MSRMNT_DELAY);
+ brcmf_dbg(INFO, "noise(%d) busy(%llu) rx(%llu) tx(%llu)\n",
+ info->noise, info->time_busy, info->time_rx, info->time_tx);
+
+exit:
+ return err;
+}
+
static void brcmf_cfg80211_reg_notifier(struct wiphy *wiphy,
struct regulatory_request *req)
{
@@ -7700,6 +7953,9 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr,
if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_WOWL_GTK))
ops->set_rekey_data = brcmf_cfg80211_set_rekey_data;
#endif
+ if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_DUMP_OBSS))
+ ops->dump_survey = brcmf_cfg80211_dump_survey;
+
err = wiphy_register(wiphy);
if (err < 0) {
bphy_err(drvr, "Could not register wiphy device (%d)\n", err);
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
index 2c2f3e026c13..10bac865d724 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
@@ -143,7 +143,7 @@ static void brcmf_feat_iovar_int_get(struct brcmf_if *ifp,
ifp->fwil_fwerr = true;
err = brcmf_fil_iovar_int_get(ifp, name, &data);
- if (err == 0) {
+ if (err != -BRCMF_FW_UNSUPPORTED) {
brcmf_dbg(INFO, "enabling feature: %s\n", brcmf_feat_names[id]);
ifp->drvr->feat_flags |= BIT(id);
} else {
@@ -281,6 +281,7 @@ void brcmf_feat_attach(struct brcmf_pub *drvr)
brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_RSDB, "rsdb_mode");
brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_TDLS, "tdls_enable");
brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_MFP, "mfp");
+ brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_DUMP_OBSS, "dump_obss");
pfn_mac.version = BRCMF_PFN_MACADDR_CFG_VER;
err = brcmf_fil_iovar_data_get(ifp, "pfn_macaddr", &pfn_mac,
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h
index d1f4257af696..f1b086a69d73 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h
@@ -29,6 +29,7 @@
* DOT11H: firmware supports 802.11h
* SAE: simultaneous authentication of equals
* FWAUTH: Firmware authenticator
+ * DUMP_OBSS: Firmware has capable to dump obss info to support ACS
*/
#define BRCMF_FEAT_LIST \
BRCMF_FEAT_DEF(MBSS) \
@@ -51,7 +52,8 @@
BRCMF_FEAT_DEF(MONITOR_FMT_HW_RX_HDR) \
BRCMF_FEAT_DEF(DOT11H) \
BRCMF_FEAT_DEF(SAE) \
- BRCMF_FEAT_DEF(FWAUTH)
+ BRCMF_FEAT_DEF(FWAUTH) \
+ BRCMF_FEAT_DEF(DUMP_OBSS)
/*
* Quirks:
--
2.25.0
From: Double Lo <[email protected]>
This patch fix CERT-P2P:5.1.10 failure at step 18 Group formation failed
due to chip is under dump survey. Decrease the dump survery duration to
pass this certification case.
Signed-off-by: Double Lo <[email protected]>
Signed-off-by: Chi-hsien Lin <[email protected]>
Signed-off-by: Ian Lin <[email protected]>
---
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 9f2f2a990f20..12a1135662e9 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -89,7 +89,7 @@
#define BRCMF_PS_MAX_TIMEOUT_MS 2000
/* Dump obss definitions */
-#define ACS_MSRMNT_DELAY 100
+#define ACS_MSRMNT_DELAY 80
#define CHAN_NOISE_DUMMY (-80)
#define OBSS_TOKEN_IDX 15
#define IBSS_TOKEN_IDX 15
@@ -7786,7 +7786,7 @@ brcmf_cfg80211_dump_survey(struct wiphy *wiphy, struct net_device *ndev,
SURVEY_INFO_TIME_BUSY | SURVEY_INFO_TIME_RX |
SURVEY_INFO_TIME_TX;
- brcmf_dbg(INFO, "OBSS dump: channel %d: survey duraion %d\n",
+ brcmf_dbg(INFO, "OBSS dump: channel %d: survey duration %d\n",
ieee80211_frequency_to_channel(chan->center_freq),
ACS_MSRMNT_DELAY);
brcmf_dbg(INFO, "noise(%d) busy(%llu) rx(%llu) tx(%llu)\n",
--
2.25.0
From: Ramesh Rangavittal <[email protected]>
Auto Channel Select feature of HostAP uses dump_survey to fetch
OBSS statistics. When the device is in the middle of an authentication
sequence or just at the end of authentication completion, running
dump_survey would trigger a channel change. The channel change in-turn
can cause packet loss, resulting in authentication delay. With this change,
dump_survey won't be run when authentication or association is in progress,
hence resolving the issue.
Signed-off-by: Ramesh Rangavittal <[email protected]>
Signed-off-by: Chung-Hsien Hsu <[email protected]>
Signed-off-by: Chi-hsien Lin <[email protected]>
Signed-off-by: Ian Lin <[email protected]>
---
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 12a1135662e9..10602bf4478c 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -7721,6 +7721,12 @@ brcmf_cfg80211_dump_survey(struct wiphy *wiphy, struct net_device *ndev,
brcmf_dbg(TRACE, "Enter: channel idx=%d\n", idx);
+ /* Do not run survey when VIF in CONNECTING / CONNECTED states */
+ if ((test_bit(BRCMF_VIF_STATUS_CONNECTING, &ifp->vif->sme_state)) ||
+ (test_bit(BRCMF_VIF_STATUS_CONNECTED, &ifp->vif->sme_state))) {
+ return -EBUSY;
+ }
+
band = wiphy->bands[NL80211_BAND_2GHZ];
if (band && idx >= band->n_channels) {
idx -= band->n_channels;
--
2.25.0
On Wed, Sep 28, 2022 at 2:22 AM Ian Lin <[email protected]> wrote:
>
> From: Wright Feng <[email protected]>
>
> To enable ACS feature in Hostap daemon, dump_survey cfg80211 ops and dump
> obss survey command in firmware side are needed. This patch is for adding
> dump_survey feature and adding DUMP_OBSS feature flag to check if
> firmware supports dump_obss iovar.
>
> Signed-off-by: Wright Feng <[email protected]>
> Signed-off-by: Chi-hsien Lin <[email protected]>
> Signed-off-by: Ian Lin <[email protected]>
> ---
> .../broadcom/brcm80211/brcmfmac/cfg80211.c | 256 ++++++++++++++++++
> .../broadcom/brcm80211/brcmfmac/feature.c | 3 +-
> .../broadcom/brcm80211/brcmfmac/feature.h | 4 +-
> 3 files changed, 261 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> index 42068145a447..f16dad462eb2 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> @@ -88,9 +88,39 @@
>
> #define BRCMF_PS_MAX_TIMEOUT_MS 2000
>
> +/* Dump obss definitions */
> +#define ACS_MSRMNT_DELAY 100
> +#define CHAN_NOISE_DUMMY (-80)
> +#define OBSS_TOKEN_IDX 15
> +#define IBSS_TOKEN_IDX 15
> +#define TX_TOKEN_IDX 14
> +#define CTG_TOKEN_IDX 13
> +#define PKT_TOKEN_IDX 15
> +#define IDLE_TOKEN_IDX 12
> +
> #define BRCMF_ASSOC_PARAMS_FIXED_SIZE \
> (sizeof(struct brcmf_assoc_params_le) - sizeof(u16))
>
> +struct brcmf_dump_survey {
> + u32 obss;
> + u32 ibss;
> + u32 no_ctg;
> + u32 no_pckt;
> + u32 tx;
> + u32 idle;
> +};
> +
> +struct cca_stats_n_flags {
> + u32 msrmnt_time; /* Time for Measurement (msec) */
> + u32 msrmnt_done; /* flag set when measurement complete */
> + char buf[1];
> +};
> +
> +struct cca_msrmnt_query {
> + u32 msrmnt_query;
> + u32 time_req;
> +};
> +
> static bool check_vif_up(struct brcmf_cfg80211_vif *vif)
> {
> if (!test_bit(BRCMF_VIF_STATUS_READY, &vif->sme_state)) {
> @@ -7549,6 +7579,229 @@ static s32 brcmf_translate_country_code(struct brcmf_pub *drvr, char alpha2[2],
> return 0;
> }
>
> +static int
> +brcmf_parse_dump_obss(char *buf, struct brcmf_dump_survey *survey)
> +{
> + int i;
> + char *token;
> + char delim[] = "\n ";
> + unsigned long val;
> + int err = 0;
> +
> + token = strsep(&buf, delim);
> + while (token) {
> + if (!strcmp(token, "OBSS")) {
> + for (i = 0; i < OBSS_TOKEN_IDX; i++)
> + token = strsep(&buf, delim);
> + err = kstrtoul(token, 10, &val);
> + if (err)
> + break;
> + survey->obss = val;
> + }
> +
> + if (!strcmp(token, "IBSS")) {
> + for (i = 0; i < IBSS_TOKEN_IDX; i++)
> + token = strsep(&buf, delim);
> + err = kstrtoul(token, 10, &val);
> + if (err)
> + break;
> + survey->ibss = val;
> + }
> +
> + if (!strcmp(token, "TXDur")) {
> + for (i = 0; i < TX_TOKEN_IDX; i++)
> + token = strsep(&buf, delim);
> + err = kstrtoul(token, 10, &val);
> + if (err)
> + break;
> + survey->tx = val;
> + }
> +
> + if (!strcmp(token, "Category")) {
> + for (i = 0; i < CTG_TOKEN_IDX; i++)
> + token = strsep(&buf, delim);
> + err = kstrtoul(token, 10, &val);
> + if (err)
> + break;
> + survey->no_ctg = val;
> + }
> +
> + if (!strcmp(token, "Packet")) {
> + for (i = 0; i < PKT_TOKEN_IDX; i++)
> + token = strsep(&buf, delim);
> + err = kstrtoul(token, 10, &val);
> + if (err)
> + break;
> + survey->no_pckt = val;
> + }
> +
> + if (!strcmp(token, "Opp(time):")) {
> + for (i = 0; i < IDLE_TOKEN_IDX; i++)
> + token = strsep(&buf, delim);
> + err = kstrtoul(token, 10, &val);
> + if (err)
> + break;
> + survey->idle = val;
> + }
> +
> + token = strsep(&buf, delim);
> + }
> +
> + return err;
> +}
> +
> +static int
> +brcmf_dump_obss(struct brcmf_if *ifp, struct cca_msrmnt_query req,
> + struct brcmf_dump_survey *survey)
> +{
> + struct cca_stats_n_flags *results;
> + char *buf;
> + int err;
> +
> + buf = kzalloc(sizeof(char) * BRCMF_DCMD_MEDLEN, GFP_KERNEL);
> + if (unlikely(!buf)) {
> + brcmf_err("%s: buf alloc failed\n", __func__);
> + return -ENOMEM;
> + }
> +
> + memcpy(buf, &req, sizeof(struct cca_msrmnt_query));
> + err = brcmf_fil_iovar_data_get(ifp, "dump_obss",
> + buf, BRCMF_DCMD_MEDLEN);
> + if (err < 0) {
> + brcmf_err("dump_obss error (%d)\n", err);
> + goto exit;
> + }
> + results = (struct cca_stats_n_flags *)(buf);
> +
> + if (req.msrmnt_query)
> + brcmf_parse_dump_obss(results->buf, survey);
> +
> + kfree(buf);
> + return 0;
> +exit:
> + kfree(buf);
> + return -EINVAL;
> +}
> +
> +static s32
> +cfg80211_set_channel(struct wiphy *wiphy, struct net_device *dev,
> + struct ieee80211_channel *chan,
> + enum nl80211_channel_type channel_type)
> +{
> + u16 chspec = 0;
> + int err = 0;
> + struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
> + struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));
> +
> + /* set_channel */
> + chspec = channel_to_chanspec(&cfg->d11inf, chan);
> + if (chspec != INVCHANSPEC) {
> + err = brcmf_fil_iovar_int_set(ifp, "chanspec", chspec);
> + if (err) {
> + err = -EINVAL;
> + brcmf_err("set chanspec 0x%04x fail\n", chspec);
Why not also print the original err before overwriting it.
> + }
> + } else {
> + brcmf_err("failed to convert host chanspec to fw chanspec\n");
> + err = -EINVAL;
> + }
> +
> + return err;
> +}
> +
> +static int
> +brcmf_cfg80211_dump_survey(struct wiphy *wiphy, struct net_device *ndev,
> + int idx, struct survey_info *info)
> +{
> + struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
> + struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));
> + struct brcmf_dump_survey survey = {};
> + struct ieee80211_supported_band *band;
> + struct ieee80211_channel *chan;
> + struct cca_msrmnt_query req;
> + u32 val, noise;
> + int err;
> +
> + brcmf_dbg(TRACE, "Enter: channel idx=%d\n", idx);
> +
> + band = wiphy->bands[NL80211_BAND_2GHZ];
> + if (band && idx >= band->n_channels) {
> + idx -= band->n_channels;
> + band = NULL;
> + }
> +
> + if (!band || idx >= band->n_channels) {
> + band = wiphy->bands[NL80211_BAND_5GHZ];
> + if (idx >= band->n_channels)
> + return -ENOENT;
> + }
> +
> + /* Setting current channel to the requested channel */
> + chan = &band->channels[idx];
> + err = cfg80211_set_channel(wiphy, ndev, chan, NL80211_CHAN_HT20);
> + if (err) {
> + info->channel = chan;
> + info->filled = 0;
> + return 0;
> + }
> +
> + if (!idx) {
> + /* Disable mpc */
> + val = 0;
> + brcmf_set_mpc(ifp, val);
> + /* Set interface up, explicitly. */
> + val = 1;
> + err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_UP, val);
> + if (err) {
> + brcmf_err("BRCMF_C_UP error (%d)\n", err);
> + return -EIO;
> + }
> + }
> +
> + /* Get noise value */
> + err = brcmf_fil_cmd_int_get(ifp, BRCMF_C_GET_PHY_NOISE, &noise);
> + if (err) {
> + brcmf_err("Get Phy Noise failed, error = %d\n", err);
> + noise = CHAN_NOISE_DUMMY;
> + }
> +
> + /* Start Measurement for obss stats on current channel */
> + req.msrmnt_query = 0;
> + req.time_req = ACS_MSRMNT_DELAY;
> + err = brcmf_dump_obss(ifp, req, &survey);
> + if (err)
> + goto exit;
> +
> + /* Add 10 ms for IOVAR completion */
> + msleep(ACS_MSRMNT_DELAY + 10);
> +
> + /* Issue IOVAR to collect measurement results */
> + req.msrmnt_query = 1;
> + err = brcmf_dump_obss(ifp, req, &survey);
> + if (err < 0)
> + goto exit;
> +
> + info->channel = chan;
> + info->noise = noise;
> + info->time = ACS_MSRMNT_DELAY;
> + info->time_busy = ACS_MSRMNT_DELAY - survey.idle;
> + info->time_rx = survey.obss + survey.ibss + survey.no_ctg +
> + survey.no_pckt;
> + info->time_tx = survey.tx;
> + info->filled = SURVEY_INFO_NOISE_DBM | SURVEY_INFO_TIME |
> + SURVEY_INFO_TIME_BUSY | SURVEY_INFO_TIME_RX |
> + SURVEY_INFO_TIME_TX;
> +
> + brcmf_dbg(INFO, "OBSS dump: channel %d: survey duraion %d\n",
s/duraion/duration
> + ieee80211_frequency_to_channel(chan->center_freq),
> + ACS_MSRMNT_DELAY);
> + brcmf_dbg(INFO, "noise(%d) busy(%llu) rx(%llu) tx(%llu)\n",
> + info->noise, info->time_busy, info->time_rx, info->time_tx);
> +
> +exit:
> + return err;
> +}
> +
> static void brcmf_cfg80211_reg_notifier(struct wiphy *wiphy,
> struct regulatory_request *req)
> {
> @@ -7700,6 +7953,9 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr,
> if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_WOWL_GTK))
> ops->set_rekey_data = brcmf_cfg80211_set_rekey_data;
> #endif
> + if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_DUMP_OBSS))
> + ops->dump_survey = brcmf_cfg80211_dump_survey;
> +
> err = wiphy_register(wiphy);
> if (err < 0) {
> bphy_err(drvr, "Could not register wiphy device (%d)\n", err);
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
> index 2c2f3e026c13..10bac865d724 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
> @@ -143,7 +143,7 @@ static void brcmf_feat_iovar_int_get(struct brcmf_if *ifp,
> ifp->fwil_fwerr = true;
>
> err = brcmf_fil_iovar_int_get(ifp, name, &data);
> - if (err == 0) {
> + if (err != -BRCMF_FW_UNSUPPORTED) {
> brcmf_dbg(INFO, "enabling feature: %s\n", brcmf_feat_names[id]);
> ifp->drvr->feat_flags |= BIT(id);
> } else {
> @@ -281,6 +281,7 @@ void brcmf_feat_attach(struct brcmf_pub *drvr)
> brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_RSDB, "rsdb_mode");
> brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_TDLS, "tdls_enable");
> brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_MFP, "mfp");
> + brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_DUMP_OBSS, "dump_obss");
>
> pfn_mac.version = BRCMF_PFN_MACADDR_CFG_VER;
> err = brcmf_fil_iovar_data_get(ifp, "pfn_macaddr", &pfn_mac,
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h
> index d1f4257af696..f1b086a69d73 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h
> @@ -29,6 +29,7 @@
> * DOT11H: firmware supports 802.11h
> * SAE: simultaneous authentication of equals
> * FWAUTH: Firmware authenticator
> + * DUMP_OBSS: Firmware has capable to dump obss info to support ACS
> */
> #define BRCMF_FEAT_LIST \
> BRCMF_FEAT_DEF(MBSS) \
> @@ -51,7 +52,8 @@
> BRCMF_FEAT_DEF(MONITOR_FMT_HW_RX_HDR) \
> BRCMF_FEAT_DEF(DOT11H) \
> BRCMF_FEAT_DEF(SAE) \
> - BRCMF_FEAT_DEF(FWAUTH)
> + BRCMF_FEAT_DEF(FWAUTH) \
> + BRCMF_FEAT_DEF(DUMP_OBSS)
>
> /*
> * Quirks:
> --
> 2.25.0
>