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

Commit a48e2cc8 authored by Vivek Natarajan's avatar Vivek Natarajan Committed by Kalle Valo
Browse files

ath10k: Enable MU MIMO txbf support for QCA99X0 



This patch enables MU-MIMO transmit beamforming support
for QCA99X0 chipsets.

Signed-off-by: default avatarVivek Natarajan <nataraja@qti.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 08e75ea8

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

+44 −0
Original line number Diff line number Diff line
@@ -4032,6 +4032,43 @@ static u32 get_nss_from_chainmask(u16 chain_mask) 
	return 1;

}



static int ath10k_mac_set_txbf_conf(struct ath10k_vif *arvif)

{

	u32 value = 0;

	struct ath10k *ar = arvif->ar;



	if (ath10k_wmi_get_txbf_conf_scheme(ar) != WMI_TXBF_CONF_BEFORE_ASSOC)

		return 0;



	if (ar->vht_cap_info & (IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE |

				IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE))

		value |= SM((ar->num_rf_chains - 1), WMI_TXBF_STS_CAP_OFFSET);



	if (ar->vht_cap_info & (IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE |

				IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE))

		value |= SM((ar->num_rf_chains - 1), WMI_BF_SOUND_DIM_OFFSET);



	if (!value)

		return 0;



	if (ar->vht_cap_info & IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE)

		value |= WMI_VDEV_PARAM_TXBF_SU_TX_BFER;



	if (ar->vht_cap_info & IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE)

		value |= (WMI_VDEV_PARAM_TXBF_MU_TX_BFER |

			  WMI_VDEV_PARAM_TXBF_SU_TX_BFER);



	if (ar->vht_cap_info & IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE)

		value |= WMI_VDEV_PARAM_TXBF_SU_TX_BFEE;



	if (ar->vht_cap_info & IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE)

		value |= (WMI_VDEV_PARAM_TXBF_MU_TX_BFEE |

			  WMI_VDEV_PARAM_TXBF_SU_TX_BFEE);



	return ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,

					 ar->wmi.vdev_param->txbf, value);

}



/*

 * TODO:

 * Figure out how to handle WMI_VDEV_SUBTYPE_P2P_DEVICE,
@@ -4258,6 +4295,13 @@ static int ath10k_add_interface(struct ieee80211_hw *hw, 
		}

	}



	ret = ath10k_mac_set_txbf_conf(arvif);

	if (ret) {

		ath10k_warn(ar, "failed to set txbf for vdev %d: %d\n",

			    arvif->vdev_id, ret);

		goto err_peer_delete;

	}



	ret = ath10k_mac_set_rts(arvif, ar->hw->wiphy->rts_threshold);

	if (ret) {

		ath10k_warn(ar, "failed to set rts threshold for vdev %d: %d\n",

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

+5 −0
Original line number Diff line number Diff line
@@ -4628,6 +4628,11 @@ enum wmi_10_4_vdev_param { 
#define WMI_VDEV_PARAM_TXBF_SU_TX_BFER BIT(2)

#define WMI_VDEV_PARAM_TXBF_MU_TX_BFER BIT(3)



#define WMI_TXBF_STS_CAP_OFFSET_LSB	4

#define WMI_TXBF_STS_CAP_OFFSET_MASK	0xf0

#define WMI_BF_SOUND_DIM_OFFSET_LSB	8

#define WMI_BF_SOUND_DIM_OFFSET_MASK	0xf00



/* slot time long */

#define WMI_VDEV_SLOT_TIME_LONG		0x1

/* slot time short */