Commit e6be197f authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-next-2024-04-24' of... 

Merge tag 'wireless-next-2024-04-24' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next

Kalle Valo says:

====================
wireless-next patches for v6.10

The second "new features" pull request for v6.10 with changes both in
stack and in drivers. This time the pull request is rather small and
nothing special standing out except maybe that we have several
kernel-doc fixes. Great to see that we are getting warning free
wireless code (until new warnings are added).

Major changes:

rtl8xxxu:
 * enable Management Frame Protection (MFP) support

rtw88:
 * disable unsupported interface type of mesh point for all chips, and only
   support station mode for SDIO chips.

* tag 'wireless-next-2024-04-24' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next: (63 commits)
  wifi: mac80211: handle link ID during management Tx
  wifi: mac80211: handle sdata->u.ap.active flag with MLO
  wifi: cfg80211: add return docs for regulatory functions
  wifi: cfg80211: make some regulatory functions void
  wifi: mac80211: add return docs for sta_info_flush()
  wifi: mac80211: keep mac80211 consistent on link activation failure
  wifi: mac80211: simplify ieee80211_assign_link_chanctx()
  wifi: mac80211: reserve chanctx during find
  wifi: cfg80211: fix cfg80211 function kernel-doc
  wifi: mac80211_hwsim: Use wider regulatory for custom for 6GHz tests
  wifi: iwlwifi: mvm: Don't allow EMLSR when the RSSI is low
  wifi: iwlwifi: mvm: disable EMLSR when we suspend with wowlan
  wifi: iwlwifi: mvm: get periodic statistics in EMLSR
  wifi: iwlwifi: mvm: don't recompute EMLSR mode in can_activate_links
  wifi: iwlwifi: mvm: implement EMLSR prevention mechanism.
  wifi: iwlwifi: mvm: exit EMLSR upon missed beacon
  wifi: iwlwifi: mvm: init vif works only once
  wifi: iwlwifi: mvm: Add helper functions to update EMLSR status
  wifi: iwlwifi: mvm: Implement new link selection algorithm
  wifi: iwlwifi: mvm: move EMLSR/links code
  ...
====================

Link: https://lore.kernel.org/r/20240424100122.217AEC113CE@smtp.kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents ed93293b b0d2d8f9

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

+3 −3
Original line number Diff line number Diff line
@@ -4549,7 +4549,7 @@ brcmf_configure_wpaie(struct brcmf_if *ifp, 


	if (!brcmf_valid_wpa_oui(&data[offset], is_rsn_ie)) {

		err = -EINVAL;

		bphy_err(drvr, "ivalid OUI\n");

		bphy_err(drvr, "invalid OUI\n");

		goto exit;

	}

	offset += TLV_OUI_LEN;
@@ -4588,7 +4588,7 @@ brcmf_configure_wpaie(struct brcmf_if *ifp, 
	for (i = 0; i < count; i++) {

		if (!brcmf_valid_wpa_oui(&data[offset], is_rsn_ie)) {

			err = -EINVAL;

			bphy_err(drvr, "ivalid OUI\n");

			bphy_err(drvr, "invalid OUI\n");

			goto exit;

		}

		offset += TLV_OUI_LEN;
@@ -4622,7 +4622,7 @@ brcmf_configure_wpaie(struct brcmf_if *ifp, 
	for (i = 0; i < count; i++) {

		if (!brcmf_valid_wpa_oui(&data[offset], is_rsn_ie)) {

			err = -EINVAL;

			bphy_err(drvr, "ivalid OUI\n");

			bphy_err(drvr, "invalid OUI\n");

			goto exit;

		}

		offset += TLV_OUI_LEN;

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

+35 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause

/*

 * Copyright (C) 2017 Intel Deutschland GmbH

 * Copyright (C) 2019-2023 Intel Corporation

 * Copyright (C) 2019-2024 Intel Corporation

 */

#include <linux/uuid.h>

#include "iwl-drv.h"
@@ -960,3 +960,37 @@ void iwl_acpi_get_guid_lock_status(struct iwl_fw_runtime *fwrt) 
	kfree(data);

}

IWL_EXPORT_SYMBOL(iwl_acpi_get_guid_lock_status);



int iwl_acpi_get_wbem(struct iwl_fw_runtime *fwrt, u32 *value)

{

	union acpi_object *wifi_pkg, *data;

	int ret = -ENOENT;

	int tbl_rev;



	data = iwl_acpi_get_object(fwrt->dev, ACPI_WBEM_METHOD);

	if (IS_ERR(data))

		return ret;



	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt->dev, data,

					 ACPI_WBEM_WIFI_DATA_SIZE,

					 &tbl_rev);

	if (IS_ERR(wifi_pkg))

		goto out_free;



	if (tbl_rev != IWL_ACPI_WBEM_REVISION) {

		IWL_DEBUG_RADIO(fwrt, "Unsupported ACPI WBEM revision:%d\n",

				tbl_rev);

		goto out_free;

	}



	if (wifi_pkg->package.elements[1].type != ACPI_TYPE_INTEGER)

		goto out_free;



	*value = wifi_pkg->package.elements[1].integer.value &

		 IWL_ACPI_WBEM_REV0_MASK;

	IWL_DEBUG_RADIO(fwrt, "Loaded WBEM config from ACPI\n");

	ret = 0;

out_free:

	kfree(data);

	return ret;

}

drivers/net/wireless/intel/iwlwifi/fw/acpi.h

+16 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#define ACPI_WTAS_METHOD	"WTAS"

#define ACPI_WPFC_METHOD	"WPFC"

#define ACPI_GLAI_METHOD	"GLAI"

#define ACPI_WBEM_METHOD	"WBEM"



#define ACPI_WIFI_DOMAIN	(0x07)
@@ -67,6 +68,12 @@ 
#define ACPI_WRDD_WIFI_DATA_SIZE	2

#define ACPI_SPLC_WIFI_DATA_SIZE	2

#define ACPI_ECKV_WIFI_DATA_SIZE	2



/*

 * One element for domain type,

 * and one for enablement of Wi-Fi 320MHz per MCC

 */

#define ACPI_WBEM_WIFI_DATA_SIZE	2

/*

 * One element for domain type,

 * and one for the status
@@ -94,6 +101,9 @@ 


#define ACPI_DSM_REV 0



#define IWL_ACPI_WBEM_REV0_MASK (BIT(0) | BIT(1))

#define IWL_ACPI_WBEM_REVISION 0



#ifdef CONFIG_ACPI



struct iwl_fw_runtime;
@@ -142,6 +152,7 @@ void iwl_acpi_get_guid_lock_status(struct iwl_fw_runtime *fwrt); 
int iwl_acpi_get_dsm(struct iwl_fw_runtime *fwrt,

		     enum iwl_dsm_funcs func, u32 *value);



int iwl_acpi_get_wbem(struct iwl_fw_runtime *fwrt, u32 *value);

#else /* CONFIG_ACPI */



static inline void *iwl_acpi_get_dsm_object(struct device *dev, int rev,
@@ -205,6 +216,11 @@ static inline int iwl_acpi_get_dsm(struct iwl_fw_runtime *fwrt, 
{

	return -ENOENT;

}



static inline int iwl_acpi_get_wbem(struct iwl_fw_runtime *fwrt, u32 *value)

{

	return -ENOENT;

}

#endif /* CONFIG_ACPI */



#endif /* __iwl_fw_acpi__ */

drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h

+43 −3
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#ifndef __iwl_fw_api_nvm_reg_h__

#define __iwl_fw_api_nvm_reg_h__



#include "fw/regulatory.h"

/**

 * enum iwl_regulatory_and_nvm_subcmd_ids - regulatory/NVM commands

 */
@@ -23,8 +22,9 @@ enum iwl_regulatory_and_nvm_subcmd_ids { 
	 *	&struct iwl_lari_config_change_cmd_v3,

	 *	&struct iwl_lari_config_change_cmd_v4,

	 *	&struct iwl_lari_config_change_cmd_v5,

	 *	&struct iwl_lari_config_change_cmd_v6 or

	 *	&struct iwl_lari_config_change_cmd_v7

	 *	&struct iwl_lari_config_change_cmd_v6,

	 *	&struct iwl_lari_config_change_cmd_v7 or

	 *	&struct iwl_lari_config_change_cmd

	 */

	LARI_CONFIG_CHANGE = 0x1,
@@ -439,6 +439,7 @@ enum iwl_mcc_source { 
	MCC_SOURCE_GETTING_MCC_TEST_MODE = 0x11,

};



#define IWL_WTAS_BLACK_LIST_MAX		16

/**

 * struct iwl_tas_config_cmd_common - configures the TAS.

 * This is also the v2 structure.
@@ -646,6 +647,45 @@ struct iwl_lari_config_change_cmd_v7 { 
/* LARI_CHANGE_CONF_CMD_S_VER_8 */

/* LARI_CHANGE_CONF_CMD_S_VER_9 */



/**

 * struct iwl_lari_config_change_cmd - change LARI configuration

 * @config_bitmap: Bitmap of the config commands. Each bit will trigger a

 *	different predefined FW config operation.

 * @oem_uhb_allow_bitmap: Bitmap of UHB enabled MCC sets.

 * @oem_11ax_allow_bitmap: Bitmap of 11ax allowed MCCs. There are two bits

 *	per country, one to indicate whether to override and the other to

 *	indicate the value to use.

 * @oem_unii4_allow_bitmap: Bitmap of unii4 allowed MCCs.There are two bits

 *	per country, one to indicate whether to override and the other to

 *	indicate allow/disallow unii4 channels.

 *	For LARI cmd version 10 - bits 0:5 are supported.

 * @chan_state_active_bitmap: Bitmap to enable different bands per country

 *	or region.

 *	Each bit represents a country or region, and a band to activate

 *	according to the BIOS definitions.

 *	For LARI cmd version 10 - bits 0:4 are supported.

 * @force_disable_channels_bitmap: Bitmap of disabled bands/channels.

 *	Each bit represents a set of channels in a specific band that should be

 *	disabled

 * @edt_bitmap: Bitmap of energy detection threshold table.

 *	Disable/enable the EDT optimization method for different band.

 * @oem_320mhz_allow_bitmap: 320Mhz bandwidth enablement bitmap per MCC.

 *	bit0: enable 320Mhz in Japan.

 *	bit1: enable 320Mhz in South Korea.

 *	bit 2 - 31: reserved.

 */

struct iwl_lari_config_change_cmd {

	__le32 config_bitmap;

	__le32 oem_uhb_allow_bitmap;

	__le32 oem_11ax_allow_bitmap;

	__le32 oem_unii4_allow_bitmap;

	__le32 chan_state_active_bitmap;

	__le32 force_disable_channels_bitmap;

	__le32 edt_bitmap;

	__le32 oem_320mhz_allow_bitmap;

} __packed;

/* LARI_CHANGE_CONF_CMD_S_VER_10 */



/* Activate UNII-1 (5.2GHz) for World Wide */

#define ACTIVATE_5G2_IN_WW_MASK	BIT(4)

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

+6 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */

/*

 * Copyright (C) 2012-2014, 2019-2022 Intel Corporation

 * Copyright (C) 2012-2014, 2019-2022, 2024 Intel Corporation

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

 * Copyright (C) 2016-2017 Intel Deutschland GmbH

 */
@@ -42,6 +42,11 @@ enum iwl_phy_ops_subcmd_ids { 
	 */

	PER_PLATFORM_ANT_GAIN_CMD = 0x07,



	/**

	 * @AP_TX_POWER_CONSTRAINTS_CMD: &struct iwl_txpower_constraints_cmd

	 */

	AP_TX_POWER_CONSTRAINTS_CMD = 0x0C,



	/**

	 * @CT_KILL_NOTIFICATION: &struct ct_kill_notif

	 */