Commit 54b4fda5 authored by Abhishek Naik's avatar Abhishek Naik Committed by Luca Coelho
Browse files

iwlwifi: mvm: Read acpi dsm to get unii4 enable/disable bitmap. 



Read the UNII4 setting from the ACPI table and use it in the
LARI_CONFIG_CHANGE_CMD accordingly.

This setting allows OEMs to enable or disable UNII4, bypassing the FW
defaults.

Signed-off-by: default avatarAbhishek Naik <abhishek.naik@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210617100544.223090c509c4.If03cb5393607ae494041b6187bcec134d6a1e06d@changeid


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

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

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ 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

};



enum iwl_dsm_values_srd {

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

+19 −0
Original line number Diff line number Diff line
@@ -452,6 +452,25 @@ struct iwl_lari_config_change_cmd_v3 { 
	__le32 oem_11ax_allow_bitmap;

} __packed; /* LARI_CHANGE_CONF_CMD_S_VER_3 */



/**

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

 */

struct iwl_lari_config_change_cmd_v4 {

	__le32 config_bitmap;

	__le32 oem_uhb_allow_bitmap;

	__le32 oem_11ax_allow_bitmap;

	__le32 oem_unii4_allow_bitmap;

} __packed; /* LARI_CHANGE_CONF_CMD_S_VER_4 */



/**

 * struct iwl_pnvm_init_complete_ntfy - PNVM initialization complete

 * @status: PNVM image loading status

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

+17 −3
Original line number Diff line number Diff line
@@ -1141,7 +1141,7 @@ static void iwl_mvm_lari_cfg(struct iwl_mvm *mvm) 
{

	int ret;

	u32 value;

	struct iwl_lari_config_change_cmd_v3 cmd = {};

	struct iwl_lari_config_change_cmd_v4 cmd = {};



	cmd.config_bitmap = iwl_acpi_get_lari_config_bitmap(&mvm->fwrt);
@@ -1151,12 +1151,22 @@ static void iwl_mvm_lari_cfg(struct iwl_mvm *mvm) 
		cmd.oem_11ax_allow_bitmap = cpu_to_le32(value);

	/* apply more config masks here */



	if (cmd.config_bitmap || cmd.oem_11ax_allow_bitmap) {

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

				   DSM_FUNC_ENABLE_UNII4_CHAN,

				   &iwl_guid, &value);

	if (!ret)

		cmd.oem_unii4_allow_bitmap = cpu_to_le32(value);



	if (cmd.config_bitmap ||

	    cmd.oem_11ax_allow_bitmap ||

	    cmd.oem_unii4_allow_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 == 3)

		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);

		else if (cmd_ver == 2)

			cmd_size = sizeof(struct iwl_lari_config_change_cmd_v2);
@@ -1167,6 +1177,10 @@ static void iwl_mvm_lari_cfg(struct iwl_mvm *mvm) 
				"sending LARI_CONFIG_CHANGE, config_bitmap=0x%x, oem_11ax_allow_bitmap=0x%x\n",

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

				le32_to_cpu(cmd.oem_unii4_allow_bitmap),

				cmd_ver);

		ret = iwl_mvm_send_cmd_pdu(mvm,

					   WIDE_ID(REGULATORY_AND_NVM_GROUP,

						   LARI_CONFIG_CHANGE),