iwlwifi: mvm: new api to get signal strength (a2d7b870) · Commits · 戴 / test

drivers/net/wireless/iwlwifi/iwl-fw.h

+8 −6

Original line number	Diff line number	Diff line
		@@ -75,6 +75,7 @@
		* @IWL_UCODE_TLV_FLAGS_P2P: This uCode image supports P2P.
		* @IWL_UCODE_TLV_FLAGS_DW_BC_TABLE: The SCD byte count table is in DWORDS
		* @IWL_UCODE_TLV_FLAGS_UAPSD: This uCode image supports uAPSD
		* @IWL_UCODE_TLV_FLAGS_RX_ENERGY_API: supports rx signal strength api
		*/
		enum iwl_ucode_tlv_flag {
		IWL_UCODE_TLV_FLAGS_PAN = BIT(0),
		@@ -83,6 +84,7 @@ enum iwl_ucode_tlv_flag {
		IWL_UCODE_TLV_FLAGS_P2P = BIT(3),
		IWL_UCODE_TLV_FLAGS_DW_BC_TABLE = BIT(4),
		IWL_UCODE_TLV_FLAGS_UAPSD = BIT(6),
		IWL_UCODE_TLV_FLAGS_RX_ENERGY_API = BIT(8),
		};

		/* The default calibrate table size if not specified by firmware file */

drivers/net/wireless/iwlwifi/mvm/fw-api.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -768,6 +768,14 @@ struct iwl_phy_context_cmd {
		} __packed; /* PHY_CONTEXT_CMD_API_VER_1 */

		#define IWL_RX_INFO_PHY_CNT 8
		#define IWL_RX_INFO_ENERGY_ANT_ABC_IDX 1
		#define IWL_RX_INFO_ENERGY_ANT_A_MSK 0x000000ff
		#define IWL_RX_INFO_ENERGY_ANT_B_MSK 0x0000ff00
		#define IWL_RX_INFO_ENERGY_ANT_C_MSK 0x00ff0000
		#define IWL_RX_INFO_ENERGY_ANT_A_POS 0
		#define IWL_RX_INFO_ENERGY_ANT_B_POS 8
		#define IWL_RX_INFO_ENERGY_ANT_C_POS 16

		#define IWL_RX_INFO_AGC_IDX 1
		#define IWL_RX_INFO_RSSI_AB_IDX 2
		#define IWL_OFDM_AGC_A_MSK 0x0000007f

drivers/net/wireless/iwlwifi/mvm/rx.c

+30 −11

Original line number	Diff line number	Diff line
		@@ -124,10 +124,6 @@ static void iwl_mvm_pass_packet_to_mac80211(struct iwl_mvm *mvm,
		ieee80211_rx_ni(mvm->hw, skb);
		}

		/*
		* iwl_mvm_calc_rssi - calculate the rssi in dBm
		* @phy_info: the phy information for the coming packet
		*/
		static int iwl_mvm_calc_rssi(struct iwl_mvm *mvm,
		struct iwl_rx_phy_info *phy_info)
		{
		@@ -136,12 +132,6 @@ static int iwl_mvm_calc_rssi(struct iwl_mvm *mvm,
		u32 agc_a, agc_b, max_agc;
		u32 val;

		/* Find max rssi among 2 possible receivers.
		* These values are measured by the Digital Signal Processor (DSP).
		* They should stay fairly constant even as the signal strength varies,
		* if the radio's Automatic Gain Control (AGC) is working right.
		* AGC value (see below) will provide the "interesting" info.
		*/
		val = le32_to_cpu(phy_info->non_cfg_phy[IWL_RX_INFO_AGC_IDX]);
		agc_a = (val & IWL_OFDM_AGC_A_MSK) >> IWL_OFDM_AGC_A_POS;
		agc_b = (val & IWL_OFDM_AGC_B_MSK) >> IWL_OFDM_AGC_B_POS;
		@@ -169,6 +159,32 @@ static int iwl_mvm_calc_rssi(struct iwl_mvm *mvm,
		return max_rssi_dbm;
		}

		/*
		* iwl_mvm_get_signal_strength - use new rx PHY INFO API
		*/
		static int iwl_mvm_get_signal_strength(struct iwl_mvm *mvm,
		struct iwl_rx_phy_info *phy_info)
		{
		int energy_a, energy_b, energy_c, max_energy;
		u32 val;

		val =
		le32_to_cpu(phy_info->non_cfg_phy[IWL_RX_INFO_ENERGY_ANT_ABC_IDX]);
		energy_a = -((val & IWL_RX_INFO_ENERGY_ANT_A_MSK) >>
		IWL_RX_INFO_ENERGY_ANT_A_POS);
		energy_b = -((val & IWL_RX_INFO_ENERGY_ANT_B_MSK) >>
		IWL_RX_INFO_ENERGY_ANT_B_POS);
		energy_c = -((val & IWL_RX_INFO_ENERGY_ANT_C_MSK) >>
		IWL_RX_INFO_ENERGY_ANT_C_POS);
		max_energy = max(energy_a, energy_b);
		max_energy = max(max_energy, energy_c);

		IWL_DEBUG_STATS(mvm, "energy In A %d B %d C %d , and max %d\n",
		energy_a, energy_b, energy_c, max_energy);

		return max_energy;
		}

		/*
		* iwl_mvm_set_mac80211_rx_flag - translate fw status to mac80211 format
		* @mvm: the mvm object
		@@ -290,6 +306,9 @@ int iwl_mvm_rx_rx_mpdu(struct iwl_mvm mvm, struct iwl_rx_cmd_buffer rxb,
		/rx_status.flag \|= RX_FLAG_MACTIME_MPDU;/

		/* Find max signal strength (dBm) among 3 antenna/receiver chains */
		if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_RX_ENERGY_API)
		rx_status.signal = iwl_mvm_get_signal_strength(mvm, phy_info);
		else
		rx_status.signal = iwl_mvm_calc_rssi(mvm, phy_info);

		IWL_DEBUG_STATS_LIMIT(mvm, "Rssi %d, TSF %llu\n", rx_status.signal,

Admin message