2023-02-14 11:43:59

by Ping-Ke Shih

[permalink] [raw]
Subject: [PATCH] wifi: rtw89: move H2C of del_pkt_offload before polling FW status ready

From: Chin-Yen Lee <[email protected]>

The H2C of del_pkt_offload must be called before polling FW status
ready, otherwise the following downloading normal FW will fail.

Fixes: 5c12bb66b79d ("wifi: rtw89: refine packet offload flow")
Signed-off-by: Chin-Yen Lee <[email protected]>
Signed-off-by: Ping-Ke Shih <[email protected]>
---
Hi Kalle,

We found a bug existing in commit 5c12bb66b79d that was merged yesterday.
Since merge window is next week, is it possible to merge this patch for
kernel 6.3?

Thank you
Ping-Ke

---
drivers/net/wireless/realtek/rtw89/wow.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtw89/wow.c b/drivers/net/wireless/realtek/rtw89/wow.c
index 92fa366ccfcf7..c78ee2ab732c9 100644
--- a/drivers/net/wireless/realtek/rtw89/wow.c
+++ b/drivers/net/wireless/realtek/rtw89/wow.c
@@ -710,6 +710,8 @@ static int rtw89_wow_fw_stop(struct rtw89_dev *rtwdev)
goto out;
}

+ rtw89_fw_release_general_pkt_list(rtwdev, true);
+
ret = rtw89_wow_check_fw_status(rtwdev, false);
if (ret) {
rtw89_err(rtwdev, "wow: failed to check disable fw ready\n");
@@ -779,8 +781,6 @@ static int rtw89_wow_disable(struct rtw89_dev *rtwdev)
goto out;
}

- rtw89_fw_release_general_pkt_list(rtwdev, true);
-
ret = rtw89_wow_swap_fw(rtwdev, false);
if (ret) {
rtw89_err(rtwdev, "wow: failed to disable trx_post\n");
--
2.25.1



2023-02-15 07:39:54

by Kalle Valo

[permalink] [raw]
Subject: Re: [PATCH] wifi: rtw89: move H2C of del_pkt_offload before polling FW status ready

Ping-Ke Shih <[email protected]> writes:

> From: Chin-Yen Lee <[email protected]>
>
> The H2C of del_pkt_offload must be called before polling FW status
> ready, otherwise the following downloading normal FW will fail.
>
> Fixes: 5c12bb66b79d ("wifi: rtw89: refine packet offload flow")
> Signed-off-by: Chin-Yen Lee <[email protected]>
> Signed-off-by: Ping-Ke Shih <[email protected]>
> ---
> Hi Kalle,
>
> We found a bug existing in commit 5c12bb66b79d that was merged yesterday.
> Since merge window is next week, is it possible to merge this patch for
> kernel 6.3?

Ok, I'll queue this to v6.3.

--
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

2023-02-15 07:51:31

by Kalle Valo

[permalink] [raw]
Subject: Re: [PATCH] wifi: rtw89: move H2C of del_pkt_offload before polling FW status ready

Ping-Ke Shih <[email protected]> wrote:

> From: Chin-Yen Lee <[email protected]>
>
> The H2C of del_pkt_offload must be called before polling FW status
> ready, otherwise the following downloading normal FW will fail.
>
> Fixes: 5c12bb66b79d ("wifi: rtw89: refine packet offload flow")
> Signed-off-by: Chin-Yen Lee <[email protected]>
> Signed-off-by: Ping-Ke Shih <[email protected]>

Patch applied to wireless-next.git, thanks.

ce1ba4d782d9 wifi: rtw89: move H2C of del_pkt_offload before polling FW status ready

--
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches