[v4] brcmfmac: fix CLM load error for legacy chips when user helper is enabled

Commit Message

Wright Feng Jan. 16, 2018, 9:26 a.m. UTC

For legacy chips without CLM blob files, kernel with user helper function
returns -EAGAIN when we request_firmware(), and then driver got failed
when bringing up legacy chips. We expect the CLM blob file for legacy chip
is not existence in firmware path, but the -ENOENT error is transferred to
-EAGAIN in firmware_class.c with user helper.
Because of that, we continue with CLM data currently present in firmware
if getting error from doing request_firmware().

Cc: [e-mail] # v4.15.y
Reviewed-by: Arend van Spriel <[e-mail]>
Signed-off-by: Wright Feng <[e-mail]>
---
v2: remove retry from patch v1
v3: remove redundant log print
v4: modify log print
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Comments

Kalle Valo Jan. 16, 2018, 3:02 p.m. UTC | #1

Wright Feng <[e-mail]> wrote:

> For legacy chips without CLM blob files, kernel with user helper function
> returns -EAGAIN when we request_firmware(), and then driver got failed
> when bringing up legacy chips. We expect the CLM blob file for legacy chip
> is not existence in firmware path, but the -ENOENT error is transferred to
> -EAGAIN in firmware_class.c with user helper.
> Because of that, we continue with CLM data currently present in firmware
> if getting error from doing request_firmware().
> 
> Cc: [e-mail] # v4.15.y
> Reviewed-by: Arend van Spriel <[e-mail]>
> Signed-off-by: Wright Feng <[e-mail]>

I'll try to squeeze this to 4.15 still.

Kalle Valo Jan. 16, 2018, 7:17 p.m. UTC | #2

Wright Feng <[e-mail]> wrote:

> For legacy chips without CLM blob files, kernel with user helper function
> returns -EAGAIN when we request_firmware(), and then driver got failed
> when bringing up legacy chips. We expect the CLM blob file for legacy chip
> is not existence in firmware path, but the -ENOENT error is transferred to
> -EAGAIN in firmware_class.c with user helper.
> Because of that, we continue with CLM data currently present in firmware
> if getting error from doing request_firmware().
> 
> Cc: [e-mail] # v4.15.y
> Reviewed-by: Arend van Spriel <[e-mail]>
> Signed-off-by: Wright Feng <[e-mail]>

Patch applied to wireless-drivers.git, thanks.

cc124d5cc8d8 brcmfmac: fix CLM load error for legacy chips when user helper is enabled

Patch

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
index 6a59d06..9be0b05 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
@@ -182,12 +182,9 @@  static int brcmf_c_process_clm_blob(struct brcmf_if *ifp)
 
 	err = request_firmware(&clm, clm_name, dev);
 	if (err) {
-		if (err == -ENOENT) {
-			brcmf_dbg(INFO, "continue with CLM data currently present in firmware\n");
-			return 0;
-		}
-		brcmf_err("request CLM blob file failed (%d)\n", err);
-		return err;
+		brcmf_info("no clm_blob available(err=%d), device may have limited channels available\n",
+			   err);
+		return 0;
 	}
 
 	chunk_buf = kzalloc(sizeof(*chunk_buf) + MAX_CHUNK_LEN - 1, GFP_KERNEL);