Commit c3e5f5f6 authored by Miri Korenblit's avatar Miri Korenblit Committed by Johannes Berg
Browse files

wifi: iwlwifi: add support for activating UNII-1 in WW via BIOS 



There is a requirement from OEMs to support a new bit in DSM function 8,
which will indicate that this device is an indoor one, and that it
should activate UNII-1 (5.2GHz) sub band in the World Wide Geo Profile.
Add support for this by reading this bit from BIOS and sending it to the
FW.

Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20231011130030.86d4ad178042.Ief40acc08b5482ff147fd17e74e36f1933e43def@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 7b404c5c

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

+13 −4
Original line number Diff line number Diff line
@@ -605,6 +605,7 @@ struct iwl_lari_config_change_cmd_v6 { 


/**

 * struct iwl_lari_config_change_cmd_v7 - change LARI configuration

 * This structure is used also for lari cmd version 8.

 * @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.
@@ -614,9 +615,12 @@ struct iwl_lari_config_change_cmd_v6 { 
 * @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.

 * @chan_state_active_bitmap: Bitmap for overriding channel state to active.

 *     Each bit represents a country or region to activate, according to the

 *     BIOS definitions.

 * @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 7 - bits 0:3 are supported.

 *     For LARI cmd version 8 - 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
@@ -631,7 +635,12 @@ struct iwl_lari_config_change_cmd_v7 { 
	__le32 chan_state_active_bitmap;

	__le32 force_disable_channels_bitmap;

	__le32 edt_bitmap;

} __packed; /* LARI_CHANGE_CONF_CMD_S_VER_7 */

} __packed;

/* LARI_CHANGE_CONF_CMD_S_VER_7 */

/* LARI_CHANGE_CONF_CMD_S_VER_8 */



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

#define ACTIVATE_5G2_IN_WW_MASK	BIT(4)



/**

 * struct iwl_pnvm_init_complete_ntfy - PNVM initialization complete

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

+9 −5
Original line number Diff line number Diff line
@@ -1233,6 +1233,9 @@ static void iwl_mvm_lari_cfg(struct iwl_mvm *mvm) 
	int ret;

	u32 value;

	struct iwl_lari_config_change_cmd_v7 cmd = {};

	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm->fw,

					   WIDE_ID(REGULATORY_AND_NVM_GROUP,

						   LARI_CONFIG_CHANGE), 1);



	cmd.config_bitmap = iwl_acpi_get_lari_config_bitmap(&mvm->fwrt);
@@ -1250,8 +1253,11 @@ static void iwl_mvm_lari_cfg(struct iwl_mvm *mvm) 
	ret = iwl_acpi_get_dsm_u32(mvm->fwrt.dev, 0,

				   DSM_FUNC_ACTIVATE_CHANNEL,

				   &iwl_guid, &value);

	if (!ret)

	if (!ret) {

		if (cmd_ver < 8)

			value &= ~ACTIVATE_5G2_IN_WW_MASK;

		cmd.chan_state_active_bitmap = cpu_to_le32(value);

	}



	ret = iwl_acpi_get_dsm_u32(mvm->fwrt.dev, 0,

				   DSM_FUNC_ENABLE_6E,
@@ -1279,11 +1285,9 @@ static void iwl_mvm_lari_cfg(struct iwl_mvm *mvm) 
	    cmd.force_disable_channels_bitmap ||

	    cmd.edt_bitmap) {

		size_t cmd_size;

		u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm->fw,

						   WIDE_ID(REGULATORY_AND_NVM_GROUP,

							   LARI_CONFIG_CHANGE),

						   1);



		switch (cmd_ver) {

		case 8:

		case 7:

			cmd_size = sizeof(struct iwl_lari_config_change_cmd_v7);

			break;