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

Commit 3fe47dca authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: remove IWL_UCODE_TLV_FLAGS_RX_ENERGY_API flag 



All the supported firmwares have this flag set.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent ad2549d8

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

+0 −2
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ 
 * @IWL_UCODE_TLV_FLAGS_UAPSD: This uCode image supports uAPSD

 * @IWL_UCODE_TLV_FLAGS_SHORT_BL: 16 entries of black list instead of 64 in scan

 *	offload profile config command.

 * @IWL_UCODE_TLV_FLAGS_RX_ENERGY_API: supports rx signal strength api

 * @IWL_UCODE_TLV_FLAGS_TIME_EVENT_API_V2: using the new time event API.

 * @IWL_UCODE_TLV_FLAGS_D3_6_IPV6_ADDRS: D3 image supports up to six

 *	(rather than two) IPv6 addresses
@@ -108,7 +107,6 @@ 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_SHORT_BL		= BIT(7),

	IWL_UCODE_TLV_FLAGS_RX_ENERGY_API	= BIT(8),

	IWL_UCODE_TLV_FLAGS_TIME_EVENT_API_V2	= BIT(9),

	IWL_UCODE_TLV_FLAGS_D3_6_IPV6_ADDRS	= BIT(10),

	IWL_UCODE_TLV_FLAGS_BF_UPDATED		= BIT(11),

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

+1 −39
Original line number Diff line number Diff line
@@ -132,41 +132,6 @@ static void iwl_mvm_pass_packet_to_mac80211(struct iwl_mvm *mvm, 
	ieee80211_rx(mvm->hw, skb);

}



static void iwl_mvm_calc_rssi(struct iwl_mvm *mvm,

			      struct iwl_rx_phy_info *phy_info,

			      struct ieee80211_rx_status *rx_status)

{

	int rssi_a, rssi_b, rssi_a_dbm, rssi_b_dbm, max_rssi_dbm;

	u32 agc_a, agc_b;

	u32 val;



	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;



	val = le32_to_cpu(phy_info->non_cfg_phy[IWL_RX_INFO_RSSI_AB_IDX]);

	rssi_a = (val & IWL_OFDM_RSSI_INBAND_A_MSK) >> IWL_OFDM_RSSI_A_POS;

	rssi_b = (val & IWL_OFDM_RSSI_INBAND_B_MSK) >> IWL_OFDM_RSSI_B_POS;



	/*

	 * dBm = rssi dB - agc dB - constant.

	 * Higher AGC (higher radio gain) means lower signal.

	 */

	rssi_a_dbm = rssi_a - IWL_RSSI_OFFSET - agc_a;

	rssi_b_dbm = rssi_b - IWL_RSSI_OFFSET - agc_b;

	max_rssi_dbm = max_t(int, rssi_a_dbm, rssi_b_dbm);



	IWL_DEBUG_STATS(mvm, "Rssi In A %d B %d Max %d AGCA %d AGCB %d\n",

			rssi_a_dbm, rssi_b_dbm, max_rssi_dbm, agc_a, agc_b);



	rx_status->signal = max_rssi_dbm;

	rx_status->chains = (le16_to_cpu(phy_info->phy_flags) &

				RX_RES_PHY_FLAGS_ANTENNA)

					>> RX_RES_PHY_FLAGS_ANTENNA_POS;

	rx_status->chain_signal[0] = rssi_a_dbm;

	rx_status->chain_signal[1] = rssi_b_dbm;

}



/*

 * iwl_mvm_get_signal_strength - use new rx PHY INFO API

 * values are reported by the fw as positive values - need to negate
@@ -336,10 +301,7 @@ int iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb, 
	 */

	/*rx_status.flag |= RX_FLAG_MACTIME_MPDU;*/



	if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_RX_ENERGY_API)

	iwl_mvm_get_signal_strength(mvm, phy_info, &rx_status);

	else

		iwl_mvm_calc_rssi(mvm, phy_info, &rx_status);



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

			      (unsigned long long)rx_status.mactime);