From ce8be3d14b18dd16fbdfb86d8172c06edbdfb708 Mon Sep 17 00:00:00 2001 From: Chung-Hsien Hsu Date: Wed, 22 Sep 2021 22:21:09 -0500 Subject: [PATCH 072/296] brcmfmac: use request_firmware_direct for loading board-specific nvram Loading a board-specific nvram file is optional. If the file is not present, we will get a warning "Direct firmware load for ... failed with error ...", have 60 seconds delay when CONFIG_FW_LOADER_USER_HELPER_FALLBACK is enabled, and fall back to a common one. However, users may treat this as a type of side effect and the file is required. Since it is optional, use request_firmware_direct() and leave an info message in place to avoid the delay and confusion. Signed-off-by: Chung-Hsien Hsu Signed-off-by: Ting-Ying Li Signed-off-by: Chi-hsien Lin --- .../net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c index 09d2f2dc2b46..d1c435472883 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c @@ -659,9 +659,12 @@ static int brcmf_fw_request_firmware(const struct firmware **fw, if (!alt_path) goto fallback; - ret = firmware_request_nowarn(fw, alt_path, fwctx->dev); + ret = request_firmware_direct(fw, alt_path, fwctx->dev); kfree(alt_path); - if (ret == 0) + if (ret) + brcmf_info("no board-specific nvram available (ret=%d), device will use %s\n", + ret, cur->path); + else return ret; } -- 2.25.1