[PATCH 5.10 v2 3/3] commit e109e3617e5d ("rtw88: rtw8821c: enable rfe 6 devices")

[Meng Tang]

These commits can fix the problem of wifi not loading properly. At
least in my 5.10 kernel environment, the following error message is
reported:

rtw_8821ce 0000:01:00.0: rfe 6 isn't supported
rtw_8821ce 0000:01:00.0: failed to setup chip efuse info
rtw_8821ce 0000:01:00.0: failed to setup chip information

so I think that 5.10 need to merge these commits.

The patch 1/3 and patch 2/3 need to be merged synchronously, otherwise it
will cause OE and then kernel exception.

Ping-Ke Shih answered[1] a question for a user about an rtl8821ce device that
reported RFE 6, which the driver did not support. Ping-Ke suggested a possible
fix, but the user never reported back.

A second user discovered the above thread and tested the proposed fix.
Accordingly, I am pushing this change, even though I am not the author.

[1] https://lore.kernel.org/linux-wireless/3f5e2f6eac344316b5dd518ebfea2f95@xxxxxxxxxxx/

Signed-off-by: Ping-Ke Shih <pkshih@xxxxxxxxxxx>
Reported-and-tested-by: masterzorag <masterzorag@xxxxxxxxx>
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Signed-off-by: Kalle Valo <kvalo@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20220107024739.20967-1-Larry.Finger@xxxxxxxxxxxx
Signed-off-by: Meng Tang <tangmeng@xxxxxxxxxxxxx>
---
 drivers/net/wireless/realtek/rtw88/rtw8821c.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.c b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
index 9c8fbc96f536..cbb4c761c5cb 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
@@ -1468,6 +1468,7 @@ static const struct rtw_rfe_def rtw8821c_rfe_defs[] = {
 	[0] = RTW_DEF_RFE(8821c, 0, 0),
 	[2] = RTW_DEF_RFE_EXT(8821c, 0, 0, 2),
 	[4] = RTW_DEF_RFE_EXT(8821c, 0, 0, 2),
+	[6] = RTW_DEF_RFE(8821c, 0, 0),
 };
 
 static struct rtw_hw_reg rtw8821c_dig[] = {
-- 
2.20.1