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

wifi: iwlwifi: move phy_filters to fw_runtime 



phy_filters holds the values as read from WFPC BIOS table.
Since also iwlmld is going to need it, move it to fw_runtime.

Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Reviewed-by: default avatarPagadala Yesu Anjaneyulu <pagadala.yesu.anjaneyulu@intel.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Link: https://patch.msgid.link/20250424153620.357baa65950a.I01d22328b4c381d4c0064ad9bd36750911157f90@changeid


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

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

+5 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */

/*

 * Copyright (C) 2017 Intel Deutschland GmbH

 * Copyright (C) 2018-2024 Intel Corporation

 * Copyright (C) 2018-2025 Intel Corporation

 */

#ifndef __iwl_fw_runtime_h__

#define __iwl_fw_runtime_h__
@@ -110,6 +110,7 @@ struct iwl_txf_iter_data { 
 *	Only read the UEFI variables if locked.

 * @sar_profiles: sar profiles as read from WRDS/EWRD BIOS tables

 * @geo_profiles: geographic profiles as read from WGDS BIOS table

 * @phy_filters: specific phy filters as read from WPFC BIOS table

 */

struct iwl_fw_runtime {

	struct iwl_trans *trans;
@@ -184,6 +185,9 @@ struct iwl_fw_runtime { 
	struct iwl_mcc_allowed_ap_type_cmd uats_table;

	bool uats_valid;

	u8 uefi_tables_lock_status;

#ifdef CONFIG_ACPI

	struct iwl_phy_specific_cfg phy_filters;

#endif

};



void iwl_fw_runtime_init(struct iwl_fw_runtime *fwrt, struct iwl_trans *trans,

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

+2 −2
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ static void iwl_mvm_phy_filter_init(struct iwl_mvm *mvm, 
				    struct iwl_phy_specific_cfg *phy_filters)

{

#ifdef CONFIG_ACPI

	*phy_filters = mvm->phy_filters;

	*phy_filters = mvm->fwrt.phy_filters;

#endif /* CONFIG_ACPI */

}
@@ -1265,7 +1265,7 @@ void iwl_mvm_get_bios_tables(struct iwl_mvm *mvm) 
		}

	}



	iwl_acpi_get_phy_filters(&mvm->fwrt, &mvm->phy_filters);

	iwl_acpi_get_phy_filters(&mvm->fwrt, &mvm->fwrt.phy_filters);



	if (iwl_bios_get_eckv(&mvm->fwrt, &mvm->ext_clock_valid))

		IWL_DEBUG_RADIO(mvm, "ECKV table doesn't exist in BIOS\n");

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+0 −4
Original line number Diff line number Diff line
@@ -1348,10 +1348,6 @@ struct iwl_mvm { 
	__le16 cur_aid;

	u8 cur_bssid[ETH_ALEN];



#ifdef CONFIG_ACPI

	struct iwl_phy_specific_cfg phy_filters;

#endif



	/* report rx timestamp in ptp clock time */

	bool rx_ts_ptp;