[PATCH] wifi: rtw89: fw: correct rtw89_fw_h2c_default_cmac_tbl_be()

[PATCH] wifi: rtw89: fw: correct rtw89_fw_h2c_default_cmac_tbl_be()

[Wentao Guan]

BE_CCTL_INFO_W2_PRELOAD_ENABLE is for h2c->w2, not h2c->w1.
These will cause h2c->w1 wrong overlap by w2 and w2 not initialized.

Fixes: c73607b3a8ef ("wifi: rtw89: fw: add CMAC H2C command to initialize default value for RTL8922D")
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
---
 drivers/net/wireless/realtek/rtw89/fw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
index 17704f054727a..af9bcdcef8fbb 100644
--- a/drivers/net/wireless/realtek/rtw89/fw.c
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
@@ -3711,7 +3711,7 @@ int rtw89_fw_h2c_default_cmac_tbl_be(struct rtw89_dev *rtwdev,
 		  le32_encode_bits(4, BE_CCTL_INFO_W1_RTS_RTY_LOWEST_RATE);
 	h2c->m1 = cpu_to_le32(BE_CCTL_INFO_W1_ALL);
 
-	h2c->w1 = le32_encode_bits(preld, BE_CCTL_INFO_W2_PRELOAD_ENABLE);
+	h2c->w2 = le32_encode_bits(preld, BE_CCTL_INFO_W2_PRELOAD_ENABLE);
 	h2c->m2 = cpu_to_le32(BE_CCTL_INFO_W2_ALL);
 
 	h2c->m3 = cpu_to_le32(BE_CCTL_INFO_W3_ALL);
-- 
2.30.2

RE: [PATCH] wifi: rtw89: fw: correct rtw89_fw_h2c_default_cmac_tbl_be()

[Ping-Ke Shih]

Wentao Guan <guanwentao@uniontech.com> wrote:
> BE_CCTL_INFO_W2_PRELOAD_ENABLE is for h2c->w2, not h2c->w1.
> These will cause h2c->w1 wrong overlap by w2 and w2 not initialized.

Thanks for the catch.

> 
> Fixes: c73607b3a8ef ("wifi: rtw89: fw: add CMAC H2C command to initialize default value for RTL8922D")
> Signed-off-by: Wentao Guan <guanwentao@uniontech.com>

Acked-by: Ping-Ke Shih <pkshih@realtek.com>

RE: [PATCH] wifi: rtw89: fw: correct rtw89_fw_h2c_default_cmac_tbl_be()

[Ping-Ke Shih]

Ping-Ke Shih <pkshih@realtek.com> wrote:
> Sent: Thursday, June 11, 2026 5:06 PM
> To: Wentao Guan <guanwentao@uniontech.com>
> Cc: linux-wireless@vger.kernel.org; linux-kernel@vger.kernel.org; David Yang(楊典軒)
> <dian_syuan0116@realtek.com>; zhanjun@uniontech.com; niecheng1@uniontech.com
> Subject: RE: [PATCH] wifi: rtw89: fw: correct rtw89_fw_h2c_default_cmac_tbl_be()
> 
> Wentao Guan <guanwentao@uniontech.com> wrote:
> > BE_CCTL_INFO_W2_PRELOAD_ENABLE is for h2c->w2, not h2c->w1.
> > These will cause h2c->w1 wrong overlap by w2 and w2 not initialized.
> 
> Thanks for the catch.
> 
> >
> > Fixes: c73607b3a8ef ("wifi: rtw89: fw: add CMAC H2C command to initialize default value for RTL8922D")
> > Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
> 
> Acked-by: Ping-Ke Shih <pkshih@realtek.com>
> 

To let subject clear, I'll change it to
" wifi: rtw89: fw: correct preload field of w2 in rtw89_fw_h2c_default_cmac_tbl_be() "

Re:RE: [PATCH] wifi: rtw89: fw: correct rtw89_fw_h2c_default_cmac_tbl_be()

[Wentao Guan]

> Ping-Ke Shih <pkshih@realtek.com> wrote:
> > Sent: Thursday, June 11, 2026 5:06 PM
> > To: Wentao Guan <guanwentao@uniontech.com>
> > Cc: linux-wireless@vger.kernel.org; linux-kernel@vger.kernel.org; David Yang(楊典軒)
> > <dian_syuan0116@realtek.com>; zhanjun@uniontech.com; niecheng1@uniontech.com
> > Subject: RE: [PATCH] wifi: rtw89: fw: correct rtw89_fw_h2c_default_cmac_tbl_be()
> >
> > Wentao Guan <guanwentao@uniontech.com> wrote:
> > > BE_CCTL_INFO_W2_PRELOAD_ENABLE is for h2c->w2, not h2c->w1.
> > > These will cause h2c->w1 wrong overlap by w2 and w2 not initialized.
> >
> > Thanks for the catch.
> >
> > >
> > > Fixes: c73607b3a8ef ("wifi: rtw89: fw: add CMAC H2C command to initialize default value for RTL8922D")
> > > Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
> >
> > Acked-by: Ping-Ke Shih <pkshih@realtek.com>
> >
> 
> To let subject clear, I'll change it to
> " wifi: rtw89: fw: correct preload field of w2 in rtw89_fw_h2c_default_cmac_tbl_be() "
OK, thanks for you review.

BRs
Wentao Guan