Commit f28b7b78 authored by Rajkumar Manoharan's avatar Rajkumar Manoharan Committed by Kalle Valo
Browse files

ath11k: build HE 6 GHz capability 



Build 6 GHz band capability from HT and VHT capabilities reported
by firmware.

Signed-off-by: default avatarRajkumar Manoharan <rmanohar@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1591057888-2862-1-git-send-email-rmanohar@codeaurora.org
parent 74601ecf

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

+1 −0
Original line number Diff line number Diff line
@@ -552,6 +552,7 @@ struct ath11k_band_cap { 
	u32 he_mcs;

	u32 he_cap_phy_info[PSOC_HOST_MAX_PHY_SIZE];

	struct ath11k_ppe_threshold he_ppet;

	u16 he_6ghz_capa;

};



struct ath11k_pdev_cap {

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

+34 −0
Original line number Diff line number Diff line
@@ -3615,6 +3615,35 @@ ath11k_mac_filter_he_cap_mesh(struct ieee80211_he_cap_elem *he_cap_elem) 
	he_cap_elem->phy_cap_info[9] &= ~m;

}



static __le16 ath11k_mac_setup_he_6ghz_cap(struct ath11k_pdev_cap *pcap,

					   struct ath11k_band_cap *bcap)

{

	u8 val;



	bcap->he_6ghz_capa = IEEE80211_HT_MPDU_DENSITY_NONE;

	if (bcap->ht_cap_info & WMI_HT_CAP_DYNAMIC_SMPS)

		bcap->he_6ghz_capa |=

			FIELD_PREP(IEEE80211_HE_6GHZ_CAP_SM_PS,

				   WLAN_HT_CAP_SM_PS_DYNAMIC);

	else

		bcap->he_6ghz_capa |=

			FIELD_PREP(IEEE80211_HE_6GHZ_CAP_SM_PS,

				   WLAN_HT_CAP_SM_PS_DISABLED);

	val = FIELD_GET(IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK,

			pcap->vht_cap);

	bcap->he_6ghz_capa |=

		FIELD_PREP(IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP, val);

	val = FIELD_GET(IEEE80211_VHT_CAP_MAX_MPDU_MASK, pcap->vht_cap);

	bcap->he_6ghz_capa |=

		FIELD_PREP(IEEE80211_HE_6GHZ_CAP_MAX_MPDU_LEN, val);

	if (pcap->vht_cap & IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN)

		bcap->he_6ghz_capa |= IEEE80211_HE_6GHZ_CAP_RX_ANTPAT_CONS;

	if (pcap->vht_cap & IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN)

		bcap->he_6ghz_capa |= IEEE80211_HE_6GHZ_CAP_TX_ANTPAT_CONS;



	return cpu_to_le16(bcap->he_6ghz_capa);

}



static int ath11k_mac_copy_he_cap(struct ath11k *ar,

				  struct ath11k_pdev_cap *cap,

				  struct ieee80211_sband_iftype_data *data,
@@ -3697,6 +3726,11 @@ static int ath11k_mac_copy_he_cap(struct ath11k *ar, 
		    IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT)

			ath11k_gen_ppe_thresh(&band_cap->he_ppet,

					      he_cap->ppe_thres);



		if (band == NL80211_BAND_6GHZ) {

			data[idx].he_6ghz_capa.capa =

				ath11k_mac_setup_he_6ghz_cap(cap, band_cap);

		}

		idx++;

	}