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

Commit 514c3069 authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: add support for IEEE802.11ax 



Add support for the HE in the iwlwifi driver conforming with
P802.11ax_D2.0.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 8a6171a7

drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

+103 −0
Original line number Diff line number Diff line
@@ -463,6 +463,101 @@ static void iwl_init_vht_hw_capab(const struct iwl_cfg *cfg, 
	vht_cap->vht_mcs.tx_mcs_map = vht_cap->vht_mcs.rx_mcs_map;

}



static struct ieee80211_sband_iftype_data iwl_he_capa = {

	.types_mask = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_AP),

	.he_cap = {

		.has_he = true,

		.he_cap_elem = {

			.mac_cap_info[0] =

				IEEE80211_HE_MAC_CAP0_HTC_HE,

			.mac_cap_info[1] =

				IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US |

				IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_QOS_8,

			.mac_cap_info[2] =

				IEEE80211_HE_MAC_CAP2_32BIT_BA_BITMAP |

				IEEE80211_HE_MAC_CAP2_ACK_EN,

			.mac_cap_info[3] =

				IEEE80211_HE_MAC_CAP3_GRP_ADDR_MULTI_STA_BA_DL_MU |

				IEEE80211_HE_MAC_CAP3_MAX_A_AMPDU_LEN_EXP_VHT_2,

			.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,

			.phy_cap_info[0] =

				IEEE80211_HE_PHY_CAP0_DUAL_BAND |

				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G |

				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |

				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G,

			.phy_cap_info[1] =

				IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A |

				IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD |

				IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_MAX_NSTS,

			.phy_cap_info[2] =

				IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US |

				IEEE80211_HE_PHY_CAP2_STBC_TX_UNDER_80MHZ |

				IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ,

			.phy_cap_info[3] =

				IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_BPSK |

				IEEE80211_HE_PHY_CAP3_DCM_MAX_TX_NSS_1 |

				IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_BPSK |

				IEEE80211_HE_PHY_CAP3_DCM_MAX_RX_NSS_1,

			.phy_cap_info[4] =

				IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE |

				IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_8 |

				IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_8,

			.phy_cap_info[5] =

				IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_2 |

				IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_2,

			.phy_cap_info[6] =

				IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT,

			.phy_cap_info[7] =

				IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_AR |

				IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI |

				IEEE80211_HE_PHY_CAP7_MAX_NC_7,

			.phy_cap_info[8] =

				IEEE80211_HE_PHY_CAP8_HE_ER_SU_PPDU_4XLTF_AND_08_US_GI |

				IEEE80211_HE_PHY_CAP8_20MHZ_IN_40MHZ_HE_PPDU_IN_2G |

				IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU |

				IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU,

		},

		/*

		 * Set default Tx/Rx HE MCS NSS Support field. Indicate support

		 * for up to 2 spatial streams and all MCS, without any special

		 * cases

		 */

		.he_mcs_nss_supp = {

			.rx_mcs_80 = cpu_to_le16(0xfffa),

			.tx_mcs_80 = cpu_to_le16(0xfffa),

			.rx_mcs_160 = cpu_to_le16(0xfffa),

			.tx_mcs_160 = cpu_to_le16(0xfffa),

			.rx_mcs_80p80 = cpu_to_le16(0xffff),

			.tx_mcs_80p80 = cpu_to_le16(0xffff),

		},

		/*

		 * Set default PPE thresholds, with PPET16 set to 0, PPET8 set

		 * to 7

		 */

		.ppe_thres = {0x61, 0x1c, 0xc7, 0x71},

	},

};



static void iwl_init_he_hw_capab(struct ieee80211_supported_band *sband,

				 u8 tx_chains, u8 rx_chains)

{

	if (sband->band == NL80211_BAND_2GHZ ||

	    sband->band == NL80211_BAND_5GHZ)

		sband->iftype_data = &iwl_he_capa;

	else

		return;



	sband->n_iftype_data = 1;



	/* If not 2x2, we need to indicate 1x1 in the Midamble RX Max NSTS */

	if ((tx_chains & rx_chains) != ANT_AB) {

		iwl_he_capa.he_cap.he_cap_elem.phy_cap_info[1] &=

			~IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_MAX_NSTS;

		iwl_he_capa.he_cap.he_cap_elem.phy_cap_info[2] &=

			~IEEE80211_HE_PHY_CAP2_MIDAMBLE_RX_MAX_NSTS;

	}

}



static void iwl_init_sbands(struct device *dev, const struct iwl_cfg *cfg,

			    struct iwl_nvm_data *data,

			    const __le16 *nvm_ch_flags, u8 tx_chains,
@@ -483,6 +578,9 @@ static void iwl_init_sbands(struct device *dev, const struct iwl_cfg *cfg, 
	iwl_init_ht_hw_capab(cfg, data, &sband->ht_cap, NL80211_BAND_2GHZ,

			     tx_chains, rx_chains);



	if (data->sku_cap_11ax_enable)

		iwl_init_he_hw_capab(sband, tx_chains, rx_chains);



	sband = &data->bands[NL80211_BAND_5GHZ];

	sband->band = NL80211_BAND_5GHZ;

	sband->bitrates = &iwl_cfg80211_rates[RATES_52_OFFS];
@@ -495,6 +593,9 @@ static void iwl_init_sbands(struct device *dev, const struct iwl_cfg *cfg, 
		iwl_init_vht_hw_capab(cfg, data, &sband->vht_cap,

				      tx_chains, rx_chains);



	if (data->sku_cap_11ax_enable)

		iwl_init_he_hw_capab(sband, tx_chains, rx_chains);



	if (n_channels != n_used)

		IWL_ERR_DEV(dev, "NVM: used only %d of %d channels\n",

			    n_used, n_channels);
@@ -1293,6 +1394,8 @@ struct iwl_nvm_data *iwl_get_nvm(struct iwl_trans *trans, 
		!!(mac_flags & NVM_MAC_SKU_FLAGS_802_11AC_ENABLED);

	nvm->sku_cap_11n_enable =

		!!(mac_flags & NVM_MAC_SKU_FLAGS_802_11N_ENABLED);

	nvm->sku_cap_11ax_enable =

		!!(mac_flags & NVM_MAC_SKU_FLAGS_802_11AX_ENABLED);

	nvm->sku_cap_band_24ghz_enable =

		!!(mac_flags & NVM_MAC_SKU_FLAGS_BAND_2_4_ENABLED);

	nvm->sku_cap_band_52ghz_enable =

drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c

+3 −0
Original line number Diff line number Diff line
@@ -780,6 +780,9 @@ static int iwl_mvm_mac_ctxt_cmd_sta(struct iwl_mvm *mvm, 
	if (vif->probe_req_reg && vif->bss_conf.assoc && vif->p2p)

		cmd.filter_flags |= cpu_to_le32(MAC_FILTER_IN_PROBE_REQUEST);



	if (vif->bss_conf.assoc && vif->bss_conf.he_support)

		cmd.filter_flags |= cpu_to_le32(MAC_FILTER_IN_11AX);



	return iwl_mvm_mac_ctxt_send_cmd(mvm, &cmd);

}

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+195 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018        Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -914,7 +915,7 @@ static int iwl_mvm_mac_ampdu_action(struct ieee80211_hw *hw, 
	enum ieee80211_ampdu_mlme_action action = params->action;

	u16 tid = params->tid;

	u16 *ssn = &params->ssn;

	u8 buf_size = params->buf_size;

	u16 buf_size = params->buf_size;

	bool amsdu = params->amsdu;

	u16 timeout = params->timeout;
@@ -1897,6 +1898,194 @@ void iwl_mvm_mu_mimo_grp_notif(struct iwl_mvm *mvm, 
			iwl_mvm_mu_mimo_iface_iterator, notif);

}



static u8 iwl_mvm_he_get_ppe_val(u8 *ppe, u8 ppe_pos_bit)

{

	u8 byte_num = ppe_pos_bit / 8;

	u8 bit_num = ppe_pos_bit % 8;

	u8 residue_bits;

	u8 res;



	if (bit_num <= 5)

		return (ppe[byte_num] >> bit_num) &

		       (BIT(IEEE80211_PPE_THRES_INFO_PPET_SIZE) - 1);



	/*

	 * If bit_num > 5, we have to combine bits with next byte.

	 * Calculate how many bits we need to take from current byte (called

	 * here "residue_bits"), and add them to bits from next byte.

	 */



	residue_bits = 8 - bit_num;



	res = (ppe[byte_num + 1] &

	       (BIT(IEEE80211_PPE_THRES_INFO_PPET_SIZE - residue_bits) - 1)) <<

	      residue_bits;

	res += (ppe[byte_num] >> bit_num) & (BIT(residue_bits) - 1);



	return res;

}



static void iwl_mvm_cfg_he_sta(struct iwl_mvm *mvm,

			       struct ieee80211_vif *vif, u8 sta_id)

{

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

	struct iwl_he_sta_context_cmd sta_ctxt_cmd = {

		.sta_id = sta_id,

		.tid_limit = IWL_MAX_TID_COUNT,

		.bss_color = vif->bss_conf.bss_color,

		.htc_trig_based_pkt_ext = vif->bss_conf.htc_trig_based_pkt_ext,

		.frame_time_rts_th =

			cpu_to_le16(vif->bss_conf.frame_time_rts_th),

	};

	struct ieee80211_sta *sta;

	u32 flags;

	int i;



	rcu_read_lock();



	sta = rcu_dereference(mvm->fw_id_to_mac_id[sta_ctxt_cmd.sta_id]);

	if (IS_ERR(sta)) {

		rcu_read_unlock();

		WARN(1, "Can't find STA to configure HE\n");

		return;

	}



	if (!sta->he_cap.has_he) {

		rcu_read_unlock();

		return;

	}



	flags = 0;



	/* HTC flags */

	if (sta->he_cap.he_cap_elem.mac_cap_info[0] &

	    IEEE80211_HE_MAC_CAP0_HTC_HE)

		sta_ctxt_cmd.htc_flags |= cpu_to_le32(IWL_HE_HTC_SUPPORT);

	if ((sta->he_cap.he_cap_elem.mac_cap_info[1] &

	      IEEE80211_HE_MAC_CAP1_LINK_ADAPTATION) ||

	    (sta->he_cap.he_cap_elem.mac_cap_info[2] &

	      IEEE80211_HE_MAC_CAP2_LINK_ADAPTATION)) {

		u8 link_adap =

			((sta->he_cap.he_cap_elem.mac_cap_info[2] &

			  IEEE80211_HE_MAC_CAP2_LINK_ADAPTATION) << 1) +

			 (sta->he_cap.he_cap_elem.mac_cap_info[1] &

			  IEEE80211_HE_MAC_CAP1_LINK_ADAPTATION);



		if (link_adap == 2)

			sta_ctxt_cmd.htc_flags |=

				cpu_to_le32(IWL_HE_HTC_LINK_ADAP_UNSOLICITED);

		else if (link_adap == 3)

			sta_ctxt_cmd.htc_flags |=

				cpu_to_le32(IWL_HE_HTC_LINK_ADAP_BOTH);

	}

	if (sta->he_cap.he_cap_elem.mac_cap_info[2] &

	    IEEE80211_HE_MAC_CAP2_UL_MU_RESP_SCHED)

		sta_ctxt_cmd.htc_flags |=

			cpu_to_le32(IWL_HE_HTC_UL_MU_RESP_SCHED);

	if (sta->he_cap.he_cap_elem.mac_cap_info[2] & IEEE80211_HE_MAC_CAP2_BSR)

		sta_ctxt_cmd.htc_flags |= cpu_to_le32(IWL_HE_HTC_BSR_SUPP);

	if (sta->he_cap.he_cap_elem.mac_cap_info[3] &

	    IEEE80211_HE_MAC_CAP3_OMI_CONTROL)

		sta_ctxt_cmd.htc_flags |= cpu_to_le32(IWL_HE_HTC_OMI_SUPP);

	if (sta->he_cap.he_cap_elem.mac_cap_info[4] & IEEE80211_HE_MAC_CAP4_BQR)

		sta_ctxt_cmd.htc_flags |= cpu_to_le32(IWL_HE_HTC_BQR_SUPP);



	/* If PPE Thresholds exist, parse them into a FW-familiar format */

	if (sta->he_cap.he_cap_elem.phy_cap_info[6] &

	    IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT) {

		u8 nss = (sta->he_cap.ppe_thres[0] &

			  IEEE80211_PPE_THRES_NSS_MASK) + 1;

		u8 ru_index_bitmap =

			(sta->he_cap.ppe_thres[0] &

			 IEEE80211_PPE_THRES_RU_INDEX_BITMASK_MASK) >>

			IEEE80211_PPE_THRES_RU_INDEX_BITMASK_POS;

		u8 *ppe = &sta->he_cap.ppe_thres[0];

		u8 ppe_pos_bit = 7; /* Starting after PPE header */



		/*

		 * FW currently supports only nss == MAX_HE_SUPP_NSS

		 *

		 * If nss > MAX: we can ignore values we don't support

		 * If nss < MAX: we can set zeros in other streams

		 */

		if (nss > MAX_HE_SUPP_NSS) {

			IWL_INFO(mvm, "Got NSS = %d - trimming to %d\n", nss,

				 MAX_HE_SUPP_NSS);

			nss = MAX_HE_SUPP_NSS;

		}



		for (i = 0; i < nss; i++) {

			u8 ru_index_tmp = ru_index_bitmap << 1;

			u8 bw;



			for (bw = 0; bw < MAX_HE_CHANNEL_BW_INDX; bw++) {

				ru_index_tmp >>= 1;

				if (!(ru_index_tmp & 1))

					continue;



				sta_ctxt_cmd.pkt_ext.pkt_ext_qam_th[i][bw][1] =

					iwl_mvm_he_get_ppe_val(ppe,

							       ppe_pos_bit);

				ppe_pos_bit +=

					IEEE80211_PPE_THRES_INFO_PPET_SIZE;

				sta_ctxt_cmd.pkt_ext.pkt_ext_qam_th[i][bw][0] =

					iwl_mvm_he_get_ppe_val(ppe,

							       ppe_pos_bit);

				ppe_pos_bit +=

					IEEE80211_PPE_THRES_INFO_PPET_SIZE;

			}

		}



		flags |= STA_CTXT_HE_PACKET_EXT;

	}

	rcu_read_unlock();



	/* Mark MU EDCA as enabled, unless none detected on some AC */

	flags |= STA_CTXT_HE_MU_EDCA_CW;

	for (i = 0; i < AC_NUM; i++) {

		struct ieee80211_he_mu_edca_param_ac_rec *mu_edca =

			&mvmvif->queue_params[i].mu_edca_param_rec;



		if (!mvmvif->queue_params[i].mu_edca) {

			flags &= ~STA_CTXT_HE_MU_EDCA_CW;

			break;

		}



		sta_ctxt_cmd.trig_based_txf[i].cwmin =

			cpu_to_le16(mu_edca->ecw_min_max & 0xf);

		sta_ctxt_cmd.trig_based_txf[i].cwmax =

			cpu_to_le16((mu_edca->ecw_min_max & 0xf0) >> 4);

		sta_ctxt_cmd.trig_based_txf[i].aifsn =

			cpu_to_le16(mu_edca->aifsn);

		sta_ctxt_cmd.trig_based_txf[i].mu_time =

			cpu_to_le16(mu_edca->mu_edca_timer);

	}



	if (vif->bss_conf.multi_sta_back_32bit)

		flags |= STA_CTXT_HE_32BIT_BA_BITMAP;



	if (vif->bss_conf.ack_enabled)

		flags |= STA_CTXT_HE_ACK_ENABLED;



	if (vif->bss_conf.uora_exists) {

		flags |= STA_CTXT_HE_TRIG_RND_ALLOC;



		sta_ctxt_cmd.rand_alloc_ecwmin =

			vif->bss_conf.uora_ocw_range & 0x7;

		sta_ctxt_cmd.rand_alloc_ecwmax =

			(vif->bss_conf.uora_ocw_range >> 3) & 0x7;

	}



	/* TODO: support Multi BSSID IE */



	sta_ctxt_cmd.flags = cpu_to_le32(flags);



	if (iwl_mvm_send_cmd_pdu(mvm, iwl_cmd_id(STA_HE_CTXT_CMD,

						 DATA_PATH_GROUP, 0),

				 0, sizeof(sta_ctxt_cmd), &sta_ctxt_cmd))

		IWL_ERR(mvm, "Failed to config FW to work HE!\n");

}



static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm,

					     struct ieee80211_vif *vif,

					     struct ieee80211_bss_conf *bss_conf,
@@ -1910,8 +2099,12 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm, 
	 * beacon interval, which was not known when the station interface was

	 * added.

	 */

	if (changes & BSS_CHANGED_ASSOC && bss_conf->assoc)

	if (changes & BSS_CHANGED_ASSOC && bss_conf->assoc) {

		if (vif->bss_conf.he_support)

			iwl_mvm_cfg_he_sta(mvm, vif, mvmvif->ap_sta_id);



		iwl_mvm_mac_ctxt_recalc_tsf_id(mvm, vif);

	}



	/*

	 * If we're not associated yet, take the (new) BSSID before associating

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+1 −1
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ struct iwl_mvm_tcm { 
struct iwl_mvm_reorder_buffer {

	u16 head_sn;

	u16 num_stored;

	u8 buf_size;

	u16 buf_size;

	int queue;

	u16 last_amsdu;

	u8 last_sub_index;

drivers/net/wireless/intel/iwlwifi/mvm/ops.c

+1 −0
Original line number Diff line number Diff line
@@ -448,6 +448,7 @@ static const struct iwl_hcmd_names iwl_mvm_data_path_names[] = { 
	HCMD_NAME(DQA_ENABLE_CMD),

	HCMD_NAME(UPDATE_MU_GROUPS_CMD),

	HCMD_NAME(TRIGGER_RX_QUEUES_NOTIF_CMD),

	HCMD_NAME(STA_HE_CTXT_CMD),

	HCMD_NAME(STA_PM_NOTIF),

	HCMD_NAME(MU_GROUP_MGMT_NOTIF),

	HCMD_NAME(RX_QUEUES_NOTIFICATION),