Bug#869084: linux-image-4.12.0-trunk-amd64: rtl8723be fails to work with old firmware
Control: tags -1 + patch
On 2017-07-28 13:29 +0200, Sven Joachim wrote:
> Control: forwarded -1 https://marc.info/?l=linux-wireless&m=150124050420053&w=2
>
> On 2017-07-20 13:54 +0200, Sven Joachim wrote:
>
>> Package: src:linux
>> Version: 4.12.2-1~exp1
>> Severity: important
>>
>> As of commit f70e4df2b384d21e36a7c30a591639592692e0ec, the rtl8723be
>> driver uses a new firmware file rtlwifi/rtl8723befw_36.bin which is not
>> packaged for Debian yet. There is fallback code to load the old
>> firmware file rtlwifi/rtl8723befw.bin, but does not seem to work, for
>> the wifi fails to come up on my laptop. :-(
>
> AFAICS the problem is that request_firmware_nowait() does not wait for
> the firmware to show up and returns 0 even if the file is not there, so
> the code to load the fallback file will never be reached.
>
> I have reported this upstream now.
And even managed to come up with a patch that got accepted in the
wireless-drivers-next tree[1]. It does not apply to 4.12, therefore I
have attached a version which does. Alternatively you could cherry-pick
commit f2764f61fa10 ("rtlwifi: Fix memory leak when firmware request
fails")[2] before it.
Cheers,
Sven
1. https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git/commit/?id=1d9b168d8ea9a0f51947d0e2f84856e77d2fe7ff
2. https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git/commit/?id=f2764f61fa10593204b0c5e4e9a68dba02112e50
>From 6fff98234b7a25b717714a9a504d1ca805765ef1 Mon Sep 17 00:00:00 2001
From: Sven Joachim <svenjoac@gmx.de>
Date: Sat, 29 Jul 2017 11:10:13 +0200
Subject: [PATCH] rtlwifi: Fix fallback firmware loading
Commit f70e4df2b384 ("rtlwifi: Add code to read new versions of
firmware") added code to load an old firmware file if the new one is
not available. Unfortunately that code is never reached because
request_firmware_nowait() does not wait for the firmware to show up
and returns 0 even if the file is not there.
Use the existing fallback mechanism introduced by commit 62009b7f1279
("rtlwifi: rtl8192cu: Add new firmware") instead.
Fixes: f70e4df2b384 ("rtlwifi: Add code to read new versions of firmware")
Cc: stable@vger.kernel.org
Signed-off-by: Sven Joachim <svenjoac@gmx.de>
---
drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 13 +++----------
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 13 +++----------
2 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
index 8c0ac96b5430..c781105a8524 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
@@ -187,16 +187,8 @@ int rtl8723be_init_sw_vars(struct ieee80211_hw *hw)
rtlpriv->io.dev, GFP_KERNEL, hw,
rtl_fw_cb);
if (err) {
- /* Failed to get firmware. Check if old version available */
- fw_name = "rtlwifi/rtl8723befw.bin";
- pr_info("Using firmware %s\n", fw_name);
- err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
- rtlpriv->io.dev, GFP_KERNEL, hw,
- rtl_fw_cb);
- if (err) {
- pr_err("Failed to request firmware!\n");
- return 1;
- }
+ pr_err("Failed to request firmware!\n");
+ return 1;
}
return 0;
}
@@ -287,6 +279,7 @@ static const struct rtl_hal_cfg rtl8723be_hal_cfg = {
.bar_id = 2,
.write_readback = true,
.name = "rtl8723be_pci",
+ .alt_fw_name = "rtlwifi/rtl8723befw.bin",
.ops = &rtl8723be_hal_ops,
.mod_params = &rtl8723be_mod_params,
.maps[SYS_ISO_CTRL] = REG_SYS_ISO_CTRL,
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
index abaf34cb1433..bc6dcac34924 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
@@ -214,16 +214,8 @@ int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw)
rtlpriv->io.dev, GFP_KERNEL, hw,
rtl_fw_cb);
if (err) {
- /* Failed to get firmware. Check if old version available */
- fw_name = "rtlwifi/rtl8821aefw.bin";
- pr_info("Using firmware %s\n", fw_name);
- err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
- rtlpriv->io.dev, GFP_KERNEL, hw,
- rtl_fw_cb);
- if (err) {
- pr_err("Failed to request normal firmware!\n");
- return 1;
- }
+ pr_err("Failed to request normal firmware!\n");
+ return 1;
}
/*load wowlan firmware*/
pr_info("Using firmware %s\n", wowlan_fw_name);
@@ -325,6 +317,7 @@ static const struct rtl_hal_cfg rtl8821ae_hal_cfg = {
.bar_id = 2,
.write_readback = true,
.name = "rtl8821ae_pci",
+ .alt_fw_name = "rtlwifi/rtl8821aefw.bin",
.ops = &rtl8821ae_hal_ops,
.mod_params = &rtl8821ae_mod_params,
.maps[SYS_ISO_CTRL] = REG_SYS_ISO_CTRL,
--
2.13.3
Reply to: