rtw88: 8822c: update MAC/BB parameter tables to v60

Update RTL8822C devices' MAC/BB tables to v60.
The new parameters fix incorrect RSSI report under 2.4G link.

Signed-off-by: Po-Hao Huang <phhuang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Reviewed-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210209070755.23019-6-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c_table.c b/drivers/net/wireless/realtek/rtw88/rtw8822c_table.c
index 3a204a7533df9e9857a546396cf0ae6d06487050..55df13e03e1939d05685d5dfdbee9db5a9ecc863 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8822c_table.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c_table.c
@@ -13,7 +13,72 @@ static const u32 rtw8822c_mac[] = {
 RTW_DECL_TABLE_PHY_COND(rtw8822c_mac, rtw_phy_cfg_mac);
 
 static const u32 rtw8822c_agc[] = {
-       0x80000015,     0x00000000,     0x40000000,     0x00000000,
+       0x83000000,     0x00000000,     0x40000000,     0x00000000,
+               0x1D90, 0x300001FF,
+               0x1D90, 0x300101FE,
+               0x1D90, 0x300201FD,
+               0x1D90, 0x300301FC,
+               0x1D90, 0x300401FB,
+               0x1D90, 0x300501FA,
+               0x1D90, 0x300601F9,
+               0x1D90, 0x300701F8,
+               0x1D90, 0x300801F7,
+               0x1D90, 0x300901F6,
+               0x1D90, 0x300A01F5,
+               0x1D90, 0x300B01F4,
+               0x1D90, 0x300C01F3,
+               0x1D90, 0x300D01F2,
+               0x1D90, 0x300E01F1,
+               0x1D90, 0x300F01F0,
+               0x1D90, 0x301001EF,
+               0x1D90, 0x301101EE,
+               0x1D90, 0x301201ED,
+               0x1D90, 0x301301EC,
+               0x1D90, 0x301401EB,
+               0x1D90, 0x301501EA,
+               0x1D90, 0x301601E9,
+               0x1D90, 0x301701E8,
+               0x1D90, 0x301801E7,
+               0x1D90, 0x301901E5,
+               0x1D90, 0x301A01E4,
+               0x1D90, 0x301B01C5,
+               0x1D90, 0x301C01C4,
+               0x1D90, 0x301D01C3,
+               0x1D90, 0x301E01C2,
+               0x1D90, 0x301F0188,
+               0x1D90, 0x30200187,
+               0x1D90, 0x30210186,
+               0x1D90, 0x30220184,
+               0x1D90, 0x30230183,
+               0x1D90, 0x30240182,
+               0x1D90, 0x30250181,
+               0x1D90, 0x30260148,
+               0x1D90, 0x30270147,
+               0x1D90, 0x30280146,
+               0x1D90, 0x30290144,
+               0x1D90, 0x302A0143,
+               0x1D90, 0x302B0142,
+               0x1D90, 0x302C0141,
+               0x1D90, 0x302D00C8,
+               0x1D90, 0x302E00C7,
+               0x1D90, 0x302F00C6,
+               0x1D90, 0x303000C5,
+               0x1D90, 0x303100C4,
+               0x1D90, 0x303200C3,
+               0x1D90, 0x30330048,
+               0x1D90, 0x30340047,
+               0x1D90, 0x30350046,
+               0x1D90, 0x30360045,
+               0x1D90, 0x30370025,
+               0x1D90, 0x30380024,
+               0x1D90, 0x30390023,
+               0x1D90, 0x303A0022,
+               0x1D90, 0x303B0021,
+               0x1D90, 0x303C0020,
+               0x1D90, 0x303D0003,
+               0x1D90, 0x303E0002,
+               0x1D90, 0x303F0001,
+       0x90000015,     0x00000000,     0x40000000,     0x00000000,
                0x1D90, 0x300001FF,
                0x1D90, 0x300101FE,
                0x1D90, 0x300201FD,
@@ -209,7 +274,72 @@ static const u32 rtw8822c_agc[] = {
                0x1D90, 0x303E0002,
                0x1D90, 0x303F0001,
        0xB0000000,     0x00000000,
-       0x80000015,     0x00000000,     0x40000000,     0x00000000,
+       0x83000000,     0x00000000,     0x40000000,     0x00000000,
+               0x1D90, 0x3040011F,
+               0x1D90, 0x3041011F,
+               0x1D90, 0x3042011F,
+               0x1D90, 0x3043011F,
+               0x1D90, 0x3044011F,
+               0x1D90, 0x3045011F,
+               0x1D90, 0x3046011F,
+               0x1D90, 0x3047011F,
+               0x1D90, 0x3048011F,
+               0x1D90, 0x3049011F,
+               0x1D90, 0x304A011F,
+               0x1D90, 0x304B011F,
+               0x1D90, 0x304C011F,
+               0x1D90, 0x304D011F,
+               0x1D90, 0x304E011F,
+               0x1D90, 0x304F00F4,
+               0x1D90, 0x305000F3,
+               0x1D90, 0x305100F2,
+               0x1D90, 0x305200F1,
+               0x1D90, 0x305300F0,
+               0x1D90, 0x305400EF,
+               0x1D90, 0x305500EE,
+               0x1D90, 0x305600ED,
+               0x1D90, 0x305700EC,
+               0x1D90, 0x305800EB,
+               0x1D90, 0x305900EA,
+               0x1D90, 0x305A00E9,
+               0x1D90, 0x305B00E8,
+               0x1D90, 0x305C00E7,
+               0x1D90, 0x305D00E6,
+               0x1D90, 0x305E00E4,
+               0x1D90, 0x305F00E3,
+               0x1D90, 0x306000E2,
+               0x1D90, 0x306100C4,
+               0x1D90, 0x306200C3,
+               0x1D90, 0x306300C2,
+               0x1D90, 0x306400A4,
+               0x1D90, 0x306500A3,
+               0x1D90, 0x306600A2,
+               0x1D90, 0x306700A1,
+               0x1D90, 0x30680084,
+               0x1D90, 0x30690083,
+               0x1D90, 0x306A0082,
+               0x1D90, 0x306B0081,
+               0x1D90, 0x306C0080,
+               0x1D90, 0x306D0067,
+               0x1D90, 0x306E0066,
+               0x1D90, 0x306F0065,
+               0x1D90, 0x30700064,
+               0x1D90, 0x30710063,
+               0x1D90, 0x30720044,
+               0x1D90, 0x30730043,
+               0x1D90, 0x30740042,
+               0x1D90, 0x30750041,
+               0x1D90, 0x30760024,
+               0x1D90, 0x30770023,
+               0x1D90, 0x30780022,
+               0x1D90, 0x30790021,
+               0x1D90, 0x307A0020,
+               0x1D90, 0x307B0004,
+               0x1D90, 0x307C0003,
+               0x1D90, 0x307D0002,
+               0x1D90, 0x307E0001,
+               0x1D90, 0x307F0000,
+       0x90000015,     0x00000000,     0x40000000,     0x00000000,
                0x1D90, 0x304001FD,
                0x1D90, 0x304101FC,
                0x1D90, 0x304201FB,
@@ -405,7 +535,72 @@ static const u32 rtw8822c_agc[] = {
                0x1D90, 0x307E0001,
                0x1D90, 0x307F0000,
        0xB0000000,     0x00000000,
-       0x80000015,     0x00000000,     0x40000000,     0x00000000,
+       0x83000000,     0x00000000,     0x40000000,     0x00000000,
+               0x1D90, 0x308000FF,
+               0x1D90, 0x308100FF,
+               0x1D90, 0x308200FF,
+               0x1D90, 0x308300FF,
+               0x1D90, 0x308400FF,
+               0x1D90, 0x308500FF,
+               0x1D90, 0x308600FE,
+               0x1D90, 0x308700FD,
+               0x1D90, 0x308800FC,
+               0x1D90, 0x308900FB,
+               0x1D90, 0x308A00FA,
+               0x1D90, 0x308B00F9,
+               0x1D90, 0x308C00F8,
+               0x1D90, 0x308D00F7,
+               0x1D90, 0x308E00F6,
+               0x1D90, 0x308F00F5,
+               0x1D90, 0x309000F4,
+               0x1D90, 0x309100F3,
+               0x1D90, 0x309200F2,
+               0x1D90, 0x309300F1,
+               0x1D90, 0x309400F0,
+               0x1D90, 0x309500EF,
+               0x1D90, 0x309600EE,
+               0x1D90, 0x309700ED,
+               0x1D90, 0x309800EC,
+               0x1D90, 0x309900EB,
+               0x1D90, 0x309A00EA,
+               0x1D90, 0x309B00E8,
+               0x1D90, 0x309C00E7,
+               0x1D90, 0x309D00E6,
+               0x1D90, 0x309E00E5,
+               0x1D90, 0x309F00E4,
+               0x1D90, 0x30A000C4,
+               0x1D90, 0x30A100C3,
+               0x1D90, 0x30A200C2,
+               0x1D90, 0x30A300C1,
+               0x1D90, 0x30A400A3,
+               0x1D90, 0x30A500A2,
+               0x1D90, 0x30A600A1,
+               0x1D90, 0x30A70085,
+               0x1D90, 0x30A80084,
+               0x1D90, 0x30A90083,
+               0x1D90, 0x30AA0082,
+               0x1D90, 0x30AB0081,
+               0x1D90, 0x30AC0067,
+               0x1D90, 0x30AD0066,
+               0x1D90, 0x30AE0065,
+               0x1D90, 0x30AF0064,
+               0x1D90, 0x30B00063,
+               0x1D90, 0x30B10044,
+               0x1D90, 0x30B20043,
+               0x1D90, 0x30B30042,
+               0x1D90, 0x30B40026,
+               0x1D90, 0x30B50025,
+               0x1D90, 0x30B60024,
+               0x1D90, 0x30B70023,
+               0x1D90, 0x30B80022,
+               0x1D90, 0x30B90021,
+               0x1D90, 0x30BA0005,
+               0x1D90, 0x30BB0004,
+               0x1D90, 0x30BC0003,
+               0x1D90, 0x30BD0002,
+               0x1D90, 0x30BE0001,
+               0x1D90, 0x30BF0000,
+       0x90000015,     0x00000000,     0x40000000,     0x00000000,
                0x1D90, 0x308000FA,
                0x1D90, 0x308100F9,
                0x1D90, 0x308200F8,
@@ -601,7 +796,72 @@ static const u32 rtw8822c_agc[] = {
                0x1D90, 0x30BE0001,
                0x1D90, 0x30BF0000,
        0xB0000000,     0x00000000,
-       0x80000015,     0x00000000,     0x40000000,     0x00000000,
+       0x83000000,     0x00000000,     0x40000000,     0x00000000,
+               0x1D90, 0x30C000FF,
+               0x1D90, 0x30C100FF,
+               0x1D90, 0x30C200FF,
+               0x1D90, 0x30C300FF,
+               0x1D90, 0x30C400FF,
+               0x1D90, 0x30C500FF,
+               0x1D90, 0x30C600FE,
+               0x1D90, 0x30C700FD,
+               0x1D90, 0x30C800FC,
+               0x1D90, 0x30C900FB,
+               0x1D90, 0x30CA00FA,
+               0x1D90, 0x30CB00F9,
+               0x1D90, 0x30CC00F8,
+               0x1D90, 0x30CD00F7,
+               0x1D90, 0x30CE00F6,
+               0x1D90, 0x30CF00F5,
+               0x1D90, 0x30D000F4,
+               0x1D90, 0x30D100F3,
+               0x1D90, 0x30D200F2,
+               0x1D90, 0x30D300F1,
+               0x1D90, 0x30D400F0,
+               0x1D90, 0x30D500EF,
+               0x1D90, 0x30D600EE,
+               0x1D90, 0x30D700ED,
+               0x1D90, 0x30D800EC,
+               0x1D90, 0x30D900EB,
+               0x1D90, 0x30DA00EA,
+               0x1D90, 0x30DB00E8,
+               0x1D90, 0x30DC00E7,
+               0x1D90, 0x30DD00E6,
+               0x1D90, 0x30DE00E5,
+               0x1D90, 0x30DF00E4,
+               0x1D90, 0x30E000E3,
+               0x1D90, 0x30E100E2,
+               0x1D90, 0x30E200A6,
+               0x1D90, 0x30E300A5,
+               0x1D90, 0x30E400A4,
+               0x1D90, 0x30E500A3,
+               0x1D90, 0x30E600A2,
+               0x1D90, 0x30E70086,
+               0x1D90, 0x30E80085,
+               0x1D90, 0x30E90084,
+               0x1D90, 0x30EA0083,
+               0x1D90, 0x30EB0082,
+               0x1D90, 0x30EC0067,
+               0x1D90, 0x30ED0066,
+               0x1D90, 0x30EE0065,
+               0x1D90, 0x30EF0064,
+               0x1D90, 0x30F00063,
+               0x1D90, 0x30F10045,
+               0x1D90, 0x30F20044,
+               0x1D90, 0x30F30043,
+               0x1D90, 0x30F40042,
+               0x1D90, 0x30F50025,
+               0x1D90, 0x30F60024,
+               0x1D90, 0x30F70023,
+               0x1D90, 0x30F80022,
+               0x1D90, 0x30F90021,
+               0x1D90, 0x30FA0005,
+               0x1D90, 0x30FB0004,
+               0x1D90, 0x30FC0003,
+               0x1D90, 0x30FD0002,
+               0x1D90, 0x30FE0001,
+               0x1D90, 0x30FF0000,
+       0x90000015,     0x00000000,     0x40000000,     0x00000000,
                0x1D90, 0x30C000F8,
                0x1D90, 0x30C100F7,
                0x1D90, 0x30C200F6,
@@ -797,267 +1057,397 @@ static const u32 rtw8822c_agc[] = {
                0x1D90, 0x30FE0001,
                0x1D90, 0x30FF0000,
        0xB0000000,     0x00000000,
-       0x80000015,     0x00000000,     0x40000000,     0x00000000,
+       0x83000000,     0x00000000,     0x40000000,     0x00000000,
                0x1D90, 0x310001FF,
                0x1D90, 0x310101FF,
                0x1D90, 0x310201FF,
                0x1D90, 0x310301FF,
-               0x1D90, 0x310401FF,
-               0x1D90, 0x310501FF,
-               0x1D90, 0x310601FF,
-               0x1D90, 0x310701FF,
-               0x1D90, 0x310801FF,
-               0x1D90, 0x310901FE,
-               0x1D90, 0x310A01FD,
-               0x1D90, 0x310B01FC,
-               0x1D90, 0x310C01FB,
-               0x1D90, 0x310D01FA,
-               0x1D90, 0x310E01F9,
-               0x1D90, 0x310F01F8,
-               0x1D90, 0x311001F7,
-               0x1D90, 0x311101F6,
-               0x1D90, 0x311201F5,
-               0x1D90, 0x311301F4,
-               0x1D90, 0x311401F3,
-               0x1D90, 0x311501F2,
-               0x1D90, 0x311601F1,
-               0x1D90, 0x311701F0,
-               0x1D90, 0x311801EF,
-               0x1D90, 0x311901EE,
-               0x1D90, 0x311A01ED,
-               0x1D90, 0x311B01EC,
-               0x1D90, 0x311C01EB,
-               0x1D90, 0x311D0192,
-               0x1D90, 0x311E0191,
-               0x1D90, 0x311F0190,
-               0x1D90, 0x3120018F,
-               0x1D90, 0x3121018E,
-               0x1D90, 0x3122018D,
-               0x1D90, 0x3123018C,
-               0x1D90, 0x3124018B,
-               0x1D90, 0x3125018A,
-               0x1D90, 0x31260189,
-               0x1D90, 0x31270188,
-               0x1D90, 0x31280187,
-               0x1D90, 0x31290186,
-               0x1D90, 0x312A0185,
-               0x1D90, 0x312B0149,
-               0x1D90, 0x312C0148,
-               0x1D90, 0x312D0147,
-               0x1D90, 0x312E0146,
-               0x1D90, 0x312F0145,
-               0x1D90, 0x31300144,
-               0x1D90, 0x31310143,
-               0x1D90, 0x31320142,
-               0x1D90, 0x31330141,
-               0x1D90, 0x31340140,
-               0x1D90, 0x313500C7,
-               0x1D90, 0x313600C6,
-               0x1D90, 0x313700C5,
-               0x1D90, 0x313800C4,
-               0x1D90, 0x313900C3,
-               0x1D90, 0x313A0088,
-               0x1D90, 0x313B0087,
-               0x1D90, 0x313C0086,
-               0x1D90, 0x313D0045,
-               0x1D90, 0x313E0044,
-               0x1D90, 0x313F0043,
+               0x1D90, 0x310401FE,
+               0x1D90, 0x310501FD,
+               0x1D90, 0x310601FC,
+               0x1D90, 0x310701FB,
+               0x1D90, 0x310801FA,
+               0x1D90, 0x310901F9,
+               0x1D90, 0x310A01F8,
+               0x1D90, 0x310B01F7,
+               0x1D90, 0x310C01F6,
+               0x1D90, 0x310D01F5,
+               0x1D90, 0x310E01F4,
+               0x1D90, 0x310F01F3,
+               0x1D90, 0x311001F2,
+               0x1D90, 0x311101F1,
+               0x1D90, 0x311201F0,
+               0x1D90, 0x311301EF,
+               0x1D90, 0x311401EE,
+               0x1D90, 0x311501ED,
+               0x1D90, 0x311601EC,
+               0x1D90, 0x311701EB,
+               0x1D90, 0x311801EA,
+               0x1D90, 0x311901E9,
+               0x1D90, 0x311A01E8,
+               0x1D90, 0x311B01E7,
+               0x1D90, 0x311C01E5,
+               0x1D90, 0x311D01E4,
+               0x1D90, 0x311E01C5,
+               0x1D90, 0x311F01C4,
+               0x1D90, 0x312001C3,
+               0x1D90, 0x312101C2,
+               0x1D90, 0x31220188,
+               0x1D90, 0x31230187,
+               0x1D90, 0x31240186,
+               0x1D90, 0x31250184,
+               0x1D90, 0x31260183,
+               0x1D90, 0x31270182,
+               0x1D90, 0x31280181,
+               0x1D90, 0x31290148,
+               0x1D90, 0x312A0147,
+               0x1D90, 0x312B0146,
+               0x1D90, 0x312C0144,
+               0x1D90, 0x312D0143,
+               0x1D90, 0x312E0142,
+               0x1D90, 0x312F0141,
+               0x1D90, 0x313000C8,
+               0x1D90, 0x313100C7,
+               0x1D90, 0x313200C6,
+               0x1D90, 0x313300C5,
+               0x1D90, 0x313400C4,
+               0x1D90, 0x313500C3,
+               0x1D90, 0x31360048,
+               0x1D90, 0x31370047,
+               0x1D90, 0x31380046,
+               0x1D90, 0x31390045,
+               0x1D90, 0x313A0025,
+               0x1D90, 0x313B0024,
+               0x1D90, 0x313C0023,
+               0x1D90, 0x313D0022,
+               0x1D90, 0x313E0021,
+               0x1D90, 0x313F0020,
+       0x90000015,     0x00000000,     0x40000000,     0x00000000,
+               0x1D90, 0x310001FF,
+               0x1D90, 0x310101FF,
+               0x1D90, 0x310201FF,
+               0x1D90, 0x310301FF,
+               0x1D90, 0x310401FE,
+               0x1D90, 0x310501FD,
+               0x1D90, 0x310601FC,
+               0x1D90, 0x310701FB,
+               0x1D90, 0x310801FA,
+               0x1D90, 0x310901F9,
+               0x1D90, 0x310A01F8,
+               0x1D90, 0x310B01F7,
+               0x1D90, 0x310C01F6,
+               0x1D90, 0x310D01F5,
+               0x1D90, 0x310E01F4,
+               0x1D90, 0x310F01F3,
+               0x1D90, 0x311001F2,
+               0x1D90, 0x311101F1,
+               0x1D90, 0x311201F0,
+               0x1D90, 0x311301EF,
+               0x1D90, 0x311401EE,
+               0x1D90, 0x311501ED,
+               0x1D90, 0x311601EC,
+               0x1D90, 0x311701EB,
+               0x1D90, 0x311801EA,
+               0x1D90, 0x311901E9,
+               0x1D90, 0x311A01E8,
+               0x1D90, 0x311B01E7,
+               0x1D90, 0x311C01E5,
+               0x1D90, 0x311D01E4,
+               0x1D90, 0x311E01C5,
+               0x1D90, 0x311F01C4,
+               0x1D90, 0x312001C3,
+               0x1D90, 0x312101C2,
+               0x1D90, 0x31220188,
+               0x1D90, 0x31230187,
+               0x1D90, 0x31240186,
+               0x1D90, 0x31250184,
+               0x1D90, 0x31260183,
+               0x1D90, 0x31270182,
+               0x1D90, 0x31280181,
+               0x1D90, 0x31290148,
+               0x1D90, 0x312A0147,
+               0x1D90, 0x312B0146,
+               0x1D90, 0x312C0144,
+               0x1D90, 0x312D0143,
+               0x1D90, 0x312E0142,
+               0x1D90, 0x312F0141,
+               0x1D90, 0x313000C8,
+               0x1D90, 0x313100C7,
+               0x1D90, 0x313200C6,
+               0x1D90, 0x313300C5,
+               0x1D90, 0x313400C4,
+               0x1D90, 0x313500C3,
+               0x1D90, 0x31360048,
+               0x1D90, 0x31370047,
+               0x1D90, 0x31380046,
+               0x1D90, 0x31390045,
+               0x1D90, 0x313A0025,
+               0x1D90, 0x313B0024,
+               0x1D90, 0x313C0023,
+               0x1D90, 0x313D0022,
+               0x1D90, 0x313E0021,
+               0x1D90, 0x313F0020,
        0x90000016,     0x00000000,     0x40000000,     0x00000000,
                0x1D90, 0x310001FF,
                0x1D90, 0x310101FF,
                0x1D90, 0x310201FF,
                0x1D90, 0x310301FF,
-               0x1D90, 0x310401FF,
-               0x1D90, 0x310501FF,
-               0x1D90, 0x310601FF,
-               0x1D90, 0x310701FF,
-               0x1D90, 0x310801FF,
-               0x1D90, 0x310901FE,
-               0x1D90, 0x310A01FD,
-               0x1D90, 0x310B01FC,
-               0x1D90, 0x310C01FB,
-               0x1D90, 0x310D01FA,
-               0x1D90, 0x310E01F9,
-               0x1D90, 0x310F01F8,
-               0x1D90, 0x311001F7,
-               0x1D90, 0x311101F6,
-               0x1D90, 0x311201F5,
-               0x1D90, 0x311301F4,
-               0x1D90, 0x311401F3,
-               0x1D90, 0x311501F2,
-               0x1D90, 0x311601F1,
-               0x1D90, 0x311701F0,
-               0x1D90, 0x311801EF,
-               0x1D90, 0x311901EE,
-               0x1D90, 0x311A01ED,
-               0x1D90, 0x311B01EC,
-               0x1D90, 0x311C01EB,
-               0x1D90, 0x311D0192,
-               0x1D90, 0x311E0191,
-               0x1D90, 0x311F0190,
-               0x1D90, 0x3120018F,
-               0x1D90, 0x3121018E,
-               0x1D90, 0x3122018D,
-               0x1D90, 0x3123018C,
-               0x1D90, 0x3124018B,
-               0x1D90, 0x3125018A,
-               0x1D90, 0x31260189,
-               0x1D90, 0x31270188,
-               0x1D90, 0x31280187,
-               0x1D90, 0x31290186,
-               0x1D90, 0x312A0185,
-               0x1D90, 0x312B0149,
-               0x1D90, 0x312C0148,
-               0x1D90, 0x312D0147,
-               0x1D90, 0x312E0146,
-               0x1D90, 0x312F0145,
-               0x1D90, 0x31300144,
-               0x1D90, 0x31310143,
-               0x1D90, 0x31320142,
-               0x1D90, 0x31330141,
-               0x1D90, 0x31340140,
-               0x1D90, 0x313500C7,
-               0x1D90, 0x313600C6,
-               0x1D90, 0x313700C5,
-               0x1D90, 0x313800C4,
-               0x1D90, 0x313900C3,
-               0x1D90, 0x313A0088,
-               0x1D90, 0x313B0087,
-               0x1D90, 0x313C0086,
-               0x1D90, 0x313D0045,
-               0x1D90, 0x313E0044,
-               0x1D90, 0x313F0043,
+               0x1D90, 0x310401FE,
+               0x1D90, 0x310501FD,
+               0x1D90, 0x310601FC,
+               0x1D90, 0x310701FB,
+               0x1D90, 0x310801FA,
+               0x1D90, 0x310901F9,
+               0x1D90, 0x310A01F8,
+               0x1D90, 0x310B01F7,
+               0x1D90, 0x310C01F6,
+               0x1D90, 0x310D01F5,
+               0x1D90, 0x310E01F4,
+               0x1D90, 0x310F01F3,
+               0x1D90, 0x311001F2,
+               0x1D90, 0x311101F1,
+               0x1D90, 0x311201F0,
+               0x1D90, 0x311301EF,
+               0x1D90, 0x311401EE,
+               0x1D90, 0x311501ED,
+               0x1D90, 0x311601EC,
+               0x1D90, 0x311701EB,
+               0x1D90, 0x311801EA,
+               0x1D90, 0x311901E9,
+               0x1D90, 0x311A01E8,
+               0x1D90, 0x311B01E7,
+               0x1D90, 0x311C01E5,
+               0x1D90, 0x311D01E4,
+               0x1D90, 0x311E01C5,
+               0x1D90, 0x311F01C4,
+               0x1D90, 0x312001C3,
+               0x1D90, 0x312101C2,
+               0x1D90, 0x31220188,
+               0x1D90, 0x31230187,
+               0x1D90, 0x31240186,
+               0x1D90, 0x31250184,
+               0x1D90, 0x31260183,
+               0x1D90, 0x31270182,
+               0x1D90, 0x31280181,
+               0x1D90, 0x31290148,
+               0x1D90, 0x312A0147,
+               0x1D90, 0x312B0146,
+               0x1D90, 0x312C0144,
+               0x1D90, 0x312D0143,
+               0x1D90, 0x312E0142,
+               0x1D90, 0x312F0141,
+               0x1D90, 0x313000C8,
+               0x1D90, 0x313100C7,
+               0x1D90, 0x313200C6,
+               0x1D90, 0x313300C5,
+               0x1D90, 0x313400C4,
+               0x1D90, 0x313500C3,
+               0x1D90, 0x31360048,
+               0x1D90, 0x31370047,
+               0x1D90, 0x31380046,
+               0x1D90, 0x31390045,
+               0x1D90, 0x313A0025,
+               0x1D90, 0x313B0024,
+               0x1D90, 0x313C0023,
+               0x1D90, 0x313D0022,
+               0x1D90, 0x313E0021,
+               0x1D90, 0x313F0020,
        0xA0000000,     0x00000000,
                0x1D90, 0x310001FF,
                0x1D90, 0x310101FF,
                0x1D90, 0x310201FF,
                0x1D90, 0x310301FF,
-               0x1D90, 0x310401FF,
-               0x1D90, 0x310501FF,
-               0x1D90, 0x310601FF,
-               0x1D90, 0x310701FF,
-               0x1D90, 0x310801FF,
-               0x1D90, 0x310901FE,
-               0x1D90, 0x310A01FD,
-               0x1D90, 0x310B01FC,
-               0x1D90, 0x310C01FB,
-               0x1D90, 0x310D01FA,
-               0x1D90, 0x310E01F9,
-               0x1D90, 0x310F01F8,
-               0x1D90, 0x311001F7,
-               0x1D90, 0x311101F6,
-               0x1D90, 0x311201F5,
-               0x1D90, 0x311301F4,
-               0x1D90, 0x311401F3,
-               0x1D90, 0x311501F2,
-               0x1D90, 0x311601F1,
-               0x1D90, 0x311701F0,
-               0x1D90, 0x311801EF,
-               0x1D90, 0x311901EE,
-               0x1D90, 0x311A01ED,
-               0x1D90, 0x311B01EC,
-               0x1D90, 0x311C01EB,
-               0x1D90, 0x311D0192,
-               0x1D90, 0x311E0191,
-               0x1D90, 0x311F0190,
-               0x1D90, 0x3120018F,
-               0x1D90, 0x3121018E,
-               0x1D90, 0x3122018D,
-               0x1D90, 0x3123018C,
-               0x1D90, 0x3124018B,
-               0x1D90, 0x3125018A,
-               0x1D90, 0x31260189,
-               0x1D90, 0x31270188,
-               0x1D90, 0x31280187,
-               0x1D90, 0x31290186,
-               0x1D90, 0x312A0185,
-               0x1D90, 0x312B0149,
-               0x1D90, 0x312C0148,
-               0x1D90, 0x312D0147,
-               0x1D90, 0x312E0146,
-               0x1D90, 0x312F0145,
-               0x1D90, 0x31300144,
-               0x1D90, 0x31310143,
-               0x1D90, 0x31320142,
-               0x1D90, 0x31330141,
-               0x1D90, 0x31340140,
-               0x1D90, 0x313500C7,
-               0x1D90, 0x313600C6,
-               0x1D90, 0x313700C5,
-               0x1D90, 0x313800C4,
-               0x1D90, 0x313900C3,
-               0x1D90, 0x313A0088,
-               0x1D90, 0x313B0087,
-               0x1D90, 0x313C0086,
-               0x1D90, 0x313D0045,
-               0x1D90, 0x313E0044,
-               0x1D90, 0x313F0043,
+               0x1D90, 0x310401FE,
+               0x1D90, 0x310501FD,
+               0x1D90, 0x310601FC,
+               0x1D90, 0x310701FB,
+               0x1D90, 0x310801FA,
+               0x1D90, 0x310901F9,
+               0x1D90, 0x310A01F8,
+               0x1D90, 0x310B01F7,
+               0x1D90, 0x310C01F6,
+               0x1D90, 0x310D01F5,
+               0x1D90, 0x310E01F4,
+               0x1D90, 0x310F01F3,
+               0x1D90, 0x311001F2,
+               0x1D90, 0x311101F1,
+               0x1D90, 0x311201F0,
+               0x1D90, 0x311301EF,
+               0x1D90, 0x311401EE,
+               0x1D90, 0x311501ED,
+               0x1D90, 0x311601EC,
+               0x1D90, 0x311701EB,
+               0x1D90, 0x311801EA,
+               0x1D90, 0x311901E9,
+               0x1D90, 0x311A01E8,
+               0x1D90, 0x311B01E7,
+               0x1D90, 0x311C01E5,
+               0x1D90, 0x311D01E4,
+               0x1D90, 0x311E01C5,
+               0x1D90, 0x311F01C4,
+               0x1D90, 0x312001C3,
+               0x1D90, 0x312101C2,
+               0x1D90, 0x31220188,
+               0x1D90, 0x31230187,
+               0x1D90, 0x31240186,
+               0x1D90, 0x31250184,
+               0x1D90, 0x31260183,
+               0x1D90, 0x31270182,
+               0x1D90, 0x31280181,
+               0x1D90, 0x31290148,
+               0x1D90, 0x312A0147,
+               0x1D90, 0x312B0146,
+               0x1D90, 0x312C0144,
+               0x1D90, 0x312D0143,
+               0x1D90, 0x312E0142,
+               0x1D90, 0x312F0141,
+               0x1D90, 0x313000C8,
+               0x1D90, 0x313100C7,
+               0x1D90, 0x313200C6,
+               0x1D90, 0x313300C5,
+               0x1D90, 0x313400C4,
+               0x1D90, 0x313500C3,
+               0x1D90, 0x31360048,
+               0x1D90, 0x31370047,
+               0x1D90, 0x31380046,
+               0x1D90, 0x31390045,
+               0x1D90, 0x313A0025,
+               0x1D90, 0x313B0024,
+               0x1D90, 0x313C0023,
+               0x1D90, 0x313D0022,
+               0x1D90, 0x313E0021,
+               0x1D90, 0x313F0020,
        0xB0000000,     0x00000000,
-       0x80000015,     0x00000000,     0x40000000,     0x00000000,
+       0x83000000,     0x00000000,     0x40000000,     0x00000000,
                0x1D90, 0x314001FF,
                0x1D90, 0x314101FF,
                0x1D90, 0x314201FF,
                0x1D90, 0x314301FF,
                0x1D90, 0x314401FF,
                0x1D90, 0x314501FF,
-               0x1D90, 0x314601FF,
-               0x1D90, 0x314701FE,
-               0x1D90, 0x314801FD,
-               0x1D90, 0x314901FC,
-               0x1D90, 0x314A01FB,
-               0x1D90, 0x314B01FA,
-               0x1D90, 0x314C01F9,
-               0x1D90, 0x314D01F8,
-               0x1D90, 0x314E01F7,
-               0x1D90, 0x314F01F6,
-               0x1D90, 0x315001F5,
-               0x1D90, 0x315101F4,
-               0x1D90, 0x315201F3,
-               0x1D90, 0x315301F2,
-               0x1D90, 0x315401F1,
-               0x1D90, 0x315501F0,
-               0x1D90, 0x315601EF,
-               0x1D90, 0x315701EE,
-               0x1D90, 0x315801ED,
-               0x1D90, 0x315901EC,
-               0x1D90, 0x315A01EB,
-               0x1D90, 0x315B01EA,
-               0x1D90, 0x315C01E9,
-               0x1D90, 0x315D018F,
-               0x1D90, 0x315E018E,
-               0x1D90, 0x315F018D,
-               0x1D90, 0x3160018C,
-               0x1D90, 0x3161018B,
-               0x1D90, 0x3162018A,
-               0x1D90, 0x31630189,
-               0x1D90, 0x31640188,
-               0x1D90, 0x31650187,
-               0x1D90, 0x31660186,
-               0x1D90, 0x31670185,
-               0x1D90, 0x31680184,
-               0x1D90, 0x31690183,
-               0x1D90, 0x316A0182,
-               0x1D90, 0x316B0149,
-               0x1D90, 0x316C0148,
-               0x1D90, 0x316D0147,
-               0x1D90, 0x316E0146,
-               0x1D90, 0x316F0145,
-               0x1D90, 0x31700144,
-               0x1D90, 0x31710143,
-               0x1D90, 0x31720142,
-               0x1D90, 0x31730141,
-               0x1D90, 0x31740140,
-               0x1D90, 0x317500C7,
-               0x1D90, 0x317600C6,
-               0x1D90, 0x317700C5,
-               0x1D90, 0x317800C4,
-               0x1D90, 0x317900C3,
-               0x1D90, 0x317A0088,
-               0x1D90, 0x317B0087,
-               0x1D90, 0x317C0086,
-               0x1D90, 0x317D0045,
-               0x1D90, 0x317E0044,
-               0x1D90, 0x317F0043,
+               0x1D90, 0x314601FE,
+               0x1D90, 0x314701FD,
+               0x1D90, 0x314801FC,
+               0x1D90, 0x314901FB,
+               0x1D90, 0x314A01FA,
+               0x1D90, 0x314B01F9,
+               0x1D90, 0x314C01F8,
+               0x1D90, 0x314D01F7,
+               0x1D90, 0x314E01F6,
+               0x1D90, 0x314F01F5,
+               0x1D90, 0x315001F4,
+               0x1D90, 0x315101F3,
+               0x1D90, 0x315201F2,
+               0x1D90, 0x315301F1,
+               0x1D90, 0x315401F0,
+               0x1D90, 0x315501EF,
+               0x1D90, 0x315601EE,
+               0x1D90, 0x315701ED,
+               0x1D90, 0x315801EC,
+               0x1D90, 0x315901EB,
+               0x1D90, 0x315A01EA,
+               0x1D90, 0x315B01E9,
+               0x1D90, 0x315C01E7,
+               0x1D90, 0x315D01E6,
+               0x1D90, 0x315E01E5,
+               0x1D90, 0x315F01E4,
+               0x1D90, 0x316001A8,
+               0x1D90, 0x316101A7,
+               0x1D90, 0x316201A6,
+               0x1D90, 0x316301A5,
+               0x1D90, 0x31640185,
+               0x1D90, 0x31650184,
+               0x1D90, 0x31660183,
+               0x1D90, 0x31670182,
+               0x1D90, 0x31680149,
+               0x1D90, 0x31690148,
+               0x1D90, 0x316A0147,
+               0x1D90, 0x316B0145,
+               0x1D90, 0x316C0144,
+               0x1D90, 0x316D0143,
+               0x1D90, 0x316E0142,
+               0x1D90, 0x316F00E6,
+               0x1D90, 0x317000E5,
+               0x1D90, 0x317100C9,
+               0x1D90, 0x317200C8,
+               0x1D90, 0x317300C7,
+               0x1D90, 0x317400C6,
+               0x1D90, 0x317500C5,
+               0x1D90, 0x317600C4,
+               0x1D90, 0x317700C3,
+               0x1D90, 0x31780088,
+               0x1D90, 0x31790087,
+               0x1D90, 0x317A0086,
+               0x1D90, 0x317B0085,
+               0x1D90, 0x317C0026,
+               0x1D90, 0x317D0025,
+               0x1D90, 0x317E0024,
+               0x1D90, 0x317F0023,
+       0x90000015,     0x00000000,     0x40000000,     0x00000000,
+               0x1D90, 0x314001FF,
+               0x1D90, 0x314101FF,
+               0x1D90, 0x314201FF,
+               0x1D90, 0x314301FF,
+               0x1D90, 0x314401FF,
+               0x1D90, 0x314501FF,
+               0x1D90, 0x314601FE,
+               0x1D90, 0x314701FD,
+               0x1D90, 0x314801FC,
+               0x1D90, 0x314901FB,
+               0x1D90, 0x314A01FA,
+               0x1D90, 0x314B01F9,
+               0x1D90, 0x314C01F8,
+               0x1D90, 0x314D01F7,
+               0x1D90, 0x314E01F6,
+               0x1D90, 0x314F01F5,
+               0x1D90, 0x315001F4,
+               0x1D90, 0x315101F3,
+               0x1D90, 0x315201F2,
+               0x1D90, 0x315301F1,
+               0x1D90, 0x315401F0,
+               0x1D90, 0x315501EF,
+               0x1D90, 0x315601EE,
+               0x1D90, 0x315701ED,
+               0x1D90, 0x315801EC,
+               0x1D90, 0x315901EB,
+               0x1D90, 0x315A01EA,
+               0x1D90, 0x315B01E9,
+               0x1D90, 0x315C01E7,
+               0x1D90, 0x315D01E6,
+               0x1D90, 0x315E01E5,
+               0x1D90, 0x315F01E4,
+               0x1D90, 0x316001A8,
+               0x1D90, 0x316101A7,
+               0x1D90, 0x316201A6,
+               0x1D90, 0x316301A5,
+               0x1D90, 0x31640185,
+               0x1D90, 0x31650184,
+               0x1D90, 0x31660183,
+               0x1D90, 0x31670182,
+               0x1D90, 0x31680149,
+               0x1D90, 0x31690148,
+               0x1D90, 0x316A0147,
+               0x1D90, 0x316B0145,
+               0x1D90, 0x316C0144,
+               0x1D90, 0x316D0143,
+               0x1D90, 0x316E0142,
+               0x1D90, 0x316F00E6,
+               0x1D90, 0x317000E5,
+               0x1D90, 0x317100C9,
+               0x1D90, 0x317200C8,
+               0x1D90, 0x317300C7,
+               0x1D90, 0x317400C6,
+               0x1D90, 0x317500C5,
+               0x1D90, 0x317600C4,
+               0x1D90, 0x317700C3,
+               0x1D90, 0x31780088,
+               0x1D90, 0x31790087,
+               0x1D90, 0x317A0086,
+               0x1D90, 0x317B0085,
+               0x1D90, 0x317C0026,
+               0x1D90, 0x317D0025,
+               0x1D90, 0x317E0024,
+               0x1D90, 0x317F0023,
        0x90000016,     0x00000000,     0x40000000,     0x00000000,
                0x1D90, 0x314001FF,
                0x1D90, 0x314101FF,
@@ -1065,64 +1455,64 @@ static const u32 rtw8822c_agc[] = {
                0x1D90, 0x314301FF,
                0x1D90, 0x314401FF,
                0x1D90, 0x314501FF,
-               0x1D90, 0x314601FF,
-               0x1D90, 0x314701FE,
-               0x1D90, 0x314801FD,
-               0x1D90, 0x314901FC,
-               0x1D90, 0x314A01FB,
-               0x1D90, 0x314B01FA,
-               0x1D90, 0x314C01F9,
-               0x1D90, 0x314D01F8,
-               0x1D90, 0x314E01F7,
-               0x1D90, 0x314F01F6,
-               0x1D90, 0x315001F5,
-               0x1D90, 0x315101F4,
-               0x1D90, 0x315201F3,
-               0x1D90, 0x315301F2,
-               0x1D90, 0x315401F1,
-               0x1D90, 0x315501F0,
-               0x1D90, 0x315601EF,
-               0x1D90, 0x315701EE,
-               0x1D90, 0x315801ED,
-               0x1D90, 0x315901EC,
-               0x1D90, 0x315A01EB,
-               0x1D90, 0x315B01EA,
-               0x1D90, 0x315C01E9,
-               0x1D90, 0x315D018F,
-               0x1D90, 0x315E018E,
-               0x1D90, 0x315F018D,
-               0x1D90, 0x3160018C,
-               0x1D90, 0x3161018B,
-               0x1D90, 0x3162018A,
-               0x1D90, 0x31630189,
-               0x1D90, 0x31640188,
-               0x1D90, 0x31650187,
-               0x1D90, 0x31660186,
-               0x1D90, 0x31670185,
-               0x1D90, 0x31680184,
-               0x1D90, 0x31690183,
-               0x1D90, 0x316A0182,
-               0x1D90, 0x316B0149,
-               0x1D90, 0x316C0148,
-               0x1D90, 0x316D0147,
-               0x1D90, 0x316E0146,
-               0x1D90, 0x316F0145,
-               0x1D90, 0x31700144,
-               0x1D90, 0x31710143,
-               0x1D90, 0x31720142,
-               0x1D90, 0x31730141,
-               0x1D90, 0x31740140,
-               0x1D90, 0x317500C7,
-               0x1D90, 0x317600C6,
-               0x1D90, 0x317700C5,
-               0x1D90, 0x317800C4,
-               0x1D90, 0x317900C3,
-               0x1D90, 0x317A0088,
-               0x1D90, 0x317B0087,
-               0x1D90, 0x317C0086,
-               0x1D90, 0x317D0045,
-               0x1D90, 0x317E0044,
-               0x1D90, 0x317F0043,
+               0x1D90, 0x314601FE,
+               0x1D90, 0x314701FD,
+               0x1D90, 0x314801FC,
+               0x1D90, 0x314901FB,
+               0x1D90, 0x314A01FA,
+               0x1D90, 0x314B01F9,
+               0x1D90, 0x314C01F8,
+               0x1D90, 0x314D01F7,
+               0x1D90, 0x314E01F6,
+               0x1D90, 0x314F01F5,
+               0x1D90, 0x315001F4,
+               0x1D90, 0x315101F3,
+               0x1D90, 0x315201F2,
+               0x1D90, 0x315301F1,
+               0x1D90, 0x315401F0,
+               0x1D90, 0x315501EF,
+               0x1D90, 0x315601EE,
+               0x1D90, 0x315701ED,
+               0x1D90, 0x315801EC,
+               0x1D90, 0x315901EB,
+               0x1D90, 0x315A01EA,
+               0x1D90, 0x315B01E9,
+               0x1D90, 0x315C01E7,
+               0x1D90, 0x315D01E6,
+               0x1D90, 0x315E01E5,
+               0x1D90, 0x315F01E4,
+               0x1D90, 0x316001A8,
+               0x1D90, 0x316101A7,
+               0x1D90, 0x316201A6,
+               0x1D90, 0x316301A5,
+               0x1D90, 0x31640185,
+               0x1D90, 0x31650184,
+               0x1D90, 0x31660183,
+               0x1D90, 0x31670182,
+               0x1D90, 0x31680149,
+               0x1D90, 0x31690148,
+               0x1D90, 0x316A0147,
+               0x1D90, 0x316B0145,
+               0x1D90, 0x316C0144,
+               0x1D90, 0x316D0143,
+               0x1D90, 0x316E0142,
+               0x1D90, 0x316F00E6,
+               0x1D90, 0x317000E5,
+               0x1D90, 0x317100C9,
+               0x1D90, 0x317200C8,
+               0x1D90, 0x317300C7,
+               0x1D90, 0x317400C6,
+               0x1D90, 0x317500C5,
+               0x1D90, 0x317600C4,
+               0x1D90, 0x317700C3,
+               0x1D90, 0x31780088,
+               0x1D90, 0x31790087,
+               0x1D90, 0x317A0086,
+               0x1D90, 0x317B0085,
+               0x1D90, 0x317C0026,
+               0x1D90, 0x317D0025,
+               0x1D90, 0x317E0024,
+               0x1D90, 0x317F0023,
        0xA0000000,     0x00000000,
                0x1D90, 0x314001FF,
                0x1D90, 0x314101FF,
@@ -1130,66 +1520,131 @@ static const u32 rtw8822c_agc[] = {
                0x1D90, 0x314301FF,
                0x1D90, 0x314401FF,
                0x1D90, 0x314501FF,
-               0x1D90, 0x314601FF,
-               0x1D90, 0x314701FE,
-               0x1D90, 0x314801FD,
-               0x1D90, 0x314901FC,
-               0x1D90, 0x314A01FB,
-               0x1D90, 0x314B01FA,
-               0x1D90, 0x314C01F9,
-               0x1D90, 0x314D01F8,
-               0x1D90, 0x314E01F7,
-               0x1D90, 0x314F01F6,
-               0x1D90, 0x315001F5,
-               0x1D90, 0x315101F4,
-               0x1D90, 0x315201F3,
-               0x1D90, 0x315301F2,
-               0x1D90, 0x315401F1,
-               0x1D90, 0x315501F0,
-               0x1D90, 0x315601EF,
-               0x1D90, 0x315701EE,
-               0x1D90, 0x315801ED,
-               0x1D90, 0x315901EC,
-               0x1D90, 0x315A01EB,
-               0x1D90, 0x315B01EA,
-               0x1D90, 0x315C01E9,
-               0x1D90, 0x315D018F,
-               0x1D90, 0x315E018E,
-               0x1D90, 0x315F018D,
-               0x1D90, 0x3160018C,
-               0x1D90, 0x3161018B,
-               0x1D90, 0x3162018A,
-               0x1D90, 0x31630189,
-               0x1D90, 0x31640188,
-               0x1D90, 0x31650187,
-               0x1D90, 0x31660186,
-               0x1D90, 0x31670185,
-               0x1D90, 0x31680184,
-               0x1D90, 0x31690183,
-               0x1D90, 0x316A0182,
-               0x1D90, 0x316B0149,
-               0x1D90, 0x316C0148,
-               0x1D90, 0x316D0147,
-               0x1D90, 0x316E0146,
-               0x1D90, 0x316F0145,
-               0x1D90, 0x31700144,
-               0x1D90, 0x31710143,
-               0x1D90, 0x31720142,
-               0x1D90, 0x31730141,
-               0x1D90, 0x31740140,
-               0x1D90, 0x317500C7,
-               0x1D90, 0x317600C6,
-               0x1D90, 0x317700C5,
-               0x1D90, 0x317800C4,
-               0x1D90, 0x317900C3,
-               0x1D90, 0x317A0088,
-               0x1D90, 0x317B0087,
-               0x1D90, 0x317C0086,
-               0x1D90, 0x317D0045,
-               0x1D90, 0x317E0044,
-               0x1D90, 0x317F0043,
+               0x1D90, 0x314601FE,
+               0x1D90, 0x314701FD,
+               0x1D90, 0x314801FC,
+               0x1D90, 0x314901FB,
+               0x1D90, 0x314A01FA,
+               0x1D90, 0x314B01F9,
+               0x1D90, 0x314C01F8,
+               0x1D90, 0x314D01F7,
+               0x1D90, 0x314E01F6,
+               0x1D90, 0x314F01F5,
+               0x1D90, 0x315001F4,
+               0x1D90, 0x315101F3,
+               0x1D90, 0x315201F2,
+               0x1D90, 0x315301F1,
+               0x1D90, 0x315401F0,
+               0x1D90, 0x315501EF,
+               0x1D90, 0x315601EE,
+               0x1D90, 0x315701ED,
+               0x1D90, 0x315801EC,
+               0x1D90, 0x315901EB,
+               0x1D90, 0x315A01EA,
+               0x1D90, 0x315B01E9,
+               0x1D90, 0x315C01E7,
+               0x1D90, 0x315D01E6,
+               0x1D90, 0x315E01E5,
+               0x1D90, 0x315F01E4,
+               0x1D90, 0x316001A8,
+               0x1D90, 0x316101A7,
+               0x1D90, 0x316201A6,
+               0x1D90, 0x316301A5,
+               0x1D90, 0x31640185,
+               0x1D90, 0x31650184,
+               0x1D90, 0x31660183,
+               0x1D90, 0x31670182,
+               0x1D90, 0x31680149,
+               0x1D90, 0x31690148,
+               0x1D90, 0x316A0147,
+               0x1D90, 0x316B0145,
+               0x1D90, 0x316C0144,
+               0x1D90, 0x316D0143,
+               0x1D90, 0x316E0142,
+               0x1D90, 0x316F00E6,
+               0x1D90, 0x317000E5,
+               0x1D90, 0x317100C9,
+               0x1D90, 0x317200C8,
+               0x1D90, 0x317300C7,
+               0x1D90, 0x317400C6,
+               0x1D90, 0x317500C5,
+               0x1D90, 0x317600C4,
+               0x1D90, 0x317700C3,
+               0x1D90, 0x31780088,
+               0x1D90, 0x31790087,
+               0x1D90, 0x317A0086,
+               0x1D90, 0x317B0085,
+               0x1D90, 0x317C0026,
+               0x1D90, 0x317D0025,
+               0x1D90, 0x317E0024,
+               0x1D90, 0x317F0023,
        0xB0000000,     0x00000000,
-       0x80000015,     0x00000000,     0x40000000,     0x00000000,
+       0x83000000,     0x00000000,     0x40000000,     0x00000000,
+               0x1D90, 0x318001FE,
+               0x1D90, 0x318101FD,
+               0x1D90, 0x318201FC,
+               0x1D90, 0x318301FB,
+               0x1D90, 0x318401FA,
+               0x1D90, 0x318501F9,
+               0x1D90, 0x318601F8,
+               0x1D90, 0x318701F7,
+               0x1D90, 0x318801F6,
+               0x1D90, 0x318901F5,
+               0x1D90, 0x318A01F4,
+               0x1D90, 0x318B01F3,
+               0x1D90, 0x318C01F2,
+               0x1D90, 0x318D01F1,
+               0x1D90, 0x318E01F0,
+               0x1D90, 0x318F01EF,
+               0x1D90, 0x319001EE,
+               0x1D90, 0x319101ED,
+               0x1D90, 0x319201EC,
+               0x1D90, 0x319301EB,
+               0x1D90, 0x319401EA,
+               0x1D90, 0x319501E9,
+               0x1D90, 0x319601E7,
+               0x1D90, 0x319701E6,
+               0x1D90, 0x319801E5,
+               0x1D90, 0x319901E4,
+               0x1D90, 0x319A01A8,
+               0x1D90, 0x319B01A7,
+               0x1D90, 0x319C01A6,
+               0x1D90, 0x319D01A5,
+               0x1D90, 0x319E0185,
+               0x1D90, 0x319F0184,
+               0x1D90, 0x31A00183,
+               0x1D90, 0x31A10182,
+               0x1D90, 0x31A20149,
+               0x1D90, 0x31A30148,
+               0x1D90, 0x31A40147,
+               0x1D90, 0x31A50145,
+               0x1D90, 0x31A60144,
+               0x1D90, 0x31A70143,
+               0x1D90, 0x31A80142,
+               0x1D90, 0x31A900E6,
+               0x1D90, 0x31AA00E5,
+               0x1D90, 0x31AB00C9,
+               0x1D90, 0x31AC00C8,
+               0x1D90, 0x31AD00C7,
+               0x1D90, 0x31AE00C6,
+               0x1D90, 0x31AF00C5,
+               0x1D90, 0x31B000C4,
+               0x1D90, 0x31B100C3,
+               0x1D90, 0x31B20088,
+               0x1D90, 0x31B30087,
+               0x1D90, 0x31B40086,
+               0x1D90, 0x31B50085,
+               0x1D90, 0x31B60026,
+               0x1D90, 0x31B70025,
+               0x1D90, 0x31B80024,
+               0x1D90, 0x31B90023,
+               0x1D90, 0x31BA0022,
+               0x1D90, 0x31BB0021,
+               0x1D90, 0x31BC0020,
+               0x1D90, 0x31BD0003,
+               0x1D90, 0x31BE0002,
+               0x1D90, 0x31BF0001,
+       0x90000015,     0x00000000,     0x40000000,     0x00000000,
                0x1D90, 0x318001FE,
                0x1D90, 0x318101FD,
                0x1D90, 0x318201FC,
@@ -1385,7 +1840,10 @@ static const u32 rtw8822c_agc[] = {
                0x1D90, 0x31BE0002,
                0x1D90, 0x31BF0001,
        0xB0000000,     0x00000000,
-       0x80000015,     0x00000000,     0x40000000,     0x00000000,
+       0x83000000,     0x00000000,     0x40000000,     0x00000000,
+               0x1D70, 0x22222222,
+               0x1D70, 0x20202020,
+       0x90000015,     0x00000000,     0x40000000,     0x00000000,
                0x1D70, 0x22222222,
                0x1D70, 0x20202020,
        0x90000016,     0x00000000,     0x40000000,     0x00000000,
@@ -1793,7 +2251,9 @@ static const u32 rtw8822c_bb[] = {
                0x1828, 0x000004FD,
                0x182C, 0x00000000,
                0x1834, 0x00000000,
-       0x83000015,     0x00000000,     0x40000000,     0x00000000,
+       0x83000000,     0x00000000,     0x40000000,     0x00000000,
+               0x1838, 0x20000000,
+       0x93000015,     0x00000000,     0x40000000,     0x00000000,
                0x1838, 0x20100000,
        0x93000016,     0x00000000,     0x40000000,     0x00000000,
                0x1838, 0x20100000,
@@ -1801,11 +2261,17 @@ static const u32 rtw8822c_bb[] = {
                0x1838, 0x20100000,
        0x94000016,     0x00000000,     0x40000000,     0x00000000,
                0x1838, 0x20100000,
+       0x95000015,     0x00000000,     0x40000000,     0x00000000,
+               0x1838, 0x20100000,
+       0x95000016,     0x00000000,     0x40000000,     0x00000000,
+               0x1838, 0x20100000,
        0xA0000000,     0x00000000,
                0x1838, 0x20000000,
        0xB0000000,     0x00000000,
                0x183C, 0x00000000,
-       0x83000015,     0x00000000,     0x40000000,     0x00000000,
+       0x83000000,     0x00000000,     0x40000000,     0x00000000,
+               0x1840, 0x00000000,
+       0x93000015,     0x00000000,     0x40000000,     0x00000000,
                0x1840, 0x00002300,
        0x93000016,     0x00000000,     0x40000000,     0x00000000,
                0x1840, 0x00002300,
@@ -1813,6 +2279,10 @@ static const u32 rtw8822c_bb[] = {
                0x1840, 0x00002300,
        0x94000016,     0x00000000,     0x40000000,     0x00000000,
                0x1840, 0x00002300,
+       0x95000015,     0x00000000,     0x40000000,     0x00000000,
+               0x1840, 0x00002300,
+       0x95000016,     0x00000000,     0x40000000,     0x00000000,
+               0x1840, 0x00002300,
        0xA0000000,     0x00000000,
                0x1840, 0x00000000,
        0xB0000000,     0x00000000,
@@ -1826,7 +2296,9 @@ static const u32 rtw8822c_bb[] = {
                0x1860, 0xF0040FF8,
                0x1864, 0x7F000000,
                0x1868, 0x00000000,
-       0x83000015,     0x00000000,     0x40000000,     0x00000000,
+       0x83000000,     0x00000000,     0x40000000,     0x00000000,
+               0x186C, 0x0000FF00,
+       0x93000015,     0x00000000,     0x40000000,     0x00000000,
                0x186C, 0x0000FF02,
        0x93000016,     0x00000000,     0x40000000,     0x00000000,
                0x186C, 0x0000FF02,
@@ -1834,6 +2306,10 @@ static const u32 rtw8822c_bb[] = {
                0x186C, 0x0000FF02,
        0x94000016,     0x00000000,     0x40000000,     0x00000000,
                0x186C, 0x0000FF02,
+       0x95000015,     0x00000000,     0x40000000,     0x00000000,
+               0x186C, 0x0000FF02,
+       0x95000016,     0x00000000,     0x40000000,     0x00000000,
+               0x186C, 0x0000FF02,
        0xA0000000,     0x00000000,
                0x186C, 0x0000FF00,
        0xB0000000,     0x00000000,
@@ -1842,7 +2318,9 @@ static const u32 rtw8822c_bb[] = {
                0x1878, 0x00000000,
                0x187C, 0x00000000,
                0x1880, 0x00000000,
-       0x83000015,     0x00000000,     0x40000000,     0x00000000,
+       0x83000000,     0x00000000,     0x40000000,     0x00000000,
+               0x1884, 0x02B00000,
+       0x93000015,     0x00000000,     0x40000000,     0x00000000,
                0x1884, 0x03B00000,
        0x93000016,     0x00000000,     0x40000000,     0x00000000,
                0x1884, 0x03B00000,
@@ -1850,6 +2328,10 @@ static const u32 rtw8822c_bb[] = {
                0x1884, 0x03B00000,
        0x94000016,     0x00000000,     0x40000000,     0x00000000,
                0x1884, 0x03B00000,
+       0x95000015,     0x00000000,     0x40000000,     0x00000000,
+               0x1884, 0x03B00000,
+       0x95000016,     0x00000000,     0x40000000,     0x00000000,
+               0x1884, 0x03B00000,
        0xA0000000,     0x00000000,
                0x1884, 0x02B00000,
        0xB0000000,     0x00000000,
@@ -1982,7 +2464,10 @@ static const u32 rtw8822c_bb[] = {
                0x1C84, 0x245120D4,
                0x1C88, 0xC8400483,
                0x1C8C, 0x40005A20,
-       0x83000015,     0x00000000,     0x40000000,     0x00000000,
+       0x83000000,     0x00000000,     0x40000000,     0x00000000,
+               0x1C94, 0x00000000,
+               0x1C98, 0x00000000,
+       0x93000015,     0x00000000,     0x40000000,     0x00000000,
                0x1C94, 0x00000B0E,
                0x1C98, 0x00450000,
        0x93000016,     0x00000000,     0x40000000,     0x00000000,
@@ -1994,6 +2479,12 @@ static const u32 rtw8822c_bb[] = {
        0x94000016,     0x00000000,     0x40000000,     0x00000000,
                0x1C94, 0x00000B0E,
                0x1C98, 0x00450000,
+       0x95000015,     0x00000000,     0x40000000,     0x00000000,
+               0x1C94, 0x00000B0E,
+               0x1C98, 0x00450000,
+       0x95000016,     0x00000000,     0x40000000,     0x00000000,
+               0x1C94, 0x00000B0E,
+               0x1C98, 0x00450000,
        0xA0000000,     0x00000000,
                0x1C94, 0x00000000,
                0x1C98, 0x00000000,
@@ -2330,7 +2821,9 @@ static const u32 rtw8822c_bb[] = {
                0x4128, 0x000004FD,
                0x412C, 0x00000000,
                0x4134, 0x00000000,
-       0x83000015,     0x00000000,     0x40000000,     0x00000000,
+       0x83000000,     0x00000000,     0x40000000,     0x00000000,
+               0x4138, 0x20000000,
+       0x93000015,     0x00000000,     0x40000000,     0x00000000,
                0x4138, 0x20100000,
        0x93000016,     0x00000000,     0x40000000,     0x00000000,
                0x4138, 0x20100000,
@@ -2338,12 +2831,18 @@ static const u32 rtw8822c_bb[] = {
                0x4138, 0x20100000,
        0x94000016,     0x00000000,     0x40000000,     0x00000000,
                0x4138, 0x20100000,
+       0x95000015,     0x00000000,     0x40000000,     0x00000000,
+               0x4138, 0x20100000,
+       0x95000016,     0x00000000,     0x40000000,     0x00000000,
+               0x4138, 0x20100000,
        0xA0000000,     0x00000000,
                0x4138, 0x20000000,
        0xB0000000,     0x00000000,
                0x413C, 0x00000000,
                0x4140, 0x00000000,
-       0x83000015,     0x00000000,     0x40000000,     0x00000000,
+       0x83000000,     0x00000000,     0x40000000,     0x00000000,
+               0x4144, 0x00000000,
+       0x93000015,     0x00000000,     0x40000000,     0x00000000,
                0x4144, 0x00002030,
        0x93000016,     0x00000000,     0x40000000,     0x00000000,
                0x4144, 0x00002030,
@@ -2351,6 +2850,10 @@ static const u32 rtw8822c_bb[] = {
                0x4144, 0x00002030,
        0x94000016,     0x00000000,     0x40000000,     0x00000000,
                0x4144, 0x00002030,
+       0x95000015,     0x00000000,     0x40000000,     0x00000000,
+               0x4144, 0x00002030,
+       0x95000016,     0x00000000,     0x40000000,     0x00000000,
+               0x4144, 0x00002030,
        0xA0000000,     0x00000000,
                0x4144, 0x00000000,
        0xB0000000,     0x00000000,
@@ -2363,7 +2866,9 @@ static const u32 rtw8822c_bb[] = {
                0x4160, 0xF0040FF8,
                0x4164, 0x7F000000,
                0x4168, 0x00000000,
-       0x83000015,     0x00000000,     0x40000000,     0x00000000,
+       0x83000000,     0x00000000,     0x40000000,     0x00000000,
+               0x416C, 0x00008000,
+       0x93000015,     0x00000000,     0x40000000,     0x00000000,
                0x416C, 0x00008002,
        0x93000016,     0x00000000,     0x40000000,     0x00000000,
                0x416C, 0x00008002,
@@ -2371,6 +2876,10 @@ static const u32 rtw8822c_bb[] = {
                0x416C, 0x00008002,
        0x94000016,     0x00000000,     0x40000000,     0x00000000,
                0x416C, 0x00008002,
+       0x95000015,     0x00000000,     0x40000000,     0x00000000,
+               0x416C, 0x00008002,
+       0x95000016,     0x00000000,     0x40000000,     0x00000000,
+               0x416C, 0x00008002,
        0xA0000000,     0x00000000,
                0x416C, 0x00008000,
        0xB0000000,     0x00000000,
@@ -2379,7 +2888,9 @@ static const u32 rtw8822c_bb[] = {
                0x4178, 0x00000000,
                0x417C, 0x00000000,
                0x4180, 0x00000000,
-       0x83000015,     0x00000000,     0x40000000,     0x00000000,
+       0x83000000,     0x00000000,     0x40000000,     0x00000000,
+               0x4184, 0x02B00000,
+       0x93000015,     0x00000000,     0x40000000,     0x00000000,
                0x4184, 0x03B00000,
        0x93000016,     0x00000000,     0x40000000,     0x00000000,
                0x4184, 0x03B00000,
@@ -2387,6 +2898,10 @@ static const u32 rtw8822c_bb[] = {
                0x4184, 0x03B00000,
        0x94000016,     0x00000000,     0x40000000,     0x00000000,
                0x4184, 0x03B00000,
+       0x95000015,     0x00000000,     0x40000000,     0x00000000,
+               0x4184, 0x03B00000,
+       0x95000016,     0x00000000,     0x40000000,     0x00000000,
+               0x4184, 0x03B00000,
        0xA0000000,     0x00000000,
                0x4184, 0x02B00000,
        0xB0000000,     0x00000000,