Commit 31b20452 authored by Eyal Shapira's avatar Eyal Shapira Committed by Emmanuel Grumbach

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: default avatarEyal Shapira <eyalx.shapira@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent cebeb0f1
...@@ -211,7 +211,7 @@ static const struct rs_tx_column rs_tx_columns[] = { ...@@ -211,7 +211,7 @@ static const struct rs_tx_column rs_tx_columns[] = {
.next_columns = { .next_columns = {
RS_COLUMN_LEGACY_ANT_B, RS_COLUMN_LEGACY_ANT_B,
RS_COLUMN_SISO_ANT_A, RS_COLUMN_SISO_ANT_A,
RS_COLUMN_SISO_ANT_B, RS_COLUMN_MIMO2,
RS_COLUMN_INVALID, RS_COLUMN_INVALID,
RS_COLUMN_INVALID, RS_COLUMN_INVALID,
RS_COLUMN_INVALID, RS_COLUMN_INVALID,
...@@ -223,8 +223,8 @@ static const struct rs_tx_column rs_tx_columns[] = { ...@@ -223,8 +223,8 @@ static const struct rs_tx_column rs_tx_columns[] = {
.ant = ANT_B, .ant = ANT_B,
.next_columns = { .next_columns = {
RS_COLUMN_LEGACY_ANT_A, RS_COLUMN_LEGACY_ANT_A,
RS_COLUMN_SISO_ANT_A,
RS_COLUMN_SISO_ANT_B, RS_COLUMN_SISO_ANT_B,
RS_COLUMN_MIMO2,
RS_COLUMN_INVALID, RS_COLUMN_INVALID,
RS_COLUMN_INVALID, RS_COLUMN_INVALID,
RS_COLUMN_INVALID, RS_COLUMN_INVALID,
...@@ -238,10 +238,10 @@ static const struct rs_tx_column rs_tx_columns[] = { ...@@ -238,10 +238,10 @@ static const struct rs_tx_column rs_tx_columns[] = {
RS_COLUMN_SISO_ANT_B, RS_COLUMN_SISO_ANT_B,
RS_COLUMN_MIMO2, RS_COLUMN_MIMO2,
RS_COLUMN_SISO_ANT_A_SGI, RS_COLUMN_SISO_ANT_A_SGI,
RS_COLUMN_SISO_ANT_B_SGI,
RS_COLUMN_LEGACY_ANT_A, RS_COLUMN_LEGACY_ANT_A,
RS_COLUMN_LEGACY_ANT_B, RS_COLUMN_LEGACY_ANT_B,
RS_COLUMN_INVALID, RS_COLUMN_INVALID,
RS_COLUMN_INVALID,
}, },
.checks = { .checks = {
rs_siso_allow, rs_siso_allow,
...@@ -254,10 +254,10 @@ static const struct rs_tx_column rs_tx_columns[] = { ...@@ -254,10 +254,10 @@ static const struct rs_tx_column rs_tx_columns[] = {
RS_COLUMN_SISO_ANT_A, RS_COLUMN_SISO_ANT_A,
RS_COLUMN_MIMO2, RS_COLUMN_MIMO2,
RS_COLUMN_SISO_ANT_B_SGI, RS_COLUMN_SISO_ANT_B_SGI,
RS_COLUMN_SISO_ANT_A_SGI,
RS_COLUMN_LEGACY_ANT_A, RS_COLUMN_LEGACY_ANT_A,
RS_COLUMN_LEGACY_ANT_B, RS_COLUMN_LEGACY_ANT_B,
RS_COLUMN_INVALID, RS_COLUMN_INVALID,
RS_COLUMN_INVALID,
}, },
.checks = { .checks = {
rs_siso_allow, rs_siso_allow,
...@@ -271,10 +271,10 @@ static const struct rs_tx_column rs_tx_columns[] = { ...@@ -271,10 +271,10 @@ static const struct rs_tx_column rs_tx_columns[] = {
RS_COLUMN_SISO_ANT_B_SGI, RS_COLUMN_SISO_ANT_B_SGI,
RS_COLUMN_MIMO2_SGI, RS_COLUMN_MIMO2_SGI,
RS_COLUMN_SISO_ANT_A, RS_COLUMN_SISO_ANT_A,
RS_COLUMN_SISO_ANT_B,
RS_COLUMN_MIMO2,
RS_COLUMN_LEGACY_ANT_A, RS_COLUMN_LEGACY_ANT_A,
RS_COLUMN_LEGACY_ANT_B, RS_COLUMN_LEGACY_ANT_B,
RS_COLUMN_INVALID,
RS_COLUMN_INVALID,
}, },
.checks = { .checks = {
rs_siso_allow, rs_siso_allow,
...@@ -289,10 +289,10 @@ static const struct rs_tx_column rs_tx_columns[] = { ...@@ -289,10 +289,10 @@ static const struct rs_tx_column rs_tx_columns[] = {
RS_COLUMN_SISO_ANT_A_SGI, RS_COLUMN_SISO_ANT_A_SGI,
RS_COLUMN_MIMO2_SGI, RS_COLUMN_MIMO2_SGI,
RS_COLUMN_SISO_ANT_B, RS_COLUMN_SISO_ANT_B,
RS_COLUMN_SISO_ANT_A,
RS_COLUMN_MIMO2,
RS_COLUMN_LEGACY_ANT_A, RS_COLUMN_LEGACY_ANT_A,
RS_COLUMN_LEGACY_ANT_B, RS_COLUMN_LEGACY_ANT_B,
RS_COLUMN_INVALID,
RS_COLUMN_INVALID,
}, },
.checks = { .checks = {
rs_siso_allow, rs_siso_allow,
...@@ -304,12 +304,12 @@ static const struct rs_tx_column rs_tx_columns[] = { ...@@ -304,12 +304,12 @@ static const struct rs_tx_column rs_tx_columns[] = {
.ant = ANT_AB, .ant = ANT_AB,
.next_columns = { .next_columns = {
RS_COLUMN_SISO_ANT_A, 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_MIMO2_SGI,
RS_COLUMN_LEGACY_ANT_A, RS_COLUMN_LEGACY_ANT_A,
RS_COLUMN_LEGACY_ANT_B, RS_COLUMN_LEGACY_ANT_B,
RS_COLUMN_INVALID,
RS_COLUMN_INVALID,
RS_COLUMN_INVALID,
}, },
.checks = { .checks = {
rs_mimo_allow, rs_mimo_allow,
...@@ -321,12 +321,12 @@ static const struct rs_tx_column rs_tx_columns[] = { ...@@ -321,12 +321,12 @@ static const struct rs_tx_column rs_tx_columns[] = {
.sgi = true, .sgi = true,
.next_columns = { .next_columns = {
RS_COLUMN_SISO_ANT_A_SGI, 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_MIMO2,
RS_COLUMN_LEGACY_ANT_A, RS_COLUMN_LEGACY_ANT_A,
RS_COLUMN_LEGACY_ANT_B, RS_COLUMN_LEGACY_ANT_B,
RS_COLUMN_INVALID,
RS_COLUMN_INVALID,
RS_COLUMN_INVALID,
}, },
.checks = { .checks = {
rs_mimo_allow, rs_mimo_allow,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment