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

Commit 60d3faba authored by Shaul Triebitz's avatar Shaul Triebitz Committed by Gerrit - the friendly Code Review server
Browse files

iwlwifi: split HE capabilities between AP and STA 



HE capabilities differ between AP and STA.

Signed-off-by: default avatarShaul Triebitz <shaul.triebitz@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Git-commit: 57a3a454f30368f9b52ef406feff09571448e84e
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git


CRs-Fixed: 2743684
Change-Id: I4886fa9f42ae9f8dd3ff3c7176c495ec26b62791
Signed-off-by: default avatarVinita S. Maloo <vmaloo@codeaurora.org>
parent 26e94200

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

+188 −101
Original line number Diff line number Diff line
@@ -498,8 +498,9 @@ 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),

static struct ieee80211_sband_iftype_data iwl_he_capa[] = {

	{

		.types_mask = BIT(NL80211_IFTYPE_STATION),

		.he_cap = {

			.has_he = true,

			.he_cap_elem = {
@@ -576,9 +577,9 @@ static struct ieee80211_sband_iftype_data iwl_he_capa = { 
					IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB,

			},

			/*

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

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

		 * cases

			 * 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),
@@ -589,11 +590,93 @@ static struct ieee80211_sband_iftype_data iwl_he_capa = { 
				.tx_mcs_80p80 = cpu_to_le16(0xffff),

			},

			/*

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

		 * to 7

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

			 * PPET8 set to 7

			 */

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

		},

	},

	{

		.types_mask = 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_RX_QOS_8,

				.mac_cap_info[2] =

					IEEE80211_HE_MAC_CAP2_BSR |

					IEEE80211_HE_MAC_CAP2_MU_CASCADING |

					IEEE80211_HE_MAC_CAP2_ACK_EN,

				.mac_cap_info[3] =

					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,

				.mac_cap_info[4] =

					IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,

				.phy_cap_info[0] =

					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_LDPC_CODING_IN_PAYLOAD |

					IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_TX_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 |

					IEEE80211_HE_PHY_CAP5_NG16_SU_FEEDBACK |

					IEEE80211_HE_PHY_CAP5_NG16_MU_FEEDBACK,

				.phy_cap_info[6] =

					IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_42_SU |

					IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_75_MU |

					IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT,

				.phy_cap_info[7] =

					IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI |

					IEEE80211_HE_PHY_CAP7_MAX_NC_1,

				.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 |

					IEEE80211_HE_PHY_CAP8_DCM_MAX_BW_160_OR_80P80_MHZ,

				.phy_cap_info[9] =

					IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB |

					IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB,

			},

			/*

			 * 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,
@@ -601,22 +684,26 @@ static void iwl_init_he_hw_capab(struct ieee80211_supported_band *sband, 
{

	if (sband->band == NL80211_BAND_2GHZ ||

	    sband->band == NL80211_BAND_5GHZ)

		sband->iftype_data = &iwl_he_capa;

		sband->iftype_data = iwl_he_capa;

	else

		return;



	sband->n_iftype_data = 1;

	sband->n_iftype_data = ARRAY_SIZE(iwl_he_capa);



	/* 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] &=

		int i;



		for (i = 0; i < sband->n_iftype_data; i++) {

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

				~IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_TX_MAX_NSTS;

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

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

				~IEEE80211_HE_PHY_CAP2_MIDAMBLE_RX_TX_MAX_NSTS;

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

			iwl_he_capa[i].he_cap.he_cap_elem.phy_cap_info[7] &=

				~IEEE80211_HE_PHY_CAP7_MAX_NC_MASK;

		}

	}

}



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

			    struct iwl_nvm_data *data,