Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8930b050 authored by Eyal Shapira's avatar Eyal Shapira Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: rs: fix search cycle rules 



We should explore all possible columns when searching to be
as resilient as possible to changing conditions. This fixes
for example a scenario where even after a sudden creation of
rssi difference between the 2 antennas we would keep doing MIMO
at a low rate instead of switching to SISO at a higher rate using
the better antenna which was the optimal configuration.

Signed-off-by: default avatarEyal Shapira <eyalx.shapira@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 833df4a8

drivers/net/wireless/iwlwifi/mvm/rs.c

+18 −18
Original line number Diff line number Diff line
@@ -211,9 +211,9 @@ 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_MIMO2_SGI,

		},

	},

	[RS_COLUMN_LEGACY_ANT_B] = {
@@ -221,10 +221,10 @@ 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_MIMO2_SGI,

		},

	},

	[RS_COLUMN_SISO_ANT_A] = {
@@ -234,8 +234,8 @@ 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_INVALID,

			RS_COLUMN_INVALID,

			RS_COLUMN_SISO_ANT_B_SGI,

			RS_COLUMN_MIMO2_SGI,

		},

		.checks = {

			rs_siso_allow,
@@ -248,8 +248,8 @@ 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_INVALID,

			RS_COLUMN_INVALID,

			RS_COLUMN_SISO_ANT_A_SGI,

			RS_COLUMN_MIMO2_SGI,

		},

		.checks = {

			rs_siso_allow,
@@ -263,8 +263,8 @@ 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_INVALID,

			RS_COLUMN_INVALID,

			RS_COLUMN_SISO_ANT_B,

			RS_COLUMN_MIMO2,

		},

		.checks = {

			rs_siso_allow,
@@ -279,8 +279,8 @@ 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_INVALID,

			RS_COLUMN_INVALID,

			RS_COLUMN_SISO_ANT_A,

			RS_COLUMN_MIMO2,

		},

		.checks = {

			rs_siso_allow,
@@ -292,10 +292,10 @@ 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_INVALID,

			RS_COLUMN_INVALID,

			RS_COLUMN_INVALID,

		},

		.checks = {

			rs_mimo_allow,
@@ -307,10 +307,10 @@ 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_INVALID,

			RS_COLUMN_INVALID,

			RS_COLUMN_INVALID,

		},

		.checks = {

			rs_mimo_allow,