| Message ID | 20230111112419.24185-1-arend.vanspriel@broadcom.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ed05cb177ae5cd7f02f1d6e7706ba627d30f1696 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [V2] wifi: brcmfmac: fix regression for Broadcom PCIe wifi devices | expand |
On 1/11/2023 12:24 PM, Arend van Spriel wrote: > A sanity check was introduced considering maximum flowrings above > 256 as insane and effectively aborting the device probe. This > resulted in regression for number of users as the value turns out > to be sane after all. Forgot tha mention this is for 6.2 kernel. Apparently the commit causing the regression was also applied to 6.1 stable tree. So this should go to stable as well. > Fixes: 2aca4f3734bd ("brcmfmac: return error when getting invalid max_flowrings from dongle") > Reported-by: chainofflowers <chainofflowers@posteo.net> > Link: https://lore.kernel.org/all/4781984.GXAFRqVoOG@luna/ > Reported-by: Christian Marillat <marillat@debian.org> > Link: https://bugzilla.kernel.org/show_bug.cgi?id=216894 > Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com> > --- > drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c > index ae57a9a3ab05..b67f6d0810b6 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c > @@ -1228,7 +1228,7 @@ static int brcmf_pcie_init_ringbuffers(struct brcmf_pciedev_info *devinfo) > BRCMF_NROF_H2D_COMMON_MSGRINGS; > max_completionrings = BRCMF_NROF_D2H_COMMON_MSGRINGS; > } > - if (max_flowrings > 256) { > + if (max_flowrings > 512) { > brcmf_err(bus, "invalid max_flowrings(%d)\n", max_flowrings); > return -EIO; > }
Arend van Spriel <arend.vanspriel@broadcom.com> writes: > On 1/11/2023 12:24 PM, Arend van Spriel wrote: >> A sanity check was introduced considering maximum flowrings above >> 256 as insane and effectively aborting the device probe. This >> resulted in regression for number of users as the value turns out >> to be sane after all. > > Forgot tha mention this is for 6.2 kernel. Apparently the commit > causing the regression was also applied to 6.1 stable tree. So this > should go to stable as well. Ok, I'll add cc stable.
Arend van Spriel <arend.vanspriel@broadcom.com> wrote: > A sanity check was introduced considering maximum flowrings above > 256 as insane and effectively aborting the device probe. This > resulted in regression for number of users as the value turns out > to be sane after all. > > Fixes: 2aca4f3734bd ("brcmfmac: return error when getting invalid max_flowrings from dongle") > Reported-by: chainofflowers <chainofflowers@posteo.net> > Link: https://lore.kernel.org/all/4781984.GXAFRqVoOG@luna/ > Reported-by: Christian Marillat <marillat@debian.org> > Link: https://bugzilla.kernel.org/show_bug.cgi?id=216894 > Cc: stable@vger.kernel.org > Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com> Patch applied to wireless.git, thanks. ed05cb177ae5 wifi: brcmfmac: fix regression for Broadcom PCIe wifi devices
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c index ae57a9a3ab05..b67f6d0810b6 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c @@ -1228,7 +1228,7 @@ static int brcmf_pcie_init_ringbuffers(struct brcmf_pciedev_info *devinfo) BRCMF_NROF_H2D_COMMON_MSGRINGS; max_completionrings = BRCMF_NROF_D2H_COMMON_MSGRINGS; } - if (max_flowrings > 256) { + if (max_flowrings > 512) { brcmf_err(bus, "invalid max_flowrings(%d)\n", max_flowrings); return -EIO; }
A sanity check was introduced considering maximum flowrings above 256 as insane and effectively aborting the device probe. This resulted in regression for number of users as the value turns out to be sane after all. Fixes: 2aca4f3734bd ("brcmfmac: return error when getting invalid max_flowrings from dongle") Reported-by: chainofflowers <chainofflowers@posteo.net> Link: https://lore.kernel.org/all/4781984.GXAFRqVoOG@luna/ Reported-by: Christian Marillat <marillat@debian.org> Link: https://bugzilla.kernel.org/show_bug.cgi?id=216894 Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com> --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)