Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ce1e5c0 authored by Gil Adam's avatar Gil Adam Committed by Luca Coelho
Browse files

iwlwifi: support per-platform antenna gain 



TX power limits as defined in the OTP assume the worst case scenario
in terms of the platform's atenna gain, but most platforms are below
that value so they can use more TX power without passing the regulatory
limit. If the platform indicates in the BIOS that it indeed has lower
gain, and the geographic location allows it, higher TX power can be
used. The driver reads the PPAG (Per-Platform Antenna Gain) data from
BIOS (if it exists), validates it and sends the appropriate command to
the FW. This flow happens once at FW init, in case of suspend/resume
there is no need to read again from BIOS as we save those values during
init, so just send the PPAG command again to FW.

Signed-off-by: default avatarGil Adam <gil.adam@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent e533f745

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

+12 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 
#define ACPI_WRDD_METHOD	"WRDD"

#define ACPI_SPLC_METHOD	"SPLC"

#define ACPI_ECKV_METHOD	"ECKV"

#define ACPI_PPAG_METHOD	"PPAG"



#define ACPI_WIFI_DOMAIN	(0x07)
@@ -92,6 +93,17 @@ 
#define ACPI_WGDS_NUM_BANDS		2

#define ACPI_WGDS_TABLE_SIZE		3



#define ACPI_PPAG_NUM_CHAINS		2

#define ACPI_PPAG_NUM_SUB_BANDS		5

#define ACPI_PPAG_WIFI_DATA_SIZE	((ACPI_PPAG_NUM_CHAINS * \

					ACPI_PPAG_NUM_SUB_BANDS) + 3)



/* PPAG gain value bounds in 1/8 dBm */

#define ACPI_PPAG_MIN_LB -16

#define ACPI_PPAG_MAX_LB 24

#define ACPI_PPAG_MIN_HB -16

#define ACPI_PPAG_MAX_HB 40



#ifdef CONFIG_ACPI



void *iwl_acpi_get_object(struct device *dev, acpi_string method);

drivers/net/wireless/intel/iwlwifi/fw/api/phy.h

+7 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2019 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -30,6 +31,7 @@ 
 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2019 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -89,6 +91,11 @@ enum iwl_phy_ops_subcmd_ids { 
	 */

	GEO_TX_POWER_LIMIT = 0x05,



	/**

	 * @PER_PLATFORM_ANT_GAIN_CMD: &struct iwl_ppag_table_cmd

	 */

	PER_PLATFORM_ANT_GAIN_CMD = 0x07,



	/**

	 * @CT_KILL_NOTIFICATION: &struct ct_kill_notif

	 */

drivers/net/wireless/intel/iwlwifi/fw/api/power.h

+12 −0
Original line number Diff line number Diff line
@@ -449,6 +449,18 @@ struct iwl_geo_tx_power_profiles_resp { 
	__le32 profile_idx;

} __packed; /* GEO_TX_POWER_LIMIT_RESP */



/**

 * struct iwl_ppag_table_cmd - struct for PER_PLATFORM_ANT_GAIN_CMD cmd.

 * @enabled: 1 if PPAG is enabled, 0 otherwise

 * @gain: table of antenna gain values per chain and sub-band

 * @reserved: reserved

 */

struct iwl_ppag_table_cmd {

	__le32 enabled;

	s8 gain[IWL_NUM_CHAIN_LIMITS][IWL_NUM_SUB_BANDS];

	s8 reserved[2];

} __packed; /* PER_PLATFORM_ANT_GAIN_CMD */



/**

 * struct iwl_beacon_filter_cmd

 * REPLY_BEACON_FILTERING_CMD = 0xd2 (command)

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

+1 −0
Original line number Diff line number Diff line
@@ -446,6 +446,7 @@ enum iwl_ucode_tlv_capa { 
	IWL_UCODE_TLV_CAPA_ULTRA_HB_CHANNELS		= (__force iwl_ucode_tlv_capa_t)48,

	IWL_UCODE_TLV_CAPA_CS_MODIFY			= (__force iwl_ucode_tlv_capa_t)49,

	IWL_UCODE_TLV_CAPA_SET_LTR_GEN2			= (__force iwl_ucode_tlv_capa_t)50,

	IWL_UCODE_TLV_CAPA_SET_PPAG			= (__force iwl_ucode_tlv_capa_t)52,



	/* set 2 */

	IWL_UCODE_TLV_CAPA_EXTENDED_DTS_MEASURE		= (__force iwl_ucode_tlv_capa_t)64,

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

+3 −0
Original line number Diff line number Diff line
@@ -1965,6 +1965,9 @@ static int __iwl_mvm_resume(struct iwl_mvm *mvm, bool test) 
	 */

	iwl_mvm_update_changed_regdom(mvm);



	/* Re-configure PPAG settings */

	iwl_mvm_ppag_send_cmd(mvm);



	if (!unified_image)

		/*  Re-configure default SAR profile */

		iwl_mvm_sar_select_profile(mvm, 1, 1);