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

Commit 5c8726ec authored by Raja Mani's avatar Raja Mani Committed by Kalle Valo
Browse files

ath10k: set max spatial stream to 4 for 10.4 fw 



10.4 fw supports upto 4 spatial stream. Limit max spatial
stream to 4 for 10.4 firmware and to 3 for non 10.4 firmware.

Signed-off-by: default avatarRaja Mani <rmani@qti.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent cf36fef0

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

+4 −0
Original line number Diff line number Diff line
@@ -1095,6 +1095,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
		ar->htt.max_num_pending_tx = TARGET_NUM_MSDU_DESC;

		ar->fw_stats_req_mask = WMI_STAT_PDEV | WMI_STAT_VDEV |

			WMI_STAT_PEER;

		ar->max_spatial_stream = WMI_MAX_SPATIAL_STREAM;

		break;

	case ATH10K_FW_WMI_OP_VERSION_10_1:

	case ATH10K_FW_WMI_OP_VERSION_10_2:
@@ -1104,6 +1105,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
		ar->max_num_vdevs = TARGET_10X_NUM_VDEVS;

		ar->htt.max_num_pending_tx = TARGET_10X_NUM_MSDU_DESC;

		ar->fw_stats_req_mask = WMI_STAT_PEER;

		ar->max_spatial_stream = WMI_MAX_SPATIAL_STREAM;

		break;

	case ATH10K_FW_WMI_OP_VERSION_TLV:

		ar->max_num_peers = TARGET_TLV_NUM_PEERS;
@@ -1114,6 +1116,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
		ar->wow.max_num_patterns = TARGET_TLV_NUM_WOW_PATTERNS;

		ar->fw_stats_req_mask = WMI_STAT_PDEV | WMI_STAT_VDEV |

			WMI_STAT_PEER;

		ar->max_spatial_stream = WMI_MAX_SPATIAL_STREAM;

		break;

	case ATH10K_FW_WMI_OP_VERSION_10_4:

		ar->max_num_peers = TARGET_10_4_NUM_PEERS;
@@ -1123,6 +1126,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
		ar->num_tids = TARGET_10_4_TGT_NUM_TIDS;

		ar->htt.max_num_pending_tx = TARGET_10_4_NUM_MSDU_DESC;

		ar->fw_stats_req_mask = WMI_STAT_PEER;

		ar->max_spatial_stream = WMI_10_4_MAX_SPATIAL_STREAM;

		break;

	case ATH10K_FW_WMI_OP_VERSION_UNSET:

	case ATH10K_FW_WMI_OP_VERSION_MAX:

drivers/net/wireless/ath/ath10k/core.h

+1 −0
Original line number Diff line number Diff line
@@ -546,6 +546,7 @@ struct ath10k { 
	u32 ht_cap_info;

	u32 vht_cap_info;

	u32 num_rf_chains;

	u32 max_spatial_stream;

	/* protected by conf_mutex */

	bool ani_enabled;

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

+3 −3
Original line number Diff line number Diff line
@@ -3915,10 +3915,10 @@ void ath10k_wmi_event_service_ready(struct ath10k *ar, struct sk_buff *skb) 
	if (ar->fw_api == 1 && ar->fw_version_build > 636)

		set_bit(ATH10K_FW_FEATURE_EXT_WMI_MGMT_RX, ar->fw_features);



	if (ar->num_rf_chains > WMI_MAX_SPATIAL_STREAM) {

	if (ar->num_rf_chains > ar->max_spatial_stream) {

		ath10k_warn(ar, "hardware advertises support for more spatial streams than it should (%d > %d)\n",

			    ar->num_rf_chains, WMI_MAX_SPATIAL_STREAM);

		ar->num_rf_chains = WMI_MAX_SPATIAL_STREAM;

			    ar->num_rf_chains, ar->max_spatial_stream);

		ar->num_rf_chains = ar->max_spatial_stream;

	}



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

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

+2 −1
Original line number Diff line number Diff line
@@ -1747,7 +1747,8 @@ enum wmi_channel_change_cause { 
/* Indicate reason for channel switch */

#define WMI_CHANNEL_CHANGE_CAUSE_CSA (1 << 13)



#define WMI_MAX_SPATIAL_STREAM   3

#define WMI_MAX_SPATIAL_STREAM        3 /* default max ss */

#define WMI_10_4_MAX_SPATIAL_STREAM   4



/* HT Capabilities*/

#define WMI_HT_CAP_ENABLED                0x0001   /* HT Enabled/ disabled */