lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 31 Jul 2017 17:09:45 +0200 From: Rafał Miłecki <zajec5@...il.com> To: "Luis R . Rodriguez" <mcgrof@...nel.org>, Greg Kroah-Hartman <gregkh@...uxfoundation.org> Cc: Bjorn Andersson <bjorn.andersson@...aro.org>, Daniel Wagner <wagi@...om.org>, David Woodhouse <dwmw2@...radead.org>, Arend van Spriel <arend.vanspriel@...adcom.com>, "Rafael J . Wysocki" <rjw@...ysocki.net>, yi1.li@...ux.intel.com, atull@...nel.org, Moritz Fischer <moritz.fischer@...us.com>, pmladek@...e.com, Johannes Berg <johannes.berg@...el.com>, emmanuel.grumbach@...el.com, luciano.coelho@...el.com, Kalle Valo <kvalo@...eaurora.org>, luto@...nel.org, Linus Torvalds <torvalds@...ux-foundation.org>, Kees Cook <keescook@...omium.org>, AKASHI Takahiro <takahiro.akashi@...aro.org>, David Howells <dhowells@...hat.com>, pjones@...hat.com, Hans de Goede <hdegoede@...hat.com>, alan@...ux.intel.com, tytso@....edu, lkml <linux-kernel@...r.kernel.org>, Franky Lin <franky.lin@...adcom.com>, Hante Meuleman <hante.meuleman@...adcom.com>, Chi-Hsien Lin <chi-hsien.lin@...ress.com>, Wright Feng <wright.feng@...ress.com>, Pieter-Paul Giesberts <pieter-paul.giesberts@...adcom.com>, linux-wireless@...r.kernel.org, netdev@...r.kernel.org, Rafał Miłecki <rafal@...ecki.pl> Subject: [PATCH V5 2/2] brcmfmac: don't warn user about NVRAM if fallback to the platform one succeeds From: Rafał Miłecki <rafal@...ecki.pl> Failing to load NVRAM *file* isn't critical if we manage to get platform NVRAM in the fallback path. It means warnings like: [ 10.801506] brcmfmac 0000:01:00.0: Direct firmware load for brcm/brcmfmac43602-pcie.txt failed with error -2 are unnecessary & disturbing for people with *platform* NVRAM as they are not expected to have NVRAM file. This is a very common case for Broadcom home routers. Instead of printing warning immediately within the firmware subsystem let's try our fallback code first. If that fails as well, then it's a right moment to print an error. This should reduce amount of false reports from users seeing this warning while having wireless working perfectly fine with the platform NVRAM. Signed-off-by: Rafał Miłecki <rafal@...ecki.pl> --- V2: Update commit message as it wasn't clear enough (thanks Andy) & add extra messages to the firmware.c. V3: Set FW_OPT_UEVENT to don't change behavior V4: Switch to the new request_firmware_async syntax V5: Rebase, update commit message, resend after drvdata discussion --- .../wireless/broadcom/brcm80211/brcmfmac/firmware.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c index d231042f19d6..524442b3870f 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c @@ -462,8 +462,14 @@ static void brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx) raw_nvram = false; } else { data = bcm47xx_nvram_get_contents(&data_len); - if (!data && !(fwctx->flags & BRCMF_FW_REQ_NV_OPTIONAL)) - goto fail; + if (!data) { + brcmf_dbg(TRACE, "Failed to get platform NVRAM\n"); + if (!(fwctx->flags & BRCMF_FW_REQ_NV_OPTIONAL)) { + brcmf_err("Loading NVRAM from %s and using platform one both failed\n", + fwctx->nvram_name); + goto fail; + } + } raw_nvram = true; } @@ -491,6 +497,9 @@ static void brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx) static void brcmf_fw_request_code_done(const struct firmware *fw, void *ctx) { struct brcmf_fw *fwctx = ctx; + struct firmware_opts fw_opts = { + .optional = true, + }; int ret = 0; brcmf_dbg(TRACE, "enter: dev=%s\n", dev_name(fwctx->dev)); @@ -503,9 +512,8 @@ static void brcmf_fw_request_code_done(const struct firmware *fw, void *ctx) goto done; fwctx->code = fw; - ret = request_firmware_nowait(THIS_MODULE, true, fwctx->nvram_name, - fwctx->dev, GFP_KERNEL, fwctx, - brcmf_fw_request_nvram_done); + ret = request_firmware_async(fwctx->nvram_name, &fw_opts, fwctx->dev, + fwctx, brcmf_fw_request_nvram_done); /* pass NULL to nvram callback for bcm47xx fallback */ if (ret) -- 2.11.0
Powered by blists - more mailing lists