2023-01-24 10:43:05

by John Keeping

Subject: [PATCH v2] brcmfmac: support CQM RSSI notification with older firmware

Using the BCM4339 firmware from linux-firmware (version "BCM4339/2 wl0:
Sep 5 2019 11:05:52 version 6.37.39.113 (r722271 CY)" from
cypress/cyfmac4339-sdio.bin) the RSSI respose is only 4 bytes, which
results in an error being logged.

It seems that older devices send only the RSSI field and neither SNR nor
noise is included. Handle this by accepting a 4 byte message and
reading only the RSSI from it.

Fixes: 7dd56ea45a66 ("brcmfmac: add support for CQM RSSI notifications")
Signed-off-by: John Keeping <[email protected]>
---
v2:
- Cast to __be32* to fix a Sparse warning (kernel test robot)

.../broadcom/brcm80211/brcmfmac/cfg80211.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index b115902eb475..43dc0faee92d 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -6489,18 +6489,20 @@ static s32 brcmf_notify_rssi(struct brcmf_if *ifp,
{
struct brcmf_cfg80211_vif *vif = ifp->vif;
struct brcmf_rssi_be *info = data;
- s32 rssi, snr, noise;
+ s32 rssi, snr = 0, noise = 0;
s32 low, high, last;

- if (e->datalen < sizeof(*info)) {
+ if (e->datalen >= sizeof(*info)) {
+ rssi = be32_to_cpu(info->rssi);
+ snr = be32_to_cpu(info->snr);
+ noise = be32_to_cpu(info->noise);
+ } else if (e->datalen >= sizeof(rssi)) {
+ rssi = be32_to_cpu(*(__be32 *)data);
+ } else {
brcmf_err("insufficient RSSI event data\n");
return 0;
}

- rssi = be32_to_cpu(info->rssi);
- snr = be32_to_cpu(info->snr);
- noise = be32_to_cpu(info->noise);
-
low = vif->cqm_rssi_low;
high = vif->cqm_rssi_high;
last = vif->cqm_rssi_last;
--
2.39.1

2023-02-13 15:04:24

by Kalle Valo

Subject: Re: [PATCH v2] brcmfmac: support CQM RSSI notification with older firmware

John Keeping <[email protected]> wrote:

> Using the BCM4339 firmware from linux-firmware (version "BCM4339/2 wl0:
> Sep 5 2019 11:05:52 version 6.37.39.113 (r722271 CY)" from
> cypress/cyfmac4339-sdio.bin) the RSSI respose is only 4 bytes, which
> results in an error being logged.
>
> It seems that older devices send only the RSSI field and neither SNR nor
> noise is included. Handle this by accepting a 4 byte message and
> reading only the RSSI from it.
>
> Fixes: 7dd56ea45a66 ("brcmfmac: add support for CQM RSSI notifications")
> Signed-off-by: John Keeping <[email protected]>

Arend, could you take a look?

--
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

2023-02-27 10:42:31

by Kalle Valo

Subject: Re: [v2] wifi: brcmfmac: support CQM RSSI notification with older firmware

John Keeping <[email protected]> wrote:

> Using the BCM4339 firmware from linux-firmware (version "BCM4339/2 wl0:
> Sep 5 2019 11:05:52 version 6.37.39.113 (r722271 CY)" from
> cypress/cyfmac4339-sdio.bin) the RSSI respose is only 4 bytes, which
> results in an error being logged.
>
> It seems that older devices send only the RSSI field and neither SNR nor
> noise is included. Handle this by accepting a 4 byte message and
> reading only the RSSI from it.
>
> Fixes: 7dd56ea45a66 ("brcmfmac: add support for CQM RSSI notifications")
> Signed-off-by: John Keeping <[email protected]>

Patch applied to wireless-next.git, thanks.

ec52d77d0775 wifi: brcmfmac: support CQM RSSI notification with older firmware

--
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches