Commit 4d401c55 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge tag 'wireless-2025-06-05' of... 

Merge tag 'wireless-2025-06-05' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless

Johannes Berg says:

====================
Couple of quick fixes:
 - iwlwifi/iwlmld crash on certain error paths
 - iwlwifi/iwlmld regulatory data mixup
 - iwlwifi/iwlmld suspend/resume fix
 - iwlwifi MSI (without -X) fix
 - cfg80211/mac80211 S1G parsing fixes

* tag 'wireless-2025-06-05' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless:
  wifi: cfg80211/mac80211: correctly parse S1G beacon optional elements
  wifi: iwlwifi: mld: Move regulatory domain initialization
  wifi: iwlwifi: pcie: fix non-MSIX handshake register
  wifi: iwlwifi: mld: avoid panic on init failure
  wifi: iwlwifi: mvm: fix assert on suspend
====================

Link: https://patch.msgid.link/20250605095443.17874-6-johannes@sipsolutions.net


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents edafd348 787fe16b

drivers/net/wireless/intel/iwlwifi/mld/fw.c

+4 −4
Original line number Diff line number Diff line
@@ -349,10 +349,6 @@ int iwl_mld_load_fw(struct iwl_mld *mld) 
	if (ret)

		goto err;



	ret = iwl_mld_init_mcc(mld);

	if (ret)

		goto err;



	mld->fw_status.running = true;



	return 0;
@@ -546,6 +542,10 @@ int iwl_mld_start_fw(struct iwl_mld *mld) 
	if (ret)

		goto error;



	ret = iwl_mld_init_mcc(mld);

	if (ret)

		goto error;



	return 0;



error:

drivers/net/wireless/intel/iwlwifi/mld/mld.c

+2 −1
Original line number Diff line number Diff line
@@ -653,7 +653,8 @@ iwl_mld_nic_error(struct iwl_op_mode *op_mode, 
	 * It might not actually be true that we'll restart, but the

	 * setting doesn't matter if we're going to be unbound either.

	 */

	if (type != IWL_ERR_TYPE_RESET_HS_TIMEOUT)

	if (type != IWL_ERR_TYPE_RESET_HS_TIMEOUT &&

	    mld->fw_status.running)

		mld->fw_status.in_hw_restart = true;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -6360,8 +6360,8 @@ void iwl_mvm_sync_rx_queues_internal(struct iwl_mvm *mvm, 
			(struct iwl_mvm_internal_rxq_notif *)cmd->payload;

	struct iwl_host_cmd hcmd = {

		.id = WIDE_ID(DATA_PATH_GROUP, TRIGGER_RX_QUEUES_NOTIF_CMD),

		.data[0] = &cmd,

		.len[0] = sizeof(cmd),

		.data[0] = cmd,

		.len[0] = __struct_size(cmd),

		.data[1] = data,

		.len[1] = size,

		.flags = CMD_SEND_IN_RFKILL | (sync ? 0 : CMD_ASYNC),

drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ void iwl_trans_pcie_fw_reset_handshake(struct iwl_trans *trans) 
			reset_done =

				inta_hw & MSIX_HW_INT_CAUSES_REG_RESET_DONE;

		} else {

			inta_hw = iwl_read32(trans, CSR_INT_MASK);

			inta_hw = iwl_read32(trans, CSR_INT);

			reset_done = inta_hw & CSR_INT_BIT_RESET_DONE;

		}

include/linux/ieee80211.h

+69 −10
Original line number Diff line number Diff line
@@ -111,6 +111,8 @@ 


/* bits unique to S1G beacon */

#define IEEE80211_S1G_BCN_NEXT_TBTT	0x100

#define IEEE80211_S1G_BCN_CSSID		0x200

#define IEEE80211_S1G_BCN_ANO		0x400



/* see 802.11ah-2016 9.9 NDP CMAC frames */

#define IEEE80211_S1G_1MHZ_NDP_BITS	25
@@ -153,9 +155,6 @@ 


#define IEEE80211_ANO_NETTYPE_WILD              15



/* bits unique to S1G beacon */

#define IEEE80211_S1G_BCN_NEXT_TBTT    0x100



/* control extension - for IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTL_EXT */

#define IEEE80211_CTL_EXT_POLL		0x2000

#define IEEE80211_CTL_EXT_SPR		0x3000
@@ -627,6 +626,42 @@ static inline bool ieee80211_is_s1g_beacon(__le16 fc) 
	       cpu_to_le16(IEEE80211_FTYPE_EXT | IEEE80211_STYPE_S1G_BEACON);

}



/**

 * ieee80211_s1g_has_next_tbtt - check if IEEE80211_S1G_BCN_NEXT_TBTT

 * @fc: frame control bytes in little-endian byteorder

 * Return: whether or not the frame contains the variable-length

 *	next TBTT field

 */

static inline bool ieee80211_s1g_has_next_tbtt(__le16 fc)

{

	return ieee80211_is_s1g_beacon(fc) &&

		(fc & cpu_to_le16(IEEE80211_S1G_BCN_NEXT_TBTT));

}



/**

 * ieee80211_s1g_has_ano - check if IEEE80211_S1G_BCN_ANO

 * @fc: frame control bytes in little-endian byteorder

 * Return: whether or not the frame contains the variable-length

 *	ANO field

 */

static inline bool ieee80211_s1g_has_ano(__le16 fc)

{

	return ieee80211_is_s1g_beacon(fc) &&

		(fc & cpu_to_le16(IEEE80211_S1G_BCN_ANO));

}



/**

 * ieee80211_s1g_has_cssid - check if IEEE80211_S1G_BCN_CSSID

 * @fc: frame control bytes in little-endian byteorder

 * Return: whether or not the frame contains the variable-length

 *	compressed SSID field

 */

static inline bool ieee80211_s1g_has_cssid(__le16 fc)

{

	return ieee80211_is_s1g_beacon(fc) &&

		(fc & cpu_to_le16(IEEE80211_S1G_BCN_CSSID));

}



/**

 * ieee80211_is_s1g_short_beacon - check if frame is an S1G short beacon

 * @fc: frame control bytes in little-endian byteorder
@@ -1245,16 +1280,40 @@ struct ieee80211_ext { 
			u8 change_seq;

			u8 variable[0];

		} __packed s1g_beacon;

		struct {

			u8 sa[ETH_ALEN];

			__le32 timestamp;

			u8 change_seq;

			u8 next_tbtt[3];

			u8 variable[0];

		} __packed s1g_short_beacon;

	} u;

} __packed __aligned(2);



/**

 * ieee80211_s1g_optional_len - determine length of optional S1G beacon fields

 * @fc: frame control bytes in little-endian byteorder

 * Return: total length in bytes of the optional fixed-length fields

 *

 * S1G beacons may contain up to three optional fixed-length fields that

 * precede the variable-length elements. Whether these fields are present

 * is indicated by flags in the frame control field.

 *

 * From IEEE 802.11-2024 section 9.3.4.3:

 *  - Next TBTT field may be 0 or 3 bytes

 *  - Short SSID field may be 0 or 4 bytes

 *  - Access Network Options (ANO) field may be 0 or 1 byte

 */

static inline size_t

ieee80211_s1g_optional_len(__le16 fc)

{

	size_t len = 0;



	if (ieee80211_s1g_has_next_tbtt(fc))

		len += 3;



	if (ieee80211_s1g_has_cssid(fc))

		len += 4;



	if (ieee80211_s1g_has_ano(fc))

		len += 1;



	return len;

}



#define IEEE80211_TWT_CONTROL_NDP			BIT(0)

#define IEEE80211_TWT_CONTROL_RESP_MODE			BIT(1)

#define IEEE80211_TWT_CONTROL_NEG_TYPE_BROADCAST	BIT(3)