]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: rtw88: do not ignore hardware read error during DPK
authorDmitry Antipov <dmantipov@yandex.ru>
Tue, 15 Apr 2025 09:07:20 +0000 (12:07 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2025 10:04:03 +0000 (11:04 +0100)
[ Upstream commit 20d3c19bd8f9b498173c198eadf54580c8caa336 ]

In 'rtw8822c_dpk_cal_coef1()', do not ignore error returned
by 'check_hw_ready()' but issue a warning to denote possible
DPK issue. Compile tested only.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: 5227c2ee453d ("rtw88: 8822c: add SW DPK support")
Suggested-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20250415090720.194048-1-dmantipov@yandex.ru
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/realtek/rtw88/rtw8822c.c

index abed17e4c8c7bc5f2294c29382c68d7f322e8df2..a7fc2287521f0c12e91c603b6c48a38279d5bdf3 100644 (file)
@@ -3157,7 +3157,8 @@ static void rtw8822c_dpk_cal_coef1(struct rtw_dev *rtwdev)
        rtw_write32(rtwdev, REG_NCTL0, 0x00001148);
        rtw_write32(rtwdev, REG_NCTL0, 0x00001149);
 
-       check_hw_ready(rtwdev, 0x2d9c, MASKBYTE0, 0x55);
+       if (!check_hw_ready(rtwdev, 0x2d9c, MASKBYTE0, 0x55))
+               rtw_warn(rtwdev, "DPK stuck, performance may be suboptimal");
 
        rtw_write8(rtwdev, 0x1b10, 0x0);
        rtw_write32_mask(rtwdev, REG_NCTL0, BIT_SUBPAGE, 0x0000000c);