wifi: mwifiex: fix freeze for 60 seconds caused by request_firmware
Subsystems (2)
PATCH 1/1 wifi: mwifiex: fix freeze for 60 seconds caused by request_firmware
Fix regression in rgpower table loading, caused by using request_firmware(): when the requested firmware does not exist, e.g. nxp/rgpower_WW.bin does not exist on OpenWRT builds for WRT3200ACM, request_firmware() falls back to firmware_fallback_sysfs(), which expects the firmware to be provided by user space using SYSFS. No such utility is provided in this configuration, so the entire system locks up for 60 seconds, until the request times out. During this time, no other log messages are observed, and the device does not respond to commands over UART.
The request_firmware() call is performed in the following context:current->comm kworker/1:2 in_task 1 irqs_disabled 0 in_atomic 0
Fixed by using request_firmware_direct(). This prevents fallback to SYSFS, and avoids delay. The rgpower table is optional. The driver falls back to the device tree power table if the firmware is not present.
The error code is printed for debugging and returned to the caller, which only cares for success or failure, so there are no side effects.
--- drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/net/wireless/marvell/mwifiex/sta_ioctl.c +8 -6
@@ -196,6 +196,7 @@ static int mwifiex_request_rgpower_table(struct mwifiex_private *priv)struct mwifiex_adapter *adapter = priv->adapter;char rgpower_table_name[30 ];char country_code[3 ]; +int ret;strscpy (country_code, domain_info->country_code,sizeof (country_code));
@@ -214,16 +215,17 @@ static int mwifiex_request_rgpower_table(struct mwifiex_private *priv) adapter->rgpower_data =NULL ; } -if ((request_firmware (&adapter->rgpower_data, rgpower_table_name, - adapter->dev))) { + ret =request_firmware_direct (&adapter->rgpower_data, rgpower_table_name, + adapter->dev); + +if (ret) {mwifiex_dbg ( adapter,INFO , -"info: %s: failed to request regulatory power table\n" , - __func__); -return -EIO ; +"info: %s: failed to request regulatory power table: %d\n" , + __func__, ret); } -return 0 ; +return ret; }static int mwifiex_dnld_rgpower_table (struct mwifiex_private *priv)
Signature · 1 line
2.55.0
Quoted 17 lines · Georgi Valkov
Fix regression in rgpower table loading, caused by using
request_firmware(): when the requested firmware does not exist, e.g. nxp/rgpower_WW.bin does not exist on OpenWRT builds for WRT3200ACM,request_firmware()falls back tofirmware_fallback_sysfs(), which expects the firmware to be provided by user space using SYSFS. No such utility is provided in this configuration, so the entire system locks up for 60 seconds, until the request times out. During this time, no other log messages are observed, and the device does not respond to commands over UART.The
request_firmware()call is performed in the following context:current->commkworker/1:2in_task1irqs_disabled0in_atomic0Fixed by using
request_firmware_direct(). This prevents fallback to SYSFS, and avoids delay. The rgpower table is optional. The driver falls back to the device tree power table if the firmware is not present.
Quoted 5 lines
The error code is printed for debugging and returned to the caller, which only cares for success or failure, so there are no side effects.
Fixes 7b6f16a25806 ("wifi: mwifiex: add rgpower table loading support")Signed-off-by Georgi Valkov <[email protected]>
Please backport to 6.18 and 6.12, which are used by OpenWrt. Initially I did not know that I could insert
free text between the commit message and the patch.
I apologise for that. I am still learning how to use git send-mail.
Quoted 27 lines · Francesco Dolcini
Quoted 17 lines · Georgi Valkov
Fix regression in rgpower table loading, caused by using
request_firmware(): when the requested firmware does not exist, e.g. nxp/rgpower_WW.bin does not exist on OpenWRT builds for WRT3200ACM,request_firmware()falls back tofirmware_fallback_sysfs(), which expects the firmware to be provided by user space using SYSFS. No such utility is provided in this configuration, so the entire system locks up for 60 seconds, until the request times out. During this time, no other log messages are observed, and the device does not respond to commands over UART.The
request_firmware()call is performed in the following context:current->commkworker/1:2in_task1irqs_disabled0in_atomic0Fixed by using
request_firmware_direct(). This prevents fallback to SYSFS, and avoids delay. The rgpower table is optional. The driver falls back to the device tree power table if the firmware is not present.Quoted 5 lines
The error code is printed for debugging and returned to the caller, which only cares for success or failure, so there are no side effects.
Fixes 7b6f16a25806 ("wifi: mwifiex: add rgpower table loading support")Signed-off-by Georgi Valkov <[email protected]>Reviewed-by Francesco Dolcini <[email protected]>
Francesco Dolcini
reviewerQuoted 4 lines · George Valkov
Please backport to 6.18 and 6.12, which are used by OpenWrt. Initially I did not know that I could insert
free text between the commit message and the patch.
I apologise for that. I am still learning how to use git send-mail.
Please see Documentation/process/stable-kernel-rules.rst It should explain everything you need on this regard.
Francesco
Thank you! Note taken and I will try to do better when I submit my last planned patch for this driver, soon. I wanted to collect opinions from OpenWrt members first.
Georgi
Quoted 12 lines · Francesco Dolcini
Quoted 4 lines · George Valkov
Please backport to 6.18 and 6.12, which are used by OpenWrt. Initially I did not know that I could insert
free text between the commit message and the patch.
I apologise for that. I am still learning how to use git send-mail.Please see
Documentation/process/stable-kernel-rules.rstIt should explain everything you need on this regard.Francesco
Any update on the progress? Do I need to do or change anything?
Quoted 20 lines · George Valkov
Thank you! Note taken and I will try to do better when I submit my last planned patch for this driver, soon. I wanted to collect opinions from OpenWrt members first.
Georgi
Quoted 12 lines · Francesco Dolcini
Quoted 4 lines · George Valkov
Please backport to 6.18 and 6.12, which are used by OpenWrt. Initially I did not know that I could insert
free text between the commit message and the patch.
I apologise for that. I am still learning how to use git send-mail.Please see
Documentation/process/stable-kernel-rules.rstIt should explain everything you need on this regard.Francesco
Quoted 1 line · George Valkov
Any update on the progress? Do I need to do or change anything?
Queued for 6.18 and 7.1, thanks - nothing more needed from you.
Signature · 2 lines
Thanks, Sasha
Hi Georgi,
thank you for the fix!
Quoted 17 lines · Georgi Valkov
Fix regression in rgpower table loading, caused by using
request_firmware(): when the requested firmware does not exist, e.g. nxp/rgpower_WW.bin does not exist on OpenWRT builds for WRT3200ACM,request_firmware()falls back tofirmware_fallback_sysfs(), which expects the firmware to be provided by user space using SYSFS. No such utility is provided in this configuration, so the entire system locks up for 60 seconds, until the request times out. During this time, no other log messages are observed, and the device does not respond to commands over UART.The
request_firmware()call is performed in the following context:current->commkworker/1:2in_task1irqs_disabled0in_atomic0Fixed by using
request_firmware_direct(). This prevents fallback to SYSFS, and avoids delay. The rgpower table is optional. The driver falls back to the device tree power table if the firmware is not present.
Quoted 5 lines
The error code is printed for debugging and returned to the caller, which only cares for success or failure, so there are no side effects.
Fixes 7b6f16a25806 ("wifi: mwifiex: add rgpower table loading support")Signed-off-by Georgi Valkov <[email protected]>
Quoted 40 lines
--- drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)drivers/net/wireless/marvell/mwifiex/sta_ioctl.c +8
-6@@ -196,6 +196,7 @@ static int mwifiex_request_rgpower_table(struct mwifiex_private *priv)struct mwifiex_adapter *adapter = priv->adapter;char rgpower_table_name[30 ];char country_code[3 ]; +int ret;strscpy (country_code, domain_info->country_code,sizeof (country_code));@@ -214,16 +215,17 @@ static int mwifiex_request_rgpower_table(struct mwifiex_private *priv) adapter->rgpower_data =NULL ; } -if ((request_firmware (&adapter->rgpower_data, rgpower_table_name, - adapter->dev))) { + ret =request_firmware_direct (&adapter->rgpower_data, rgpower_table_name, + adapter->dev); + +if (ret) {mwifiex_dbg ( adapter,INFO , -"info: %s: failed to request regulatory power table\n" , - __func__); -return -EIO ; +"info: %s: failed to request regulatory power table: %d\n" , + __func__, ret); } -return 0 ; +return ret; }static int mwifiex_dnld_rgpower_table (struct mwifiex_private *priv)
Signature · 4 lines
Pengutronix e.K. | Stefan Kerkmann | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-128 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |