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

Commit 5328b633 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-next-for-davem-2019-02-22' of... 

Merge tag 'mac80211-next-for-davem-2019-02-22' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Johannes Berg says:

====================
This time we have, of note:
 * the massive patch series for multi-BSSID support, I ended up
   applying that through a side branch to record some details
 * CSA improvements
 * HE (802.11ax) updates to Draft 3.3
 * strongly typed element iteration/etc. to make such code more
   readable - this came up in particular in multi-BSSID
 * rhashtable conversion patches from Herbert
Along, as usual, with various fixes and improvements.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2fce40a5 6c4128f6

drivers/net/wireless/intel/iwlwifi/fw/api/mac.h

+24 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2017        Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -29,7 +29,7 @@ 
 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2017        Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -433,6 +433,28 @@ struct iwl_he_backoff_conf { 
	__le16 mu_time;

} __packed; /* AC_QOS_DOT11AX_API_S */



/**

 * enum iwl_he_pkt_ext_constellations - PPE constellation indices

 * @IWL_HE_PKT_EXT_BPSK: BPSK

 * @IWL_HE_PKT_EXT_QPSK:  QPSK

 * @IWL_HE_PKT_EXT_16QAM: 16-QAM

 * @IWL_HE_PKT_EXT_64QAM: 64-QAM

 * @IWL_HE_PKT_EXT_256QAM: 256-QAM

 * @IWL_HE_PKT_EXT_1024QAM: 1024-QAM

 * @IWL_HE_PKT_EXT_RESERVED: reserved value

 * @IWL_HE_PKT_EXT_NONE: not defined

 */

enum iwl_he_pkt_ext_constellations {

	IWL_HE_PKT_EXT_BPSK = 0,

	IWL_HE_PKT_EXT_QPSK,

	IWL_HE_PKT_EXT_16QAM,

	IWL_HE_PKT_EXT_64QAM,

	IWL_HE_PKT_EXT_256QAM,

	IWL_HE_PKT_EXT_1024QAM,

	IWL_HE_PKT_EXT_RESERVED,

	IWL_HE_PKT_EXT_NONE,

};



#define MAX_HE_SUPP_NSS	2

#define MAX_HE_CHANNEL_BW_INDX	4

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

+21 −37
Original line number Diff line number Diff line
@@ -479,7 +479,6 @@ static struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
					IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_8,

				.mac_cap_info[2] =

					IEEE80211_HE_MAC_CAP2_32BIT_BA_BITMAP |

					IEEE80211_HE_MAC_CAP2_MU_CASCADING |

					IEEE80211_HE_MAC_CAP2_ACK_EN,

				.mac_cap_info[3] =

					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
@@ -490,7 +489,9 @@ static struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
				.mac_cap_info[5] =

					IEEE80211_HE_MAC_CAP5_MULTI_TID_AGG_TX_QOS_B40 |

					IEEE80211_HE_MAC_CAP5_MULTI_TID_AGG_TX_QOS_B41 |

					IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU,

					IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU |

					IEEE80211_HE_MAC_CAP5_HE_DYNAMIC_SM_PS |

					IEEE80211_HE_MAC_CAP5_HT_VHT_TRIG_FRAME_RX,

				.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 |
@@ -498,18 +499,13 @@ static struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
				.phy_cap_info[1] =

					IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK |

					IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A |

					IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD |

					IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_TX_MAX_NSTS,

					IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD,

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

					IEEE80211_HE_PHY_CAP2_UL_MU_FULL_MU_MIMO |

					IEEE80211_HE_PHY_CAP2_UL_MU_PARTIAL_MU_MIMO,

					IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US,

				.phy_cap_info[3] =

					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_BPSK |

					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_NO_DCM |

					IEEE80211_HE_PHY_CAP3_DCM_MAX_TX_NSS_1 |

					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_BPSK |

					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_NO_DCM |

					IEEE80211_HE_PHY_CAP3_DCM_MAX_RX_NSS_1,

				.phy_cap_info[4] =

					IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE |
@@ -517,16 +513,8 @@ static struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
					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,

					IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_2,

				.phy_cap_info[6] =

					IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_42_SU |

					IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_75_MU |

					IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMER_FB |

					IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB |

					IEEE80211_HE_PHY_CAP6_TRIG_CQI_FB |

					IEEE80211_HE_PHY_CAP6_PARTIAL_BANDWIDTH_DL_MUMIMO |

					IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT,

				.phy_cap_info[7] =

					IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_AR |
@@ -537,11 +525,12 @@ static struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
					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,

					IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_2x996,

				.phy_cap_info[9] =

					IEEE80211_HE_PHY_CAP9_NON_TRIGGERED_CQI_FEEDBACK |

					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,

					IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB |

					IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED,

			},

			/*

			 * Set default Tx/Rx HE MCS NSS Support field.
@@ -575,28 +564,26 @@ static struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
					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,

				.mac_cap_info[5] =

					IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU,

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

					IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD,

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

					IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US,

				.phy_cap_info[3] =

					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_BPSK |

					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_NO_DCM |

					IEEE80211_HE_PHY_CAP3_DCM_MAX_TX_NSS_1 |

					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_BPSK |

					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_NO_DCM |

					IEEE80211_HE_PHY_CAP3_DCM_MAX_RX_NSS_1,

				.phy_cap_info[4] =

					IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE |
@@ -604,12 +591,8 @@ static struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
					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,

					IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_2,

				.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 |
@@ -619,10 +602,11 @@ static struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
					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,

					IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_2x996,

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

					IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB |

					IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED,

			},

			/*

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

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

+40 −0
Original line number Diff line number Diff line
@@ -2182,6 +2182,46 @@ static void iwl_mvm_cfg_he_sta(struct iwl_mvm *mvm, 
		}



		flags |= STA_CTXT_HE_PACKET_EXT;

	} else if ((sta->he_cap.he_cap_elem.phy_cap_info[9] &

		    IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_MASK) !=

		  IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED) {

		int low_th = -1;

		int high_th = -1;



		/* Take the PPE thresholds from the nominal padding info */

		switch (sta->he_cap.he_cap_elem.phy_cap_info[9] &

			IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_MASK) {

		case IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_0US:

			low_th = IWL_HE_PKT_EXT_NONE;

			high_th = IWL_HE_PKT_EXT_NONE;

			break;

		case IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_8US:

			low_th = IWL_HE_PKT_EXT_BPSK;

			high_th = IWL_HE_PKT_EXT_NONE;

			break;

		case IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_16US:

			low_th = IWL_HE_PKT_EXT_NONE;

			high_th = IWL_HE_PKT_EXT_BPSK;

			break;

		}



		/* Set the PPE thresholds accordingly */

		if (low_th >= 0 && high_th >= 0) {

			u8 ***pkt_ext_qam =

				(void *)sta_ctxt_cmd.pkt_ext.pkt_ext_qam_th;



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

				u8 bw;



				for (bw = 0; bw < MAX_HE_CHANNEL_BW_INDX;

				     bw++) {

					pkt_ext_qam[i][bw][0] = low_th;

					pkt_ext_qam[i][bw][1] = high_th;

				}

			}



			flags |= STA_CTXT_HE_PACKET_EXT;

		}

	}

	rcu_read_unlock();

drivers/net/wireless/mac80211_hwsim.c

+5 −2
Original line number Diff line number Diff line
@@ -1273,10 +1273,12 @@ static bool mac80211_hwsim_tx_frame_no_nl(struct ieee80211_hw *hw, 
	 * probably doesn't really matter.

	 */

	if (ieee80211_is_beacon(hdr->frame_control) ||

	    ieee80211_is_probe_resp(hdr->frame_control))

	    ieee80211_is_probe_resp(hdr->frame_control)) {

		rx_status.boottime_ns = ktime_get_boot_ns();

		now = data->abs_bcn_ts;

	else

	} else {

		now = mac80211_hwsim_get_tsf_raw();

	}



	/* Copy skb to all enabled radios that are on the current frequency */

	spin_lock(&hwsim_radio_lock);
@@ -2799,6 +2801,7 @@ static int mac80211_hwsim_new_radio(struct genl_info *info, 
	ieee80211_hw_set(hw, TDLS_WIDER_BW);

	if (rctbl)

		ieee80211_hw_set(hw, SUPPORTS_RC_TABLE);

	ieee80211_hw_set(hw, SUPPORTS_MULTI_BSSID);



	hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_TDLS |

			    WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL |

drivers/net/wireless/virt_wifi.c

+0 −1
Original line number Diff line number Diff line
@@ -360,7 +360,6 @@ static struct wiphy *virt_wifi_make_wiphy(void) 
	wiphy->bands[NL80211_BAND_5GHZ] = &band_5ghz;

	wiphy->bands[NL80211_BAND_60GHZ] = NULL;



	wiphy->regulatory_flags = REGULATORY_WIPHY_SELF_MANAGED;

	wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);



	priv = wiphy_priv(wiphy);