| Message ID | 20170215222948.21030-2-zajec5@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
On Thu, Feb 16, 2017 at 12:29 AM, Rafał Miłecki <zajec5@gmail.com> wrote: > From: Rafał Miłecki <rafal@milecki.pl> > > This isn't critical as we use platform NVRAM as fallback and it's very > common case of all Broadcom home routers. Thanks for the new firmware > loading function we can achieve this by simply passing FW_OPT_NO_WARN. > What kind of warning you are talking about? On Intel Edison brcmfmac isn't backed up by NVRAM (there no such) and the platform is not ACPI-based. The warning might be crucial for debugging Wi-Fi issues on such platforms. > Signed-off-by: Rafał Miłecki <rafal@milecki.pl> > --- > Kalle, Arend: this patch is strictly related to the bigger 1/2. Could you ack > this change as I expect this patchset to be picked by Ming, Luis or Greg. > --- > drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c > index c7c1e9906500..26ec445a8d2d 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c > @@ -504,9 +504,9 @@ static void brcmf_fw_request_code_done(const struct firmware *fw, void *ctx) > return; > } > 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(THIS_MODULE, FW_OPT_NO_WARN, > + fwctx->nvram_name, fwctx->dev, GFP_KERNEL, > + fwctx, brcmf_fw_request_nvram_done); > > if (!ret) > return; > -- > 2.11.0 >
On 2017-02-16 02:19, Andy Shevchenko wrote: > On Thu, Feb 16, 2017 at 12:29 AM, Rafał Miłecki <zajec5@gmail.com> > wrote: >> From: Rafał Miłecki <rafal@milecki.pl> >> >> This isn't critical as we use platform NVRAM as fallback and it's very >> common case of all Broadcom home routers. Thanks for the new firmware >> loading function we can achieve this by simply passing FW_OPT_NO_WARN. >> > > What kind of warning you are talking about? > > On Intel Edison brcmfmac isn't backed up by NVRAM (there no such) and > the platform is not ACPI-based. The warning might be crucial for > debugging Wi-Fi issues on such platforms. Sorry, I should have tried better with that commit message. V2 in a second.
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c index c7c1e9906500..26ec445a8d2d 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c @@ -504,9 +504,9 @@ static void brcmf_fw_request_code_done(const struct firmware *fw, void *ctx) return; } 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(THIS_MODULE, FW_OPT_NO_WARN, + fwctx->nvram_name, fwctx->dev, GFP_KERNEL, + fwctx, brcmf_fw_request_nvram_done); if (!ret) return;