wifi: rtw88: fix race condition when doing H2C command
Ping-Ke Shih
maintainerPATCH 1/1 wifi: rtw88: fix race condition when doing H2C command
From: Ji-Pin Jou <[email protected]>
For SDIO/USB interface, since the tranferring speed is slower than that in PCIE, it may have race condition when the driver sets down H2C command to the FW.
In the function rtw_fw_send_h2c_command, before the patch, box_reg is written first, then box_ex_reg is written. FW starts to work and fetch the value of box_ex_reg, when the most significant byte of box_reg(4 bytes) is written. Meanwhile, for SDIO/USB interface, since the transferring speed is slow, the driver is still in writing the new value of box_ex_reg through the bus, and FW may get the wrong value of box_ex_reg at the moment.
To prevent the above driver/FW racing situation, box_ex_reg is written first then box_reg. Furthermore, it is written in 4 bytes at a time, instead of written in one byte one by one. It can increase the speed for SDIO/USB interface.
--- drivers/net/wireless/realtek/rtw88/fw.c | 8 +++----- drivers/net/wireless/realtek/rtw88/fw.h | 5 +++++ 2 files changed, 8 insertions(+), 5 deletions(-)
drivers/net/wireless/realtek/rtw88/fw.c +3 -5
@@ -311,10 +311,10 @@ EXPORT_SYMBOL(rtw_fw_c2h_cmd_isr);static void rtw_fw_send_h2c_command (struct rtw_dev *rtwdev,u8 *h2c) { +struct rtw_h2c_cmd *h2c_cmd = (struct rtw_h2c_cmd *)h2c;u8 box;u8 box_state;u32 box_reg, box_ex_reg; -int idx;int ret; rtw_dbg(rtwdev, RTW_DBG_FW,
@@ -356,10 +356,8 @@ static void rtw_fw_send_h2c_command(struct rtw_dev *rtwdev, goto out; } -for (idx =0 ; idx <4 ; idx++) -rtw_write8 (rtwdev, box_reg + idx, h2c[idx]); -for (idx =0 ; idx <4 ; idx++) -rtw_write8 (rtwdev, box_ex_reg + idx, h2c[idx +4 ]); +rtw_write32 (rtwdev, box_ex_reg,le32_to_cpu (h2c_cmd->msg_ext)); +rtw_write32 (rtwdev, box_reg,le32_to_cpu (h2c_cmd->msg));if (++rtwdev->h2c.last_box_num >=4 ) rtwdev->h2c.last_box_num =0 ;
drivers/net/wireless/realtek/rtw88/fw.h +5 -0
@@ -81,6 +81,11 @@ struct rtw_c2h_adaptivity {u8 option; } __packed; +struct rtw_h2c_cmd { +__le32 msg; +__le32 msg_ext; +} __packed; +enum rtw_rsvd_packet_type {RSVD_BEACON ,RSVD_DUMMY ,
Signature · 1 line
2.25.1
Quoted 14 lines · Ping-Ke Shih
From: Ji-Pin Jou <[email protected]>
For SDIO/USB interface, since the tranferring speed is slower than that in PCIE, it may have race condition when the driver sets down H2C command to the FW.
In the function
rtw_fw_send_h2c_command, before the patch,box_regis written first, thenbox_ex_regis written. FW starts to work and fetch the value ofbox_ex_reg, when the most significant byte ofbox_reg(4 bytes)is written. Meanwhile, for SDIO/USB interface, since the transferring speed is slow, the driver is still in writing the new value ofbox_ex_regthrough the bus, and FW may get the wrong value ofbox_ex_regat the moment.
Quoted 7 lines
To prevent the above driver/FW racing situation,
box_ex_regis written first thenbox_reg. Furthermore, it is written in 4 bytes at a time, instead of written in one byte one by one. It can increase the speed for SDIO/USB interface.Signed-off-by Ji-Pin Jou <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
This solves the issue with the RTW88 USB patch set reported here:
https://lore.kernel.org/linux-wireless/[email protected]/
Sascha
Quoted 53 lines
--- drivers/net/wireless/realtek/rtw88/fw.c | 8 +++----- drivers/net/wireless/realtek/rtw88/fw.h | 5 +++++ 2 files changed, 8 insertions(+), 5 deletions(-)drivers/net/wireless/realtek/rtw88/fw.c +3
-5@@ -311,10 +311,10 @@ EXPORT_SYMBOL(rtw_fw_c2h_cmd_isr);static void rtw_fw_send_h2c_command (struct rtw_dev *rtwdev,u8 *h2c) { +struct rtw_h2c_cmd *h2c_cmd = (struct rtw_h2c_cmd *)h2c;u8 box;u8 box_state;u32 box_reg, box_ex_reg; -int idx;int ret; rtw_dbg(rtwdev, RTW_DBG_FW,@@ -356,10 +356,8 @@ static void rtw_fw_send_h2c_command(struct rtw_dev *rtwdev, goto out; } -for (idx =0 ; idx <4 ; idx++) -rtw_write8 (rtwdev, box_reg + idx, h2c[idx]); -for (idx =0 ; idx <4 ; idx++) -rtw_write8 (rtwdev, box_ex_reg + idx, h2c[idx +4 ]); +rtw_write32 (rtwdev, box_ex_reg,le32_to_cpu (h2c_cmd->msg_ext)); +rtw_write32 (rtwdev, box_reg,le32_to_cpu (h2c_cmd->msg));if (++rtwdev->h2c.last_box_num >=4 ) rtwdev->h2c.last_box_num =0 ;drivers/net/wireless/realtek/rtw88/fw.h +5
-0@@ -81,6 +81,11 @@ struct rtw_c2h_adaptivity {u8 option; } __packed; +struct rtw_h2c_cmd { +__le32 msg; +__le32 msg_ext; +} __packed; +enum rtw_rsvd_packet_type {RSVD_BEACON ,RSVD_DUMMY ,Signature · 1 line
2.25.1
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Quoted 14 lines · Ping-Ke Shih
From: Ji-Pin Jou <[email protected]>
For SDIO/USB interface, since the tranferring speed is slower than that in PCIE, it may have race condition when the driver sets down H2C command to the FW.
In the function
rtw_fw_send_h2c_command, before the patch,box_regis written first, thenbox_ex_regis written. FW starts to work and fetch the value ofbox_ex_reg, when the most significant byte ofbox_reg(4 bytes)is written. Meanwhile, for SDIO/USB interface, since the transferring speed is slow, the driver is still in writing the new value ofbox_ex_regthrough the bus, and FW may get the wrong value ofbox_ex_regat the moment.
Quoted 8 lines
To prevent the above driver/FW racing situation,
box_ex_regis written first thenbox_reg. Furthermore, it is written in 4 bytes at a time, instead of written in one byte one by one. It can increase the speed for SDIO/USB interface.Signed-off-by Ji-Pin Jou <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>Tested-by Sascha Hauer <[email protected]>
Patch applied to wireless-next.git, thanks.
823092a53556 wifi: rtw88: fix race condition when doing H2C command
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches