niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

wifi: iwlwifi: take SGOM and UATS code out of ACPI ifdef

Browse source 
The BIOS tables SGOM and UATS are read from UEFI, but require
additional tables (WGDS and DSM func 3, respectively) which used to be
read from ACPI only, so the code handling those tables had to be under
ifdef ACPI. But now the driver reads those tables (WGDS and DSM) from
both ACPI and UEFI, so SGOM and UATS code shouldn't be under ifdef ACPI
anymore.

Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240205211151.dcaa3325773f.I649079c842369dcae3a362842322deca422a61d5@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Miri Korenblit 2024-02-05 21:21:04 +02:00 • committed by Johannes Berg
parent 0dd2b42c2c
commit 74f4cd7107
3 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/net/wireless/intel/iwlwifi/fw/runtime.h
View file

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
/* /*
* Copyright (C) 2017 Intel Deutschland GmbH * Copyright (C) 2017 Intel Deutschland GmbH
* Copyright (C) 2018-2023 Intel Corporation * Copyright (C) 2018-2024 Intel Corporation
*/ */
#ifndef __iwl_fw_runtime_h__ #ifndef __iwl_fw_runtime_h__
#define __iwl_fw_runtime_h__ #define __iwl_fw_runtime_h__
@ -175,11 +175,9 @@ struct iwl_fw_runtime {
struct iwl_ppag_chain ppag_chains[IWL_NUM_CHAIN_LIMITS]; struct iwl_ppag_chain ppag_chains[IWL_NUM_CHAIN_LIMITS];
u32 ppag_flags; u32 ppag_flags;
u8 ppag_ver; u8 ppag_ver;
#ifdef CONFIG_ACPI
struct iwl_sar_offset_mapping_cmd sgom_table; struct iwl_sar_offset_mapping_cmd sgom_table;
bool sgom_enabled; bool sgom_enabled;
struct iwl_uats_table_cmd uats_table; struct iwl_uats_table_cmd uats_table;
#endif
u8 uefi_tables_lock_status; u8 uefi_tables_lock_status;
bool uats_enabled; bool uats_enabled;
}; };

4
drivers/net/wireless/intel/iwlwifi/fw/uefi.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
/* /*
* Copyright(c) 2021-2023 Intel Corporation * Copyright(c) 2021-2024 Intel Corporation
*/ */
#include "iwl-drv.h" #include "iwl-drv.h"
@ -324,7 +324,6 @@ void iwl_uefi_get_step_table(struct iwl_trans *trans)
} }
IWL_EXPORT_SYMBOL(iwl_uefi_get_step_table); IWL_EXPORT_SYMBOL(iwl_uefi_get_step_table);
#ifdef CONFIG_ACPI
static int iwl_uefi_sgom_parse(struct uefi_cnv_wlan_sgom_data *sgom_data, static int iwl_uefi_sgom_parse(struct uefi_cnv_wlan_sgom_data *sgom_data,
struct iwl_fw_runtime *fwrt) struct iwl_fw_runtime *fwrt)
{ {
@ -412,7 +411,6 @@ int iwl_uefi_get_uats_table(struct iwl_trans *trans,
return 0; return 0;
} }
IWL_EXPORT_SYMBOL(iwl_uefi_get_uats_table); IWL_EXPORT_SYMBOL(iwl_uefi_get_uats_table);
#endif /* CONFIG_ACPI */
static void iwl_uefi_set_sar_profile(struct iwl_fw_runtime *fwrt, static void iwl_uefi_set_sar_profile(struct iwl_fw_runtime *fwrt,
struct uefi_sar_profile *uefi_sar_prof, struct uefi_sar_profile *uefi_sar_prof,

14
drivers/net/wireless/intel/iwlwifi/mvm/fw.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
/* /*
* Copyright (C) 2012-2014, 2018-2023 Intel Corporation * Copyright (C) 2012-2014, 2018-2024 Intel Corporation
* Copyright (C) 2013-2015 Intel Mobile Communications GmbH * Copyright (C) 2013-2015 Intel Mobile Communications GmbH
* Copyright (C) 2016-2017 Intel Deutschland GmbH * Copyright (C) 2016-2017 Intel Deutschland GmbH
*/ */
@ -488,7 +488,6 @@ static void iwl_mvm_phy_filter_init(struct iwl_mvm *mvm,
#endif /* CONFIG_ACPI */ #endif /* CONFIG_ACPI */
} }
#if defined(CONFIG_ACPI) && defined(CONFIG_EFI)
static void iwl_mvm_uats_init(struct iwl_mvm *mvm) static void iwl_mvm_uats_init(struct iwl_mvm *mvm)
{ {
u8 cmd_ver; u8 cmd_ver;
@ -568,17 +567,6 @@ static int iwl_mvm_sgom_init(struct iwl_mvm *mvm)
return ret; return ret;
} }
#else
static int iwl_mvm_sgom_init(struct iwl_mvm *mvm)
{
return 0;
}
static void iwl_mvm_uats_init(struct iwl_mvm *mvm)
{
}
#endif
static int iwl_send_phy_cfg_cmd(struct iwl_mvm *mvm) static int iwl_send_phy_cfg_cmd(struct iwl_mvm *mvm)
{ {