The initial CMAC/DMAC tables used by WiFi 6 chips are not needed to be
called for firmware secure boot. Otherwise, it causes firmware abnormal
and throw warnings.
rtw89_8852be 0000:03:00.0: FW status = 0x1400
rtw89_8852be 0000:03:00.0: FW BADADDR = 0xb872f800
rtw89_8852be 0000:03:00.0: FW EPC/RA = 0xb89333b7
rtw89_8852be 0000:03:00.0: FW MISC = 0x0
rtw89_8852be 0000:03:00.0: R_AX_HALT_C2H = 0x10002010
rtw89_8852be 0000:03:00.0: R_AX_SER_DBG_INFO = 0x0
rtw89_8852be 0000:03:00.0: [ERR]fw PC = 0xb89a2c97
rtw89_8852be 0000:03:00.0: [ERR]fw PC = 0xb89a2c95
rtw89_8852be 0000:03:00.0: [ERR]fw PC = 0xb89a2c99
rtw89_8852be 0000:03:00.0: [ERR]fw PC = 0xb89a2c9b
rtw89_8852be 0000:03:00.0: [ERR]fw PC = 0xb89a2c9f
rtw89_8852be 0000:03:00.0: [ERR]fw PC = 0xb89a2c9b
rtw89_8852be 0000:03:00.0: [ERR]fw PC = 0xb89a2c99
rtw89_8852be 0000:03:00.0: [ERR]fw PC = 0xb89a2c9d
rtw89_8852be 0000:03:00.0: [ERR]fw PC = 0xb89a2c97
rtw89_8852be 0000:03:00.0: [ERR]fw PC = 0xb89a2c97
rtw89_8852be 0000:03:00.0: [ERR]fw PC = 0xb89a2c97
rtw89_8852be 0000:03:00.0: [ERR]fw PC = 0xb89a2c99
rtw89_8852be 0000:03:00.0: [ERR]fw PC = 0xb89a2c97
rtw89_8852be 0000:03:00.0: [ERR]fw PC = 0xb89a2c9f
rtw89_8852be 0000:03:00.0: [ERR]fw PC = 0xb89a2c99
Signed-off-by: Ping-Ke Shih <pkshih@xxxxxxxxxxx>
---
drivers/net/wireless/realtek/rtw89/mac.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw89/mac.c b/drivers/net/wireless/realtek/rtw89/mac.c
index 8985bd8fa38f..7907b84d204b 100644
--- a/drivers/net/wireless/realtek/rtw89/mac.c
+++ b/drivers/net/wireless/realtek/rtw89/mac.c
@@ -4000,9 +4000,10 @@ int rtw89_mac_init(struct rtw89_dev *rtwdev)
static void rtw89_mac_dmac_tbl_init(struct rtw89_dev *rtwdev, u8 macid)
{
+ struct rtw89_fw_secure *sec = &rtwdev->fw.sec;
u8 i;
- if (rtwdev->chip->chip_gen != RTW89_CHIP_AX)
+ if (rtwdev->chip->chip_gen != RTW89_CHIP_AX || sec->secure_boot)
return;
for (i = 0; i < 4; i++) {
@@ -4014,7 +4015,9 @@ static void rtw89_mac_dmac_tbl_init(struct rtw89_dev *rtwdev, u8 macid)
static void rtw89_mac_cmac_tbl_init(struct rtw89_dev *rtwdev, u8 macid)
{
- if (rtwdev->chip->chip_gen != RTW89_CHIP_AX)
+ struct rtw89_fw_secure *sec = &rtwdev->fw.sec;
+
+ if (rtwdev->chip->chip_gen != RTW89_CHIP_AX || sec->secure_boot)
return;
rtw89_write32(rtwdev, R_AX_FILTER_MODEL_ADDR,
--
2.25.1
