Commit 698b166e authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: mvm: read 6E enablement flags from DSM and pass to FW 



We need to call a new DSM function and pass the values to the firmware
in order to allow enablement of 6E support by the OEMs via ACPI.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20211024181719.2fa34d31383c.I6504005c60882c94e6e58f64cab4e42e6481ce08@changeid


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

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

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ enum iwl_dsm_funcs_rev_0 { 
	DSM_FUNC_QUERY = 0,

	DSM_FUNC_DISABLE_SRD = 1,

	DSM_FUNC_ENABLE_INDONESIA_5G2 = 2,

	DSM_FUNC_ENABLE_6E = 3,

	DSM_FUNC_11AX_ENABLEMENT = 6,

	DSM_FUNC_ENABLE_UNII4_CHAN = 7,

	DSM_FUNC_ACTIVATE_CHANNEL = 8

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

+10 −1
Original line number Diff line number Diff line
@@ -1177,7 +1177,6 @@ static void iwl_mvm_lari_cfg(struct iwl_mvm *mvm) 
				   &iwl_guid, &value);

	if (!ret)

		cmd.oem_11ax_allow_bitmap = cpu_to_le32(value);

	/* apply more config masks here */



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

				   DSM_FUNC_ENABLE_UNII4_CHAN,
@@ -1191,7 +1190,14 @@ static void iwl_mvm_lari_cfg(struct iwl_mvm *mvm) 
	if (!ret)

		cmd.chan_state_active_bitmap = cpu_to_le32(value);



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

				   DSM_FUNC_ENABLE_6E,

				   &iwl_guid, &value);

	if (!ret)

		cmd.oem_uhb_allow_bitmap = cpu_to_le32(value);



	if (cmd.config_bitmap ||

	    cmd.oem_uhb_allow_bitmap ||

	    cmd.oem_11ax_allow_bitmap ||

	    cmd.oem_unii4_allow_bitmap ||

	    cmd.chan_state_active_bitmap) {
@@ -1219,6 +1225,9 @@ static void iwl_mvm_lari_cfg(struct iwl_mvm *mvm) 
				le32_to_cpu(cmd.oem_unii4_allow_bitmap),

				le32_to_cpu(cmd.chan_state_active_bitmap),

				cmd_ver);

		IWL_DEBUG_RADIO(mvm,

				"sending LARI_CONFIG_CHANGE, oem_uhb_allow_bitmap=0x%x\n",

				le32_to_cpu(cmd.oem_uhb_allow_bitmap));

		ret = iwl_mvm_send_cmd_pdu(mvm,

					   WIDE_ID(REGULATORY_AND_NVM_GROUP,

						   LARI_CONFIG_CHANGE),