package/kernel/mac80211/patches/rtl/001-v5.12-rtlwifi-8821ae-upgrade-PHY-and-RF-parameters.patch

   1 From 8f392a72419c4b10e84e635e51bee24670975364 Mon Sep 17 00:00:00 2001
   2 From: Ping-Ke Shih <pkshih@realtek.com>
   3 Date: Fri, 19 Feb 2021 13:26:07 +0800
   4 Subject: [PATCH] rtlwifi: 8821ae: upgrade PHY and RF parameters
   5
   6 New parameters with new format and its parser are updated by the
   7 commit 84d26fda52e2 ("rtlwifi: Update 8821ae new phy parameters and its parser."),
   8 but some parameters are missing. Use this commit to update to the novel
   9 parameters that use new format.
  10
  11 Fixes: 84d26fda52e2 ("rtlwifi: Update 8821ae new phy parameters and its parser")
  12 Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
  13 Tested-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
  14 ---
  15  .../realtek/rtlwifi/rtl8821ae/table.c         | 500 +++++++++++++-----
  16  1 file changed, 370 insertions(+), 130 deletions(-)
  17
  18 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.c
  19 +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.c
  20 @@ -249,7 +249,7 @@ u32 RTL8821AE_PHY_REG_ARRAY[] = {
  21         0x824, 0x00030FE0,
  22         0x828, 0x00000000,
  23         0x82C, 0x002081DD,
  24 -       0x830, 0x2AAA8E24,
  25 +       0x830, 0x2AAAEEC8,
  26         0x834, 0x0037A706,
  27         0x838, 0x06489B44,
  28         0x83C, 0x0000095B,
  29 @@ -324,10 +324,10 @@ u32 RTL8821AE_PHY_REG_ARRAY[] = {
  30         0x9D8, 0x00000000,
  31         0x9DC, 0x00000000,
  32         0x9E0, 0x00005D00,
  33 -       0x9E4, 0x00000002,
  34 +       0x9E4, 0x00000003,
  35         0x9E8, 0x00000001,
  36         0xA00, 0x00D047C8,
  37 -       0xA04, 0x01FF000C,
  38 +       0xA04, 0x01FF800C,
  39         0xA08, 0x8C8A8300,
  40         0xA0C, 0x2E68000F,
  41         0xA10, 0x9500BB78,
  42 @@ -1320,7 +1320,11 @@ u32 RTL8821AE_RADIOA_ARRAY[] = {
  43                 0x083, 0x00021800,
  44                 0x084, 0x00028000,
  45                 0x085, 0x00048000,
  46 +       0x80000111,     0x00000000,     0x40000000,     0x00000000,
  47 +               0x086, 0x0009483A,
  48 +       0xA0000000,     0x00000000,
  49                 0x086, 0x00094838,
  50 +       0xB0000000,     0x00000000,
  51                 0x087, 0x00044980,
  52                 0x088, 0x00048000,
  53                 0x089, 0x0000D480,
  54 @@ -1409,36 +1413,32 @@ u32 RTL8821AE_RADIOA_ARRAY[] = {
  55                 0x03C, 0x000CA000,
  56                 0x0EF, 0x00000000,
  57                 0x0EF, 0x00001100,
  58 -       0xFF0F0104, 0xABCD,
  59 +       0x80000111,     0x00000000,     0x40000000,     0x00000000,
  60                 0x034, 0x0004ADF3,
  61                 0x034, 0x00049DF0,
  62 -       0xFF0F0204, 0xCDEF,
  63 +       0x90000110,     0x00000000,     0x40000000,     0x00000000,
  64                 0x034, 0x0004ADF3,
  65                 0x034, 0x00049DF0,
  66 -       0xFF0F0404, 0xCDEF,
  67 -               0x034, 0x0004ADF3,
  68 -               0x034, 0x00049DF0,
  69 -       0xFF0F0200, 0xCDEF,
  70 +       0x90000210,     0x00000000,     0x40000000,     0x00000000,
  71                 0x034, 0x0004ADF5,
  72                 0x034, 0x00049DF2,
  73 -       0xFF0F02C0, 0xCDEF,
  74 +       0x9000020c,     0x00000000,     0x40000000,     0x00000000,
  75 +               0x034, 0x0004A0F3,
  76 +               0x034, 0x000490B1,
  77 +               0x9000040c,     0x00000000,     0x40000000,     0x00000000,
  78                 0x034, 0x0004A0F3,
  79                 0x034, 0x000490B1,
  80 -       0xCDCDCDCD, 0xCDCD,
  81 +       0x90000200,     0x00000000,     0x40000000,     0x00000000,
  82 +               0x034, 0x0004ADF5,
  83 +               0x034, 0x00049DF2,
  84 +       0x90000410,     0x00000000,     0x40000000,     0x00000000,
  85 +               0x034, 0x0004ADF3,
  86 +               0x034, 0x00049DF0,
  87 +       0xA0000000,     0x00000000,
  88                 0x034, 0x0004ADF7,
  89                 0x034, 0x00049DF3,
  90 -       0xFF0F0104, 0xDEAD,
  91 -       0xFF0F0104, 0xABCD,
  92 -               0x034, 0x00048DED,
  93 -               0x034, 0x00047DEA,
  94 -               0x034, 0x00046DE7,
  95 -               0x034, 0x00045CE9,
  96 -               0x034, 0x00044CE6,
  97 -               0x034, 0x000438C6,
  98 -               0x034, 0x00042886,
  99 -               0x034, 0x00041486,
 100 -               0x034, 0x00040447,
 101 -       0xFF0F0204, 0xCDEF,
 102 +       0xB0000000,     0x00000000,
 103 +       0x80000111,     0x00000000,     0x40000000,     0x00000000,
 104                 0x034, 0x00048DED,
 105                 0x034, 0x00047DEA,
 106                 0x034, 0x00046DE7,
 107 @@ -1448,7 +1448,7 @@ u32 RTL8821AE_RADIOA_ARRAY[] = {
 108                 0x034, 0x00042886,
 109                 0x034, 0x00041486,
 110                 0x034, 0x00040447,
 111 -       0xFF0F0404, 0xCDEF,
 112 +       0x90000110,     0x00000000,     0x40000000,     0x00000000,
 113                 0x034, 0x00048DED,
 114                 0x034, 0x00047DEA,
 115                 0x034, 0x00046DE7,
 116 @@ -1458,7 +1458,17 @@ u32 RTL8821AE_RADIOA_ARRAY[] = {
 117                 0x034, 0x00042886,
 118                 0x034, 0x00041486,
 119                 0x034, 0x00040447,
 120 -       0xFF0F02C0, 0xCDEF,
 121 +       0x9000020c,     0x00000000,     0x40000000,     0x00000000,
 122 +               0x034, 0x000480AE,
 123 +               0x034, 0x000470AB,
 124 +               0x034, 0x0004608B,
 125 +               0x034, 0x00045069,
 126 +               0x034, 0x00044048,
 127 +               0x034, 0x00043045,
 128 +               0x034, 0x00042026,
 129 +               0x034, 0x00041023,
 130 +               0x034, 0x00040002,
 131 +       0x9000040c,     0x00000000,     0x40000000,     0x00000000,
 132                 0x034, 0x000480AE,
 133                 0x034, 0x000470AB,
 134                 0x034, 0x0004608B,
 135 @@ -1468,7 +1478,17 @@ u32 RTL8821AE_RADIOA_ARRAY[] = {
 136                 0x034, 0x00042026,
 137                 0x034, 0x00041023,
 138                 0x034, 0x00040002,
 139 -       0xCDCDCDCD, 0xCDCD,
 140 +       0x90000410,     0x00000000,     0x40000000,     0x00000000,
 141 +               0x034, 0x00048DED,
 142 +               0x034, 0x00047DEA,
 143 +               0x034, 0x00046DE7,
 144 +               0x034, 0x00045CE9,
 145 +               0x034, 0x00044CE6,
 146 +               0x034, 0x000438C6,
 147 +               0x034, 0x00042886,
 148 +               0x034, 0x00041486,
 149 +               0x034, 0x00040447,
 150 +       0xA0000000,     0x00000000,
 151                 0x034, 0x00048DEF,
 152                 0x034, 0x00047DEC,
 153                 0x034, 0x00046DE9,
 154 @@ -1478,38 +1498,36 @@ u32 RTL8821AE_RADIOA_ARRAY[] = {
 155                 0x034, 0x0004248A,
 156                 0x034, 0x0004108D,
 157                 0x034, 0x0004008A,
 158 -       0xFF0F0104, 0xDEAD,
 159 -       0xFF0F0200, 0xABCD,
 160 +       0xB0000000,     0x00000000,
 161 +       0x80000210,     0x00000000,     0x40000000,     0x00000000,
 162                 0x034, 0x0002ADF4,
 163 -       0xFF0F02C0, 0xCDEF,
 164 +       0x9000020c,     0x00000000,     0x40000000,     0x00000000,
 165 +               0x034, 0x0002A0F3,
 166 +       0x9000040c,     0x00000000,     0x40000000,     0x00000000,
 167                 0x034, 0x0002A0F3,
 168 -       0xCDCDCDCD, 0xCDCD,
 169 +       0x90000200,     0x00000000,     0x40000000,     0x00000000,
 170 +               0x034, 0x0002ADF4,
 171 +       0xA0000000,     0x00000000,
 172                 0x034, 0x0002ADF7,
 173 -       0xFF0F0200, 0xDEAD,
 174 -       0xFF0F0104, 0xABCD,
 175 -               0x034, 0x00029DF4,
 176 -       0xFF0F0204, 0xCDEF,
 177 +       0xB0000000,     0x00000000,
 178 +       0x80000111,     0x00000000,     0x40000000,     0x00000000,
 179                 0x034, 0x00029DF4,
 180 -       0xFF0F0404, 0xCDEF,
 181 +       0x90000110,     0x00000000,     0x40000000,     0x00000000,
 182                 0x034, 0x00029DF4,
 183 -       0xFF0F0200, 0xCDEF,
 184 +       0x90000210,     0x00000000,     0x40000000,     0x00000000,
 185                 0x034, 0x00029DF1,
 186 -       0xFF0F02C0, 0xCDEF,
 187 +       0x9000020c,     0x00000000,     0x40000000,     0x00000000,
 188 +               0x034, 0x000290F0,
 189 +       0x9000040c,     0x00000000,     0x40000000,     0x00000000,
 190                 0x034, 0x000290F0,
 191 -       0xCDCDCDCD, 0xCDCD,
 192 +       0x90000200,     0x00000000,     0x40000000,     0x00000000,
 193 +               0x034, 0x00029DF1,
 194 +       0x90000410,     0x00000000,     0x40000000,     0x00000000,
 195 +               0x034, 0x00029DF4,
 196 +       0xA0000000,     0x00000000,
 197                 0x034, 0x00029DF2,
 198 -       0xFF0F0104, 0xDEAD,
 199 -       0xFF0F0104, 0xABCD,
 200 -               0x034, 0x00028DF1,
 201 -               0x034, 0x00027DEE,
 202 -               0x034, 0x00026DEB,
 203 -               0x034, 0x00025CEC,
 204 -               0x034, 0x00024CE9,
 205 -               0x034, 0x000238CA,
 206 -               0x034, 0x00022889,
 207 -               0x034, 0x00021489,
 208 -               0x034, 0x0002044A,
 209 -       0xFF0F0204, 0xCDEF,
 210 +       0xB0000000,     0x00000000,
 211 +       0x80000111,     0x00000000,     0x40000000,     0x00000000,
 212                 0x034, 0x00028DF1,
 213                 0x034, 0x00027DEE,
 214                 0x034, 0x00026DEB,
 215 @@ -1519,7 +1537,7 @@ u32 RTL8821AE_RADIOA_ARRAY[] = {
 216                 0x034, 0x00022889,
 217                 0x034, 0x00021489,
 218                 0x034, 0x0002044A,
 219 -       0xFF0F0404, 0xCDEF,
 220 +       0x90000110,     0x00000000,     0x40000000,     0x00000000,
 221                 0x034, 0x00028DF1,
 222                 0x034, 0x00027DEE,
 223                 0x034, 0x00026DEB,
 224 @@ -1529,7 +1547,7 @@ u32 RTL8821AE_RADIOA_ARRAY[] = {
 225                 0x034, 0x00022889,
 226                 0x034, 0x00021489,
 227                 0x034, 0x0002044A,
 228 -       0xFF0F02C0, 0xCDEF,
 229 +       0x9000020c,     0x00000000,     0x40000000,     0x00000000,
 230                 0x034, 0x000280AF,
 231                 0x034, 0x000270AC,
 232                 0x034, 0x0002608B,
 233 @@ -1539,7 +1557,27 @@ u32 RTL8821AE_RADIOA_ARRAY[] = {
 234                 0x034, 0x00022026,
 235                 0x034, 0x00021023,
 236                 0x034, 0x00020002,
 237 -       0xCDCDCDCD, 0xCDCD,
 238 +       0x9000040c,     0x00000000,     0x40000000,     0x00000000,
 239 +               0x034, 0x000280AF,
 240 +               0x034, 0x000270AC,
 241 +               0x034, 0x0002608B,
 242 +               0x034, 0x00025069,
 243 +               0x034, 0x00024048,
 244 +               0x034, 0x00023045,
 245 +               0x034, 0x00022026,
 246 +               0x034, 0x00021023,
 247 +               0x034, 0x00020002,
 248 +       0x90000410,     0x00000000,     0x40000000,     0x00000000,
 249 +               0x034, 0x00028DF1,
 250 +               0x034, 0x00027DEE,
 251 +               0x034, 0x00026DEB,
 252 +               0x034, 0x00025CEC,
 253 +               0x034, 0x00024CE9,
 254 +               0x034, 0x000238CA,
 255 +               0x034, 0x00022889,
 256 +               0x034, 0x00021489,
 257 +               0x034, 0x0002044A,
 258 +       0xA0000000,     0x00000000,
 259                 0x034, 0x00028DEE,
 260                 0x034, 0x00027DEB,
 261                 0x034, 0x00026CCD,
 262 @@ -1549,27 +1587,24 @@ u32 RTL8821AE_RADIOA_ARRAY[] = {
 263                 0x034, 0x00022849,
 264                 0x034, 0x00021449,
 265                 0x034, 0x0002004D,
 266 -       0xFF0F0104, 0xDEAD,
 267 -       0xFF0F02C0, 0xABCD,
 268 +       0xB0000000,     0x00000000,
 269 +       0x8000020c,     0x00000000,     0x40000000,     0x00000000,
 270 +               0x034, 0x0000A0D7,
 271 +               0x034, 0x000090D3,
 272 +               0x034, 0x000080B1,
 273 +               0x034, 0x000070AE,
 274 +       0x9000040c,     0x00000000,     0x40000000,     0x00000000,
 275                 0x034, 0x0000A0D7,
 276                 0x034, 0x000090D3,
 277                 0x034, 0x000080B1,
 278                 0x034, 0x000070AE,
 279 -       0xCDCDCDCD, 0xCDCD,
 280 +       0xA0000000,     0x00000000,
 281                 0x034, 0x0000ADF7,
 282                 0x034, 0x00009DF4,
 283                 0x034, 0x00008DF1,
 284                 0x034, 0x00007DEE,
 285 -       0xFF0F02C0, 0xDEAD,
 286 -       0xFF0F0104, 0xABCD,
 287 -               0x034, 0x00006DEB,
 288 -               0x034, 0x00005CEC,
 289 -               0x034, 0x00004CE9,
 290 -               0x034, 0x000038CA,
 291 -               0x034, 0x00002889,
 292 -               0x034, 0x00001489,
 293 -               0x034, 0x0000044A,
 294 -       0xFF0F0204, 0xCDEF,
 295 +       0xB0000000,     0x00000000,
 296 +       0x80000111,     0x00000000,     0x40000000,     0x00000000,
 297                 0x034, 0x00006DEB,
 298                 0x034, 0x00005CEC,
 299                 0x034, 0x00004CE9,
 300 @@ -1577,7 +1612,7 @@ u32 RTL8821AE_RADIOA_ARRAY[] = {
 301                 0x034, 0x00002889,
 302                 0x034, 0x00001489,
 303                 0x034, 0x0000044A,
 304 -       0xFF0F0404, 0xCDEF,
 305 +       0x90000110,     0x00000000,     0x40000000,     0x00000000,
 306                 0x034, 0x00006DEB,
 307                 0x034, 0x00005CEC,
 308                 0x034, 0x00004CE9,
 309 @@ -1585,7 +1620,7 @@ u32 RTL8821AE_RADIOA_ARRAY[] = {
 310                 0x034, 0x00002889,
 311                 0x034, 0x00001489,
 312                 0x034, 0x0000044A,
 313 -       0xFF0F02C0, 0xCDEF,
 314 +       0x9000020c,     0x00000000,     0x40000000,     0x00000000,
 315                 0x034, 0x0000608D,
 316                 0x034, 0x0000506B,
 317                 0x034, 0x0000404A,
 318 @@ -1593,7 +1628,23 @@ u32 RTL8821AE_RADIOA_ARRAY[] = {
 319                 0x034, 0x00002044,
 320                 0x034, 0x00001025,
 321                 0x034, 0x00000004,
 322 -       0xCDCDCDCD, 0xCDCD,
 323 +       0x9000040c,     0x00000000,     0x40000000,     0x00000000,
 324 +               0x034, 0x0000608D,
 325 +               0x034, 0x0000506B,
 326 +               0x034, 0x0000404A,
 327 +               0x034, 0x00003047,
 328 +               0x034, 0x00002044,
 329 +               0x034, 0x00001025,
 330 +               0x034, 0x00000004,
 331 +       0x90000410,     0x00000000,     0x40000000,     0x00000000,
 332 +               0x034, 0x00006DEB,
 333 +               0x034, 0x00005CEC,
 334 +               0x034, 0x00004CE9,
 335 +               0x034, 0x000038CA,
 336 +               0x034, 0x00002889,
 337 +               0x034, 0x00001489,
 338 +               0x034, 0x0000044A,
 339 +       0xA0000000,     0x00000000,
 340                 0x034, 0x00006DCD,
 341                 0x034, 0x00005CCD,
 342                 0x034, 0x00004CCA,
 343 @@ -1601,11 +1652,11 @@ u32 RTL8821AE_RADIOA_ARRAY[] = {
 344                 0x034, 0x00002888,
 345                 0x034, 0x00001488,
 346                 0x034, 0x00000486,
 347 -       0xFF0F0104, 0xDEAD,
 348 +       0xB0000000,     0x00000000,
 349                 0x0EF, 0x00000000,
 350                 0x018, 0x0001712A,
 351                 0x0EF, 0x00000040,
 352 -       0xFF0F0104, 0xABCD,
 353 +       0x80000111,     0x00000000,     0x40000000,     0x00000000,
 354                 0x035, 0x00000187,
 355                 0x035, 0x00008187,
 356                 0x035, 0x00010187,
 357 @@ -1615,7 +1666,7 @@ u32 RTL8821AE_RADIOA_ARRAY[] = {
 358                 0x035, 0x00040188,
 359                 0x035, 0x00048188,
 360                 0x035, 0x00050188,
 361 -       0xFF0F0204, 0xCDEF,
 362 +       0x90000110,     0x00000000,     0x40000000,     0x00000000,
 363                 0x035, 0x00000187,
 364                 0x035, 0x00008187,
 365                 0x035, 0x00010187,
 366 @@ -1625,7 +1676,37 @@ u32 RTL8821AE_RADIOA_ARRAY[] = {
 367                 0x035, 0x00040188,
 368                 0x035, 0x00048188,
 369                 0x035, 0x00050188,
 370 -       0xFF0F0404, 0xCDEF,
 371 +       0x90000210,     0x00000000,     0x40000000,     0x00000000,
 372 +               0x035, 0x00000128,
 373 +               0x035, 0x00008128,
 374 +               0x035, 0x00010128,
 375 +               0x035, 0x000201C8,
 376 +               0x035, 0x000281C8,
 377 +               0x035, 0x000301C8,
 378 +               0x035, 0x000401C8,
 379 +               0x035, 0x000481C8,
 380 +               0x035, 0x000501C8,
 381 +       0x9000040c,     0x00000000,     0x40000000,     0x00000000,
 382 +               0x035, 0x00000145,
 383 +               0x035, 0x00008145,
 384 +               0x035, 0x00010145,
 385 +               0x035, 0x00020196,
 386 +               0x035, 0x00028196,
 387 +               0x035, 0x00030196,
 388 +               0x035, 0x000401C7,
 389 +               0x035, 0x000481C7,
 390 +               0x035, 0x000501C7,
 391 +       0x90000200,     0x00000000,     0x40000000,     0x00000000,
 392 +               0x035, 0x00000128,
 393 +               0x035, 0x00008128,
 394 +               0x035, 0x00010128,
 395 +               0x035, 0x000201C8,
 396 +               0x035, 0x000281C8,
 397 +               0x035, 0x000301C8,
 398 +               0x035, 0x000401C8,
 399 +               0x035, 0x000481C8,
 400 +               0x035, 0x000501C8,
 401 +       0x90000410,     0x00000000,     0x40000000,     0x00000000,
 402                 0x035, 0x00000187,
 403                 0x035, 0x00008187,
 404                 0x035, 0x00010187,
 405 @@ -1635,7 +1716,7 @@ u32 RTL8821AE_RADIOA_ARRAY[] = {
 406                 0x035, 0x00040188,
 407                 0x035, 0x00048188,
 408                 0x035, 0x00050188,
 409 -       0xCDCDCDCD, 0xCDCD,
 410 +       0xA0000000,     0x00000000,
 411                 0x035, 0x00000145,
 412                 0x035, 0x00008145,
 413                 0x035, 0x00010145,
 414 @@ -1645,11 +1726,11 @@ u32 RTL8821AE_RADIOA_ARRAY[] = {
 415                 0x035, 0x000401C7,
 416                 0x035, 0x000481C7,
 417                 0x035, 0x000501C7,
 418 -       0xFF0F0104, 0xDEAD,
 419 +       0xB0000000,     0x00000000,
 420                 0x0EF, 0x00000000,
 421                 0x018, 0x0001712A,
 422                 0x0EF, 0x00000010,
 423 -       0xFF0F0104, 0xABCD,
 424 +       0x80000111,     0x00000000,     0x40000000,     0x00000000,
 425                 0x036, 0x00085733,
 426                 0x036, 0x0008D733,
 427                 0x036, 0x00095733,
 428 @@ -1662,7 +1743,7 @@ u32 RTL8821AE_RADIOA_ARRAY[] = {
 429                 0x036, 0x000CE4B4,
 430                 0x036, 0x000D64B4,
 431                 0x036, 0x000DE4B4,
 432 -       0xFF0F0204, 0xCDEF,
 433 +       0x90000110,     0x00000000,     0x40000000,     0x00000000,
 434                 0x036, 0x00085733,
 435                 0x036, 0x0008D733,
 436                 0x036, 0x00095733,
 437 @@ -1675,7 +1756,46 @@ u32 RTL8821AE_RADIOA_ARRAY[] = {
 438                 0x036, 0x000CE4B4,
 439                 0x036, 0x000D64B4,
 440                 0x036, 0x000DE4B4,
 441 -       0xFF0F0404, 0xCDEF,
 442 +       0x90000210,     0x00000000,     0x40000000,     0x00000000,
 443 +               0x036, 0x000063B5,
 444 +               0x036, 0x0000E3B5,
 445 +               0x036, 0x000163B5,
 446 +               0x036, 0x0001E3B5,
 447 +               0x036, 0x000263B5,
 448 +               0x036, 0x0002E3B5,
 449 +               0x036, 0x000363B5,
 450 +               0x036, 0x0003E3B5,
 451 +               0x036, 0x000463B5,
 452 +               0x036, 0x0004E3B5,
 453 +               0x036, 0x000563B5,
 454 +               0x036, 0x0005E3B5,
 455 +       0x9000040c,     0x00000000,     0x40000000,     0x00000000,
 456 +               0x036, 0x000056B3,
 457 +               0x036, 0x0000D6B3,
 458 +               0x036, 0x000156B3,
 459 +               0x036, 0x0001D6B3,
 460 +               0x036, 0x00026634,
 461 +               0x036, 0x0002E634,
 462 +               0x036, 0x00036634,
 463 +               0x036, 0x0003E634,
 464 +               0x036, 0x000467B4,
 465 +               0x036, 0x0004E7B4,
 466 +               0x036, 0x000567B4,
 467 +               0x036, 0x0005E7B4,
 468 +       0x90000200,     0x00000000,     0x40000000,     0x00000000,
 469 +               0x036, 0x000063B5,
 470 +               0x036, 0x0000E3B5,
 471 +               0x036, 0x000163B5,
 472 +               0x036, 0x0001E3B5,
 473 +               0x036, 0x000263B5,
 474 +               0x036, 0x0002E3B5,
 475 +               0x036, 0x000363B5,
 476 +               0x036, 0x0003E3B5,
 477 +               0x036, 0x000463B5,
 478 +               0x036, 0x0004E3B5,
 479 +               0x036, 0x000563B5,
 480 +               0x036, 0x0005E3B5,
 481 +       0x90000410,     0x00000000,     0x40000000,     0x00000000,
 482                 0x036, 0x00085733,
 483                 0x036, 0x0008D733,
 484                 0x036, 0x00095733,
 485 @@ -1688,7 +1808,7 @@ u32 RTL8821AE_RADIOA_ARRAY[] = {
 486                 0x036, 0x000CE4B4,
 487                 0x036, 0x000D64B4,
 488                 0x036, 0x000DE4B4,
 489 -       0xCDCDCDCD, 0xCDCD,
 490 +       0xA0000000,     0x00000000,
 491                 0x036, 0x000056B3,
 492                 0x036, 0x0000D6B3,
 493                 0x036, 0x000156B3,
 494 @@ -1701,103 +1821,162 @@ u32 RTL8821AE_RADIOA_ARRAY[] = {
 495                 0x036, 0x0004E7B4,
 496                 0x036, 0x000567B4,
 497                 0x036, 0x0005E7B4,
 498 -       0xFF0F0104, 0xDEAD,
 499 +       0xB0000000,     0x00000000,
 500                 0x0EF, 0x00000000,
 501                 0x0EF, 0x00000008,
 502 -       0xFF0F0104, 0xABCD,
 503 +       0x80000111,     0x00000000,     0x40000000,     0x00000000,
 504                 0x03C, 0x000001C8,
 505                 0x03C, 0x00000492,
 506 -       0xFF0F0204, 0xCDEF,
 507 +       0x90000110,     0x00000000,     0x40000000,     0x00000000,
 508                 0x03C, 0x000001C8,
 509                 0x03C, 0x00000492,
 510 -       0xFF0F0404, 0xCDEF,
 511 +       0x90000210,     0x00000000,     0x40000000,     0x00000000,
 512 +               0x03C, 0x000001B6,
 513 +               0x03C, 0x00000492,
 514 +       0x9000040c,     0x00000000,     0x40000000,     0x00000000,
 515 +               0x03C, 0x0000022A,
 516 +               0x03C, 0x00000594,
 517 +       0x90000200,     0x00000000,     0x40000000,     0x00000000,
 518 +               0x03C, 0x000001B6,
 519 +               0x03C, 0x00000492,
 520 +       0x90000410,     0x00000000,     0x40000000,     0x00000000,
 521                 0x03C, 0x000001C8,
 522                 0x03C, 0x00000492,
 523 -       0xCDCDCDCD, 0xCDCD,
 524 +       0xA0000000,     0x00000000,
 525                 0x03C, 0x0000022A,
 526                 0x03C, 0x00000594,
 527 -       0xFF0F0104, 0xDEAD,
 528 -       0xFF0F0104, 0xABCD,
 529 +       0xB0000000,     0x00000000,
 530 +       0x80000111,     0x00000000,     0x40000000,     0x00000000,
 531                 0x03C, 0x00000800,
 532 -       0xFF0F0204, 0xCDEF,
 533 +       0x90000110,     0x00000000,     0x40000000,     0x00000000,
 534                 0x03C, 0x00000800,
 535 -       0xFF0F0404, 0xCDEF,
 536 +       0x90000210,     0x00000000,     0x40000000,     0x00000000,
 537                 0x03C, 0x00000800,
 538 -       0xFF0F02C0, 0xCDEF,
 539 +       0x9000020c,     0x00000000,     0x40000000,     0x00000000,
 540                 0x03C, 0x00000820,
 541 -       0xCDCDCDCD, 0xCDCD,
 542 +       0x9000040c,     0x00000000,     0x40000000,     0x00000000,
 543 +               0x03C, 0x00000820,
 544 +       0x90000200,     0x00000000,     0x40000000,     0x00000000,
 545 +               0x03C, 0x00000800,
 546 +       0x90000410,     0x00000000,     0x40000000,     0x00000000,
 547 +               0x03C, 0x00000800,
 548 +       0xA0000000,     0x00000000,
 549                 0x03C, 0x00000900,
 550 -       0xFF0F0104, 0xDEAD,
 551 +       0xB0000000,     0x00000000,
 552                 0x0EF, 0x00000000,
 553                 0x018, 0x0001712A,
 554                 0x0EF, 0x00000002,
 555 -       0xFF0F0104, 0xABCD,
 556 +       0x80000111,     0x00000000,     0x40000000,     0x00000000,
 557                 0x008, 0x0004E400,
 558 -       0xFF0F0204, 0xCDEF,
 559 +       0x90000110,     0x00000000,     0x40000000,     0x00000000,
 560                 0x008, 0x0004E400,
 561 -       0xFF0F0404, 0xCDEF,
 562 +       0x90000210,     0x00000000,     0x40000000,     0x00000000,
 563 +               0x008, 0x00002000,
 564 +       0x9000020c,     0x00000000,     0x40000000,     0x00000000,
 565 +               0x008, 0x00002000,
 566 +       0x9000040c,     0x00000000,     0x40000000,     0x00000000,
 567 +               0x008, 0x00002000,
 568 +       0x90000200,     0x00000000,     0x40000000,     0x00000000,
 569 +               0x008, 0x00002000,
 570 +       0x90000410,     0x00000000,     0x40000000,     0x00000000,
 571                 0x008, 0x0004E400,
 572 -       0xCDCDCDCD, 0xCDCD,
 573 +       0xA0000000,     0x00000000,
 574                 0x008, 0x00002000,
 575 -       0xFF0F0104, 0xDEAD,
 576 +       0xB0000000,     0x00000000,
 577                 0x0EF, 0x00000000,
 578                 0x0DF, 0x000000C0,
 579 -               0x01F, 0x00040064,
 580 -       0xFF0F0104, 0xABCD,
 581 +               0x01F, 0x00000064,
 582 +       0x80000111,     0x00000000,     0x40000000,     0x00000000,
 583                 0x058, 0x000A7284,
 584                 0x059, 0x000600EC,
 585 -       0xFF0F0204, 0xCDEF,
 586 +       0x90000110,     0x00000000,     0x40000000,     0x00000000,
 587                 0x058, 0x000A7284,
 588                 0x059, 0x000600EC,
 589 -       0xFF0F0404, 0xCDEF,
 590 +       0x9000020c,     0x00000000,     0x40000000,     0x00000000,
 591 +               0x058, 0x00081184,
 592 +               0x059, 0x0006016C,
 593 +       0x9000040c,     0x00000000,     0x40000000,     0x00000000,
 594 +               0x058, 0x00081184,
 595 +               0x059, 0x0006016C,
 596 +       0x90000200,     0x00000000,     0x40000000,     0x00000000,
 597 +               0x058, 0x00081184,
 598 +               0x059, 0x0006016C,
 599 +       0x90000410,     0x00000000,     0x40000000,     0x00000000,
 600                 0x058, 0x000A7284,
 601                 0x059, 0x000600EC,
 602 -       0xCDCDCDCD, 0xCDCD,
 603 +       0xA0000000,     0x00000000,
 604                 0x058, 0x00081184,
 605                 0x059, 0x0006016C,
 606 -       0xFF0F0104, 0xDEAD,
 607 -       0xFF0F0104, 0xABCD,
 608 +       0xB0000000,     0x00000000,
 609 +       0x80000111,     0x00000000,     0x40000000,     0x00000000,
 610                 0x061, 0x000E8D73,
 611                 0x062, 0x00093FC5,
 612 -       0xFF0F0204, 0xCDEF,
 613 +       0x90000110,     0x00000000,     0x40000000,     0x00000000,
 614                 0x061, 0x000E8D73,
 615                 0x062, 0x00093FC5,
 616 -       0xFF0F0404, 0xCDEF,
 617 +       0x90000210,     0x00000000,     0x40000000,     0x00000000,
 618 +               0x061, 0x000EFD83,
 619 +               0x062, 0x00093FCC,
 620 +       0x9000040c,     0x00000000,     0x40000000,     0x00000000,
 621 +               0x061, 0x000EAD53,
 622 +               0x062, 0x00093BC4,
 623 +       0x90000200,     0x00000000,     0x40000000,     0x00000000,
 624 +               0x061, 0x000EFD83,
 625 +               0x062, 0x00093FCC,
 626 +       0x90000410,     0x00000000,     0x40000000,     0x00000000,
 627                 0x061, 0x000E8D73,
 628                 0x062, 0x00093FC5,
 629 -       0xCDCDCDCD, 0xCDCD,
 630 +       0xA0000000,     0x00000000,
 631                 0x061, 0x000EAD53,
 632                 0x062, 0x00093BC4,
 633 -       0xFF0F0104, 0xDEAD,
 634 -       0xFF0F0104, 0xABCD,
 635 +       0xB0000000,     0x00000000,
 636 +       0x80000111,     0x00000000,     0x40000000,     0x00000000,
 637                 0x063, 0x000110E9,
 638 -       0xFF0F0204, 0xCDEF,
 639 +       0x90000110,     0x00000000,     0x40000000,     0x00000000,
 640                 0x063, 0x000110E9,
 641 -       0xFF0F0404, 0xCDEF,
 642 +       0x90000210,     0x00000000,     0x40000000,     0x00000000,
 643 +               0x063, 0x000110EB,
 644 +       0x9000020c,     0x00000000,     0x40000000,     0x00000000,
 645                 0x063, 0x000110E9,
 646 -       0xFF0F0200, 0xCDEF,
 647 -               0x063, 0x000710E9,
 648 -       0xFF0F02C0, 0xCDEF,
 649 +       0x9000040c,     0x00000000,     0x40000000,     0x00000000,
 650                 0x063, 0x000110E9,
 651 -       0xCDCDCDCD, 0xCDCD,
 652 +       0x90000200,     0x00000000,     0x40000000,     0x00000000,
 653 +               0x063, 0x000110EB,
 654 +       0x90000410,     0x00000000,     0x40000000,     0x00000000,
 655 +               0x063, 0x000110E9,
 656 +       0xA0000000,     0x00000000,
 657                 0x063, 0x000714E9,
 658 -       0xFF0F0104, 0xDEAD,
 659 -       0xFF0F0104, 0xABCD,
 660 +       0xB0000000,     0x00000000,
 661 +       0x80000111,     0x00000000,     0x40000000,     0x00000000,
 662 +               0x064, 0x0001C27C,
 663 +       0x90000110,     0x00000000,     0x40000000,     0x00000000,
 664 +               0x064, 0x0001C27C,
 665 +       0x90000210,     0x00000000,     0x40000000,     0x00000000,
 666                 0x064, 0x0001C27C,
 667 -       0xFF0F0204, 0xCDEF,
 668 +       0x9000040c,     0x00000000,     0x40000000,     0x00000000,
 669 +               0x064, 0x0001C67C,
 670 +       0x90000200,     0x00000000,     0x40000000,     0x00000000,
 671                 0x064, 0x0001C27C,
 672 -       0xFF0F0404, 0xCDEF,
 673 +       0x90000410,     0x00000000,     0x40000000,     0x00000000,
 674                 0x064, 0x0001C27C,
 675 -       0xCDCDCDCD, 0xCDCD,
 676 +       0xA0000000,     0x00000000,
 677                 0x064, 0x0001C67C,
 678 -       0xFF0F0104, 0xDEAD,
 679 -       0xFF0F0200, 0xABCD,
 680 +       0xB0000000,     0x00000000,
 681 +       0x80000111,     0x00000000,     0x40000000,     0x00000000,
 682 +               0x065, 0x00091016,
 683 +       0x90000110,     0x00000000,     0x40000000,     0x00000000,
 684 +               0x065, 0x00091016,
 685 +       0x90000210,     0x00000000,     0x40000000,     0x00000000,
 686                 0x065, 0x00093016,
 687 -       0xFF0F02C0, 0xCDEF,
 688 +               0x9000020c,     0x00000000,     0x40000000,     0x00000000,
 689                 0x065, 0x00093015,
 690 -       0xCDCDCDCD, 0xCDCD,
 691 +               0x9000040c,     0x00000000,     0x40000000,     0x00000000,
 692 +               0x065, 0x00093015,
 693 +               0x90000200,     0x00000000,     0x40000000,     0x00000000,
 694 +               0x065, 0x00093016,
 695 +               0xA0000000,     0x00000000,
 696                 0x065, 0x00091016,
 697 -       0xFF0F0200, 0xDEAD,
 698 +               0xB0000000,     0x00000000,
 699                 0x018, 0x00000006,
 700                 0x0EF, 0x00002000,
 701                 0x03B, 0x0003824B,
 702 @@ -1895,9 +2074,10 @@ u32 RTL8821AE_RADIOA_ARRAY[] = {
 703                 0x0B4, 0x0001214C,
 704                 0x0B7, 0x0003000C,
 705                 0x01C, 0x000539D2,
 706 +               0x0C4, 0x000AFE00,
 707                 0x018, 0x0001F12A,
 708 -               0x0FE, 0x00000000,
 709 -               0x0FE, 0x00000000,
 710 +               0xFFE, 0x00000000,
 711 +               0xFFE, 0x00000000,
 712                 0x018, 0x0001712A,
 713
 714  };
 715 @@ -2017,6 +2197,7 @@ u32 RTL8812AE_MAC_REG_ARRAY[] = {
 716  u32 RTL8812AE_MAC_1T_ARRAYLEN = ARRAY_SIZE(RTL8812AE_MAC_REG_ARRAY);
 717
 718  u32 RTL8821AE_MAC_REG_ARRAY[] = {
 719 +               0x421, 0x0000000F,
 720                 0x428, 0x0000000A,
 721                 0x429, 0x00000010,
 722                 0x430, 0x00000000,
 723 @@ -2485,7 +2666,7 @@ u32 RTL8821AE_AGC_TAB_ARRAY[] = {
 724                 0x81C, 0xA6360001,
 725                 0x81C, 0xA5380001,
 726                 0x81C, 0xA43A0001,
 727 -               0x81C, 0xA33C0001,
 728 +               0x81C, 0x683C0001,
 729                 0x81C, 0x673E0001,
 730                 0x81C, 0x66400001,
 731                 0x81C, 0x65420001,
 732 @@ -2519,7 +2700,66 @@ u32 RTL8821AE_AGC_TAB_ARRAY[] = {
 733                 0x81C, 0x017A0001,
 734                 0x81C, 0x017C0001,
 735                 0x81C, 0x017E0001,
 736 -       0xFF0F02C0, 0xABCD,
 737 +       0x8000020c,     0x00000000,     0x40000000,     0x00000000,
 738 +               0x81C, 0xFB000101,
 739 +               0x81C, 0xFA020101,
 740 +               0x81C, 0xF9040101,
 741 +               0x81C, 0xF8060101,
 742 +               0x81C, 0xF7080101,
 743 +               0x81C, 0xF60A0101,
 744 +               0x81C, 0xF50C0101,
 745 +               0x81C, 0xF40E0101,
 746 +               0x81C, 0xF3100101,
 747 +               0x81C, 0xF2120101,
 748 +               0x81C, 0xF1140101,
 749 +               0x81C, 0xF0160101,
 750 +               0x81C, 0xEF180101,
 751 +               0x81C, 0xEE1A0101,
 752 +               0x81C, 0xED1C0101,
 753 +               0x81C, 0xEC1E0101,
 754 +               0x81C, 0xEB200101,
 755 +               0x81C, 0xEA220101,
 756 +               0x81C, 0xE9240101,
 757 +               0x81C, 0xE8260101,
 758 +               0x81C, 0xE7280101,
 759 +               0x81C, 0xE62A0101,
 760 +               0x81C, 0xE52C0101,
 761 +               0x81C, 0xE42E0101,
 762 +               0x81C, 0xE3300101,
 763 +               0x81C, 0xA5320101,
 764 +               0x81C, 0xA4340101,
 765 +               0x81C, 0xA3360101,
 766 +               0x81C, 0x87380101,
 767 +               0x81C, 0x863A0101,
 768 +               0x81C, 0x853C0101,
 769 +               0x81C, 0x843E0101,
 770 +               0x81C, 0x69400101,
 771 +               0x81C, 0x68420101,
 772 +               0x81C, 0x67440101,
 773 +               0x81C, 0x66460101,
 774 +               0x81C, 0x49480101,
 775 +               0x81C, 0x484A0101,
 776 +               0x81C, 0x474C0101,
 777 +               0x81C, 0x2A4E0101,
 778 +               0x81C, 0x29500101,
 779 +               0x81C, 0x28520101,
 780 +               0x81C, 0x27540101,
 781 +               0x81C, 0x26560101,
 782 +               0x81C, 0x25580101,
 783 +               0x81C, 0x245A0101,
 784 +               0x81C, 0x235C0101,
 785 +               0x81C, 0x055E0101,
 786 +               0x81C, 0x04600101,
 787 +               0x81C, 0x03620101,
 788 +               0x81C, 0x02640101,
 789 +               0x81C, 0x01660101,
 790 +               0x81C, 0x01680101,
 791 +               0x81C, 0x016A0101,
 792 +               0x81C, 0x016C0101,
 793 +               0x81C, 0x016E0101,
 794 +               0x81C, 0x01700101,
 795 +               0x81C, 0x01720101,
 796 +       0x9000040c,     0x00000000,     0x40000000,     0x00000000,
 797                 0x81C, 0xFB000101,
 798                 0x81C, 0xFA020101,
 799                 0x81C, 0xF9040101,
 800 @@ -2578,7 +2818,7 @@ u32 RTL8821AE_AGC_TAB_ARRAY[] = {
 801                 0x81C, 0x016E0101,
 802                 0x81C, 0x01700101,
 803                 0x81C, 0x01720101,
 804 -       0xCDCDCDCD, 0xCDCD,
 805 +       0xA0000000,     0x00000000,
 806                 0x81C, 0xFF000101,
 807                 0x81C, 0xFF020101,
 808                 0x81C, 0xFE040101,
 809 @@ -2637,7 +2877,7 @@ u32 RTL8821AE_AGC_TAB_ARRAY[] = {
 810                 0x81C, 0x046E0101,
 811                 0x81C, 0x03700101,
 812                 0x81C, 0x02720101,
 813 -       0xFF0F02C0, 0xDEAD,
 814 +       0xB0000000,     0x00000000,
 815                 0x81C, 0x01740101,
 816                 0x81C, 0x01760101,
 817                 0x81C, 0x01780101,