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

Commit fdb959c7 authored by Michal Kazior's avatar Michal Kazior Committed by Kalle Valo
Browse files

ath10k: fix tx/rx chainmask init 



Firmware reports the number of RF chains so use
that for initialization of supp_{tx,rx}_chainmask
instead of using a macro for 3x3 chips.

This should make tx/rx chainmask reports correct
for chips other than 3x3.

Signed-off-by: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 64badcb6

drivers/net/wireless/ath/ath10k/mac.c

+0 −9
Original line number Diff line number Diff line
@@ -4848,15 +4848,6 @@ int ath10k_mac_register(struct ath10k *ar) 
		BIT(NL80211_IFTYPE_STATION) |

		BIT(NL80211_IFTYPE_AP);



	if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {

		/* TODO:  Have to deal with 2x2 chips if/when the come out. */

		ar->supp_tx_chainmask = TARGET_10X_TX_CHAIN_MASK;

		ar->supp_rx_chainmask = TARGET_10X_RX_CHAIN_MASK;

	} else {

		ar->supp_tx_chainmask = TARGET_TX_CHAIN_MASK;

		ar->supp_rx_chainmask = TARGET_RX_CHAIN_MASK;

	}



	ar->hw->wiphy->available_antennas_rx = ar->supp_rx_chainmask;

	ar->hw->wiphy->available_antennas_tx = ar->supp_tx_chainmask;

drivers/net/wireless/ath/ath10k/wmi.c

+6 −0
Original line number Diff line number Diff line
@@ -2206,6 +2206,9 @@ static void ath10k_wmi_service_ready_event_rx(struct ath10k *ar, 
		ar->num_rf_chains = WMI_MAX_SPATIAL_STREAM;

	}



	ar->supp_tx_chainmask = (1 << ar->num_rf_chains) - 1;

	ar->supp_rx_chainmask = (1 << ar->num_rf_chains) - 1;



	ar->ath_common.regulatory.current_rd =

		__le32_to_cpu(ev->hal_reg_capabilities.eeprom_rd);
@@ -2276,6 +2279,9 @@ static void ath10k_wmi_10x_service_ready_event_rx(struct ath10k *ar, 
		ar->num_rf_chains = WMI_MAX_SPATIAL_STREAM;

	}



	ar->supp_tx_chainmask = (1 << ar->num_rf_chains) - 1;

	ar->supp_rx_chainmask = (1 << ar->num_rf_chains) - 1;



	ar->ath_common.regulatory.current_rd =

		__le32_to_cpu(ev->hal_reg_capabilities.eeprom_rd);