iwlwifi: mvm: rfi: update rfi table

After some lab experimentation with different DDRs, need
to update the table. Also, arrange it by frequency and not
by DDR type since now the table contains a super-set of all
possible conflicts.

Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20211210090244.6f2fca102739.I8b5e37a00c50b7b51f7d377216dde91e71faffba@changeid
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rfi.c b/drivers/net/wireless/intel/iwlwifi/mvm/rfi.c
index f1ed73c..f054ce7 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rfi.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rfi.c
@@ -12,34 +12,52 @@
  * frequency values in the adjusted format.
  */
 static const struct iwl_rfi_lut_entry iwl_rfi_table[IWL_RFI_LUT_SIZE] = {
-       /* LPDDR4 */
+       /* frequency 2667MHz */
+       {cpu_to_le16(160), {50, 58, 60, 62, 64, 52, 54, 56},
+             {PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,
+              PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,}},
+
+       /* frequency 2933MHz */
+       {cpu_to_le16(176), {149, 151, 153, 157, 159, 161, 165, 163, 167, 169,
+                           171, 173, 175},
+             {PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,
+              PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,
+              PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,}},
+
+       /* frequency 3200MHz */
+       {cpu_to_le16(192), {79, 81, 83, 85, 87, 89, 91, 93},
+             {PHY_BAND_6, PHY_BAND_6, PHY_BAND_6, PHY_BAND_6, PHY_BAND_6,
+              PHY_BAND_6, PHY_BAND_6, PHY_BAND_6,}},
 
        /* frequency 3733MHz */
-       {cpu_to_le16(223), {114, 116, 118, 120, 122,},
-             {PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,}},
+       {cpu_to_le16(223), {114, 116, 118, 120, 122, 106, 110, 124, 126},
+             {PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,
+              PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,}},
+
+       /* frequency 4000MHz */
+       {cpu_to_le16(240), {114, 151, 155, 157, 159, 161, 165},
+             {PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,
+              PHY_BAND_5, PHY_BAND_5,}},
 
        /* frequency 4267MHz */
        {cpu_to_le16(256), {79, 83, 85, 87, 89, 91, 93,},
               {PHY_BAND_6, PHY_BAND_6, PHY_BAND_6, PHY_BAND_6, PHY_BAND_6,
                PHY_BAND_6, PHY_BAND_6,}},
 
-       /* DDR5ePOR */
-
-       /* frequency 4000MHz */
-       {cpu_to_le16(240), {3, 5, 7, 9, 11, 13, 15,},
-             {PHY_BAND_6, PHY_BAND_6, PHY_BAND_6, PHY_BAND_6, PHY_BAND_6,
-              PHY_BAND_6, PHY_BAND_6,}},
-
        /* frequency 4400MHz */
        {cpu_to_le16(264), {111, 119, 123, 125, 129, 131, 133, 135, 143,},
              {PHY_BAND_6, PHY_BAND_6, PHY_BAND_6, PHY_BAND_6, PHY_BAND_6,
               PHY_BAND_6, PHY_BAND_6, PHY_BAND_6, PHY_BAND_6,}},
 
-       /* LPDDR5iPOR */
-
        /* frequency 5200MHz */
-       {cpu_to_le16(312), {36, 38, 40, 42, 50,},
-              {PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,}},
+       {cpu_to_le16(312), {36, 38, 40, 42, 44, 46, 50,},
+              {PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,
+               PHY_BAND_5, PHY_BAND_5,}},
+
+       /* frequency 5600MHz */
+       {cpu_to_le16(336), {106, 110, 112, 114, 116, 118, 120, 122},
+              {PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,
+               PHY_BAND_5, PHY_BAND_5, PHY_BAND_5,}},
 
        /* frequency 6000MHz */
        {cpu_to_le16(360), {3, 5, 7, 9, 11, 13, 15,},