iwlwifi: mvm: rs: revert changes to search cycle rules

Adding more options in the search cycle causes longer
search cycles with additional wondering off to non optimal Tx
configurations. Reduce the Tx configurations searched to
improve throughput in non optimal attenuations.

Signed-off-by: Eyal Shapira <eyalx.shapira@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

diff --git a/drivers/net/wireless/iwlwifi/mvm/rs.c b/drivers/net/wireless/iwlwifi/mvm/rs.c
index 857ddaf6f48c80149223178d3c184f5b4e3d2734..f9aab1590df87e731a2ca9dc09b916e108dab402 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/rs.c
+++ b/drivers/net/wireless/iwlwifi/mvm/rs.c
@@ -211,7 +211,7 @@ static const struct rs_tx_column rs_tx_columns[] = {
                .next_columns = {
                        RS_COLUMN_LEGACY_ANT_B,
                        RS_COLUMN_SISO_ANT_A,
-                       RS_COLUMN_SISO_ANT_B,
+                       RS_COLUMN_MIMO2,
                        RS_COLUMN_INVALID,
                        RS_COLUMN_INVALID,
                        RS_COLUMN_INVALID,
@@ -223,8 +223,8 @@ static const struct rs_tx_column rs_tx_columns[] = {
                .ant = ANT_B,
                .next_columns = {
                        RS_COLUMN_LEGACY_ANT_A,
-                       RS_COLUMN_SISO_ANT_A,
                        RS_COLUMN_SISO_ANT_B,
+                       RS_COLUMN_MIMO2,
                        RS_COLUMN_INVALID,
                        RS_COLUMN_INVALID,
                        RS_COLUMN_INVALID,
@@ -238,10 +238,10 @@ static const struct rs_tx_column rs_tx_columns[] = {
                        RS_COLUMN_SISO_ANT_B,
                        RS_COLUMN_MIMO2,
                        RS_COLUMN_SISO_ANT_A_SGI,
-                       RS_COLUMN_SISO_ANT_B_SGI,
                        RS_COLUMN_LEGACY_ANT_A,
                        RS_COLUMN_LEGACY_ANT_B,
                        RS_COLUMN_INVALID,
+                       RS_COLUMN_INVALID,
                },
                .checks = {
                        rs_siso_allow,
@@ -254,10 +254,10 @@ static const struct rs_tx_column rs_tx_columns[] = {
                        RS_COLUMN_SISO_ANT_A,
                        RS_COLUMN_MIMO2,
                        RS_COLUMN_SISO_ANT_B_SGI,
-                       RS_COLUMN_SISO_ANT_A_SGI,
                        RS_COLUMN_LEGACY_ANT_A,
                        RS_COLUMN_LEGACY_ANT_B,
                        RS_COLUMN_INVALID,
+                       RS_COLUMN_INVALID,
                },
                .checks = {
                        rs_siso_allow,
@@ -271,10 +271,10 @@ static const struct rs_tx_column rs_tx_columns[] = {
                        RS_COLUMN_SISO_ANT_B_SGI,
                        RS_COLUMN_MIMO2_SGI,
                        RS_COLUMN_SISO_ANT_A,
-                       RS_COLUMN_SISO_ANT_B,
-                       RS_COLUMN_MIMO2,
                        RS_COLUMN_LEGACY_ANT_A,
                        RS_COLUMN_LEGACY_ANT_B,
+                       RS_COLUMN_INVALID,
+                       RS_COLUMN_INVALID,
                },
                .checks = {
                        rs_siso_allow,
@@ -289,10 +289,10 @@ static const struct rs_tx_column rs_tx_columns[] = {
                        RS_COLUMN_SISO_ANT_A_SGI,
                        RS_COLUMN_MIMO2_SGI,
                        RS_COLUMN_SISO_ANT_B,
-                       RS_COLUMN_SISO_ANT_A,
-                       RS_COLUMN_MIMO2,
                        RS_COLUMN_LEGACY_ANT_A,
                        RS_COLUMN_LEGACY_ANT_B,
+                       RS_COLUMN_INVALID,
+                       RS_COLUMN_INVALID,
                },
                .checks = {
                        rs_siso_allow,
@@ -304,12 +304,12 @@ static const struct rs_tx_column rs_tx_columns[] = {
                .ant = ANT_AB,
                .next_columns = {
                        RS_COLUMN_SISO_ANT_A,
-                       RS_COLUMN_SISO_ANT_B,
-                       RS_COLUMN_SISO_ANT_A_SGI,
-                       RS_COLUMN_SISO_ANT_B_SGI,
                        RS_COLUMN_MIMO2_SGI,
                        RS_COLUMN_LEGACY_ANT_A,
                        RS_COLUMN_LEGACY_ANT_B,
+                       RS_COLUMN_INVALID,
+                       RS_COLUMN_INVALID,
+                       RS_COLUMN_INVALID,
                },
                .checks = {
                        rs_mimo_allow,
@@ -321,12 +321,12 @@ static const struct rs_tx_column rs_tx_columns[] = {
                .sgi = true,
                .next_columns = {
                        RS_COLUMN_SISO_ANT_A_SGI,
-                       RS_COLUMN_SISO_ANT_B_SGI,
-                       RS_COLUMN_SISO_ANT_A,
-                       RS_COLUMN_SISO_ANT_B,
                        RS_COLUMN_MIMO2,
                        RS_COLUMN_LEGACY_ANT_A,
                        RS_COLUMN_LEGACY_ANT_B,
+                       RS_COLUMN_INVALID,
+                       RS_COLUMN_INVALID,
+                       RS_COLUMN_INVALID,
                },
                .checks = {
                        rs_mimo_allow,