| Message ID | 1515743056-8109-1-git-send-email-wright.feng@cypress.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
On 1/12/2018 8:44 AM, Wright Feng wrote: > For legacy chips without CLM blob files, kernel with user helper function > returns -EAGAIN when we request_firmware() for blob file. In this case, > brcmf_bus_started gets error and failed to bring up legacy chips. > Because of that, we should continue with CLM data currently present in > firmware if getting -EAGAIN when doing request_firmware(). > > Signed-off-by: Wright Feng <wright.feng@cypress.com> > --- > v2: remove retry from patch v1 > --- > drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c > index 6a59d06..0baab4c 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c > @@ -182,7 +182,7 @@ static int brcmf_c_process_clm_blob(struct brcmf_if *ifp) > > err = request_firmware(&clm, clm_name, dev); > if (err) { > - if (err == -ENOENT) { > + if (err == -ENOENT || err == -EAGAIN) { > brcmf_dbg(INFO, "continue with CLM data currently present in firmware\n"); > return 0; > } Hi Wright, Why don't we just fall-back to "CLM in firmware" regardless of the error code? Also it might be better to use brcmf_info() instead of brcmf_dbg(INFO, ..). Regards, Arend
Arend van Spriel <arend.vanspriel@broadcom.com> writes: > On 1/12/2018 8:44 AM, Wright Feng wrote: >> For legacy chips without CLM blob files, kernel with user helper function >> returns -EAGAIN when we request_firmware() for blob file. _Why_ is the -EAGAIN returned? Is it because of user space, due to timing when loading the brcmfmac module or what? You should explain the problem in detail in the commit log and why this is the right approach to fix the problem. Based on the commit log to me this still looks like a random attempt to workaround a bug, not a proper fix. >> In this case, brcmf_bus_started gets error and failed to bring up >> legacy chips. Because of that, we should continue with CLM data >> currently present in firmware if getting -EAGAIN when doing >> request_firmware(). >> >> Signed-off-by: Wright Feng <wright.feng@cypress.com> >> --- >> v2: remove retry from patch v1 >> --- >> drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c >> index 6a59d06..0baab4c 100644 >> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c >> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c >> @@ -182,7 +182,7 @@ static int brcmf_c_process_clm_blob(struct brcmf_if *ifp) >> >> err = request_firmware(&clm, clm_name, dev); >> if (err) { >> - if (err == -ENOENT) { >> + if (err == -ENOENT || err == -EAGAIN) { >> brcmf_dbg(INFO, "continue with CLM data currently present in firmware\n"); >> return 0; >> } > > Why don't we just fall-back to "CLM in firmware" regardless of the > error code? Indeed, I was thinking the same.
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c index 6a59d06..0baab4c 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c @@ -182,7 +182,7 @@ static int brcmf_c_process_clm_blob(struct brcmf_if *ifp) err = request_firmware(&clm, clm_name, dev); if (err) { - if (err == -ENOENT) { + if (err == -ENOENT || err == -EAGAIN) { brcmf_dbg(INFO, "continue with CLM data currently present in firmware\n"); return 0; }
For legacy chips without CLM blob files, kernel with user helper function returns -EAGAIN when we request_firmware() for blob file. In this case, brcmf_bus_started gets error and failed to bring up legacy chips. Because of that, we should continue with CLM data currently present in firmware if getting -EAGAIN when doing request_firmware(). Signed-off-by: Wright Feng <wright.feng@cypress.com> --- v2: remove retry from patch v1 --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)