Commit 1f578d4f authored by Miri Korenblit's avatar Miri Korenblit Committed by Luca Coelho
Browse files

iwlwifi: mvm: Read acpi dsm to get channel activation bitmap 



Read the bitmap from the ACPI and pass it to he FW
through LARI_CONFIG_CHANGE_CMD.

This allows OEMs to override channel state to active
as per Geo Location bitmap.

Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20211017165728.23d4f2d182c0.I39ac5ff74ac6f2223f393657205eddc1c8e48890@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 66198ac5

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

+2 −1
Original line number Diff line number Diff line
@@ -116,7 +116,8 @@ enum iwl_dsm_funcs_rev_0 { 
	DSM_FUNC_DISABLE_SRD = 1,

	DSM_FUNC_ENABLE_INDONESIA_5G2 = 2,

	DSM_FUNC_11AX_ENABLEMENT = 6,

	DSM_FUNC_ENABLE_UNII4_CHAN = 7

	DSM_FUNC_ENABLE_UNII4_CHAN = 7,

	DSM_FUNC_ACTIVATE_CHANNEL = 8

};



enum iwl_dsm_values_srd {

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

+23 −0
Original line number Diff line number Diff line
@@ -471,6 +471,29 @@ struct iwl_lari_config_change_cmd_v4 { 
	__le32 oem_unii4_allow_bitmap;

} __packed; /* LARI_CHANGE_CONF_CMD_S_VER_4 */



/**

 * struct iwl_lari_config_change_cmd_v5 - 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.

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

 */

struct iwl_lari_config_change_cmd_v5 {

	__le32 config_bitmap;

	__le32 oem_uhb_allow_bitmap;

	__le32 oem_11ax_allow_bitmap;

	__le32 oem_unii4_allow_bitmap;

	__le32 chan_state_active_bitmap;

} __packed; /* LARI_CHANGE_CONF_CMD_S_VER_5 */



/**

 * struct iwl_pnvm_init_complete_ntfy - PNVM initialization complete

 * @status: PNVM image loading status

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

+14 −4
Original line number Diff line number Diff line
@@ -1139,7 +1139,7 @@ static void iwl_mvm_lari_cfg(struct iwl_mvm *mvm) 
{

	int ret;

	u32 value;

	struct iwl_lari_config_change_cmd_v4 cmd = {};

	struct iwl_lari_config_change_cmd_v5 cmd = {};



	cmd.config_bitmap = iwl_acpi_get_lari_config_bitmap(&mvm->fwrt);
@@ -1155,14 +1155,23 @@ static void iwl_mvm_lari_cfg(struct iwl_mvm *mvm) 
	if (!ret)

		cmd.oem_unii4_allow_bitmap = cpu_to_le32(value);



	ret = iwl_acpi_get_dsm_u32((&mvm->fwrt)->dev, 0,

				   DSM_FUNC_ACTIVATE_CHANNEL,

				   &iwl_guid, &value);

	if (!ret)

		cmd.chan_state_active_bitmap = cpu_to_le32(value);



	if (cmd.config_bitmap ||

	    cmd.oem_11ax_allow_bitmap ||

	    cmd.oem_unii4_allow_bitmap) {

	    cmd.oem_unii4_allow_bitmap ||

	    cmd.chan_state_active_bitmap) {

		size_t cmd_size;

		u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm->fw,

						   REGULATORY_AND_NVM_GROUP,

						   LARI_CONFIG_CHANGE, 1);

		if (cmd_ver == 4)

		if (cmd_ver == 5)

			cmd_size = sizeof(struct iwl_lari_config_change_cmd_v5);

		else if (cmd_ver == 4)

			cmd_size = sizeof(struct iwl_lari_config_change_cmd_v4);

		else if (cmd_ver == 3)

			cmd_size = sizeof(struct iwl_lari_config_change_cmd_v3);
@@ -1176,8 +1185,9 @@ static void iwl_mvm_lari_cfg(struct iwl_mvm *mvm) 
				le32_to_cpu(cmd.config_bitmap),

				le32_to_cpu(cmd.oem_11ax_allow_bitmap));

		IWL_DEBUG_RADIO(mvm,

				"sending LARI_CONFIG_CHANGE, oem_unii4_allow_bitmap=0x%x, cmd_ver=%d\n",

				"sending LARI_CONFIG_CHANGE, oem_unii4_allow_bitmap=0x%x, chan_state_active_bitmap=0x%x, cmd_ver=%d\n",

				le32_to_cpu(cmd.oem_unii4_allow_bitmap),

				le32_to_cpu(cmd.chan_state_active_bitmap),

				cmd_ver);

		ret = iwl_mvm_send_cmd_pdu(mvm,

					   WIDE_ID(REGULATORY_AND_NVM_GROUP,