iwlwifi: move remaining iwl-agn-rx.c code into iwl-rx.c (67289941) · Commits · 戴 / test

drivers/net/wireless/iwlwifi/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		obj-$(CONFIG_IWLAGN) += iwlagn.o
		iwlagn-objs := iwl-agn.o iwl-agn-rs.o iwl-agn-led.o
		iwlagn-objs += iwl-agn-ucode.o iwl-agn-tx.o
		iwlagn-objs += iwl-agn-lib.o iwl-agn-rx.o iwl-agn-calib.o
		iwlagn-objs += iwl-agn-lib.o iwl-agn-calib.o
		iwlagn-objs += iwl-agn-tt.o iwl-agn-sta.o iwl-agn-eeprom.o

		iwlagn-objs += iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o

drivers/net/wireless/iwlwifi/iwl-agn-rx.c

deleted100644 → 0

+0 −264

Original line number	Diff line number	Diff line
		/******************************************************************************
		*
		* GPL LICENSE SUMMARY
		*
		* Copyright(c) 2008 - 2010 Intel Corporation. All rights reserved.
		*
		* 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
		* published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful, but
		* WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		* General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
		* USA
		*
		* The full GNU General Public License is included in this distribution
		* in the file called LICENSE.GPL.
		*
		* Contact Information:
		* Intel Linux Wireless <ilw@linux.intel.com>
		* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
		*
		*****************************************************************************/

		#include <linux/kernel.h>
		#include <linux/module.h>
		#include <linux/init.h>
		#include <linux/sched.h>

		#include "iwl-dev.h"
		#include "iwl-core.h"
		#include "iwl-agn-calib.h"
		#include "iwl-sta.h"
		#include "iwl-io.h"
		#include "iwl-helpers.h"
		#include "iwl-agn-hw.h"
		#include "iwl-agn.h"

		void iwl_rx_missed_beacon_notif(struct iwl_priv *priv,
		struct iwl_rx_mem_buffer *rxb)

		{
		struct iwl_rx_packet *pkt = rxb_addr(rxb);
		struct iwl_missed_beacon_notif *missed_beacon;

		missed_beacon = &pkt->u.missed_beacon;
		if (le32_to_cpu(missed_beacon->consecutive_missed_beacons) >
		priv->missed_beacon_threshold) {
		IWL_DEBUG_CALIB(priv,
		"missed bcn cnsq %d totl %d rcd %d expctd %d\n",
		le32_to_cpu(missed_beacon->consecutive_missed_beacons),
		le32_to_cpu(missed_beacon->total_missed_becons),
		le32_to_cpu(missed_beacon->num_recvd_beacons),
		le32_to_cpu(missed_beacon->num_expected_beacons));
		if (!test_bit(STATUS_SCANNING, &priv->status))
		iwl_init_sensitivity(priv);
		}
		}

		/* Calculate noise level, based on measurements during network silence just
		* before arriving beacon. This measurement can be done only if we know
		* exactly when to expect beacons, therefore only when we're associated. */
		static void iwl_rx_calc_noise(struct iwl_priv *priv)
		{
		struct statistics_rx_non_phy *rx_info;
		int num_active_rx = 0;
		int total_silence = 0;
		int bcn_silence_a, bcn_silence_b, bcn_silence_c;
		int last_rx_noise;

		if (iwl_bt_statistics(priv))
		rx_info = &(priv->_agn.statistics_bt.rx.general.common);
		else
		rx_info = &(priv->_agn.statistics.rx.general);
		bcn_silence_a =
		le32_to_cpu(rx_info->beacon_silence_rssi_a) & IN_BAND_FILTER;
		bcn_silence_b =
		le32_to_cpu(rx_info->beacon_silence_rssi_b) & IN_BAND_FILTER;
		bcn_silence_c =
		le32_to_cpu(rx_info->beacon_silence_rssi_c) & IN_BAND_FILTER;

		if (bcn_silence_a) {
		total_silence += bcn_silence_a;
		num_active_rx++;
		}
		if (bcn_silence_b) {
		total_silence += bcn_silence_b;
		num_active_rx++;
		}
		if (bcn_silence_c) {
		total_silence += bcn_silence_c;
		num_active_rx++;
		}

		/* Average among active antennas */
		if (num_active_rx)
		last_rx_noise = (total_silence / num_active_rx) - 107;
		else
		last_rx_noise = IWL_NOISE_MEAS_NOT_AVAILABLE;

		IWL_DEBUG_CALIB(priv, "inband silence a %u, b %u, c %u, dBm %d\n",
		bcn_silence_a, bcn_silence_b, bcn_silence_c,
		last_rx_noise);
		}

		#ifdef CONFIG_IWLWIFI_DEBUGFS
		/*
		* based on the assumption of all statistics counter are in DWORD
		* FIXME: This function is for debugging, do not deal with
		* the case of counters roll-over.
		*/
		static void iwl_accumulative_statistics(struct iwl_priv *priv,
		__le32 *stats)
		{
		int i, size;
		__le32 *prev_stats;
		u32 *accum_stats;
		u32 delta, max_delta;
		struct statistics_general_common general, accum_general;
		struct statistics_tx tx, accum_tx;

		if (iwl_bt_statistics(priv)) {
		prev_stats = (__le32 *)&priv->_agn.statistics_bt;
		accum_stats = (u32 *)&priv->_agn.accum_statistics_bt;
		size = sizeof(struct iwl_bt_notif_statistics);
		general = &priv->_agn.statistics_bt.general.common;
		accum_general = &priv->_agn.accum_statistics_bt.general.common;
		tx = &priv->_agn.statistics_bt.tx;
		accum_tx = &priv->_agn.accum_statistics_bt.tx;
		delta = (u32 *)&priv->_agn.delta_statistics_bt;
		max_delta = (u32 *)&priv->_agn.max_delta_bt;
		} else {
		prev_stats = (__le32 *)&priv->_agn.statistics;
		accum_stats = (u32 *)&priv->_agn.accum_statistics;
		size = sizeof(struct iwl_notif_statistics);
		general = &priv->_agn.statistics.general.common;
		accum_general = &priv->_agn.accum_statistics.general.common;
		tx = &priv->_agn.statistics.tx;
		accum_tx = &priv->_agn.accum_statistics.tx;
		delta = (u32 *)&priv->_agn.delta_statistics;
		max_delta = (u32 *)&priv->_agn.max_delta;
		}
		for (i = sizeof(__le32); i < size;
		i += sizeof(__le32), stats++, prev_stats++, delta++,
		max_delta++, accum_stats++) {
		if (le32_to_cpu(stats) > le32_to_cpu(prev_stats)) {
		delta = (le32_to_cpu(stats) -
		le32_to_cpu(*prev_stats));
		accum_stats += delta;
		if (delta > max_delta)
		max_delta = delta;
		}
		}

		/* reset accumulative statistics for "no-counter" type statistics */
		accum_general->temperature = general->temperature;
		accum_general->temperature_m = general->temperature_m;
		accum_general->ttl_timestamp = general->ttl_timestamp;
		accum_tx->tx_power.ant_a = tx->tx_power.ant_a;
		accum_tx->tx_power.ant_b = tx->tx_power.ant_b;
		accum_tx->tx_power.ant_c = tx->tx_power.ant_c;
		}
		#endif

		#define REG_RECALIB_PERIOD (60)

		void iwl_rx_statistics(struct iwl_priv *priv,
		struct iwl_rx_mem_buffer *rxb)
		{
		int change;
		struct iwl_rx_packet *pkt = rxb_addr(rxb);

		if (iwl_bt_statistics(priv)) {
		IWL_DEBUG_RX(priv,
		"Statistics notification received (%d vs %d).\n",
		(int)sizeof(struct iwl_bt_notif_statistics),
		le32_to_cpu(pkt->len_n_flags) &
		FH_RSCSR_FRAME_SIZE_MSK);

		change = ((priv->_agn.statistics_bt.general.common.temperature !=
		pkt->u.stats_bt.general.common.temperature) \|\|
		((priv->_agn.statistics_bt.flag &
		STATISTICS_REPLY_FLG_HT40_MODE_MSK) !=
		(pkt->u.stats_bt.flag &
		STATISTICS_REPLY_FLG_HT40_MODE_MSK)));
		#ifdef CONFIG_IWLWIFI_DEBUGFS
		iwl_accumulative_statistics(priv, (__le32 *)&pkt->u.stats_bt);
		#endif

		} else {
		IWL_DEBUG_RX(priv,
		"Statistics notification received (%d vs %d).\n",
		(int)sizeof(struct iwl_notif_statistics),
		le32_to_cpu(pkt->len_n_flags) &
		FH_RSCSR_FRAME_SIZE_MSK);

		change = ((priv->_agn.statistics.general.common.temperature !=
		pkt->u.stats.general.common.temperature) \|\|
		((priv->_agn.statistics.flag &
		STATISTICS_REPLY_FLG_HT40_MODE_MSK) !=
		(pkt->u.stats.flag &
		STATISTICS_REPLY_FLG_HT40_MODE_MSK)));
		#ifdef CONFIG_IWLWIFI_DEBUGFS
		iwl_accumulative_statistics(priv, (__le32 *)&pkt->u.stats);
		#endif

		}

		iwl_recover_from_statistics(priv, pkt);

		if (iwl_bt_statistics(priv))
		memcpy(&priv->_agn.statistics_bt, &pkt->u.stats_bt,
		sizeof(priv->_agn.statistics_bt));
		else
		memcpy(&priv->_agn.statistics, &pkt->u.stats,
		sizeof(priv->_agn.statistics));

		set_bit(STATUS_STATISTICS, &priv->status);

		/* Reschedule the statistics timer to occur in
		* REG_RECALIB_PERIOD seconds to ensure we get a
		* thermal update even if the uCode doesn't give
		* us one */
		mod_timer(&priv->statistics_periodic, jiffies +
		msecs_to_jiffies(REG_RECALIB_PERIOD * 1000));

		if (unlikely(!test_bit(STATUS_SCANNING, &priv->status)) &&
		(pkt->hdr.cmd == STATISTICS_NOTIFICATION)) {
		iwl_rx_calc_noise(priv);
		queue_work(priv->workqueue, &priv->run_time_calib_work);
		}
		if (priv->cfg->ops->lib->temp_ops.temperature && change)
		priv->cfg->ops->lib->temp_ops.temperature(priv);
		}

		void iwl_reply_statistics(struct iwl_priv *priv,
		struct iwl_rx_mem_buffer *rxb)
		{
		struct iwl_rx_packet *pkt = rxb_addr(rxb);

		if (le32_to_cpu(pkt->u.stats.flag) & UCODE_STATISTICS_CLEAR_MSK) {
		#ifdef CONFIG_IWLWIFI_DEBUGFS
		memset(&priv->_agn.accum_statistics, 0,
		sizeof(struct iwl_notif_statistics));
		memset(&priv->_agn.delta_statistics, 0,
		sizeof(struct iwl_notif_statistics));
		memset(&priv->_agn.max_delta, 0,
		sizeof(struct iwl_notif_statistics));
		memset(&priv->_agn.accum_statistics_bt, 0,
		sizeof(struct iwl_bt_notif_statistics));
		memset(&priv->_agn.delta_statistics_bt, 0,
		sizeof(struct iwl_bt_notif_statistics));
		memset(&priv->_agn.max_delta_bt, 0,
		sizeof(struct iwl_bt_notif_statistics));
		#endif
		IWL_DEBUG_RX(priv, "Statistics have been cleared\n");
		}
		iwl_rx_statistics(priv, rxb);
		}

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -516,8 +516,6 @@ void iwl_tx_cmd_complete(struct iwl_priv priv, struct iwl_rx_mem_buffer rxb);
		/* Handlers */
		void iwl_rx_spectrum_measure_notif(struct iwl_priv *priv,
		struct iwl_rx_mem_buffer *rxb);
		void iwl_recover_from_statistics(struct iwl_priv *priv,
		struct iwl_rx_packet *pkt);
		void iwl_chswitch_done(struct iwl_priv *priv, bool is_success);
		void iwl_rx_csa(struct iwl_priv priv, struct iwl_rx_mem_buffer rxb);

drivers/net/wireless/iwlwifi/iwl-rx.c

+224 −2

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@
		#include "iwl-sta.h"
		#include "iwl-io.h"
		#include "iwl-helpers.h"
		#include "iwl-agn-calib.h"
		/************************ RX-FUNCTIONS **************************/
		/*
		* Rx theory of operation
		@@ -210,7 +211,6 @@ err_bd:
		return -ENOMEM;
		}


		void iwl_rx_spectrum_measure_notif(struct iwl_priv *priv,
		struct iwl_rx_mem_buffer *rxb)
		{
		@@ -378,7 +378,7 @@ static bool iwl_good_plcp_health(struct iwl_priv priv, struct iwl_rx_packet pk
		return rc;
		}

		void iwl_recover_from_statistics(struct iwl_priv priv, struct iwl_rx_packet pkt)
		static void iwl_recover_from_statistics(struct iwl_priv priv, struct iwl_rx_packet pkt)
		{
		const struct iwl_mod_params *mod_params = priv->cfg->mod_params;

		@@ -396,6 +396,228 @@ void iwl_recover_from_statistics(struct iwl_priv priv, struct iwl_rx_packet pk
		iwl_force_reset(priv, IWL_RF_RESET, false);
		}

		/* Calculate noise level, based on measurements during network silence just
		* before arriving beacon. This measurement can be done only if we know
		* exactly when to expect beacons, therefore only when we're associated. */
		static void iwl_rx_calc_noise(struct iwl_priv *priv)
		{
		struct statistics_rx_non_phy *rx_info;
		int num_active_rx = 0;
		int total_silence = 0;
		int bcn_silence_a, bcn_silence_b, bcn_silence_c;
		int last_rx_noise;

		if (iwl_bt_statistics(priv))
		rx_info = &(priv->_agn.statistics_bt.rx.general.common);
		else
		rx_info = &(priv->_agn.statistics.rx.general);
		bcn_silence_a =
		le32_to_cpu(rx_info->beacon_silence_rssi_a) & IN_BAND_FILTER;
		bcn_silence_b =
		le32_to_cpu(rx_info->beacon_silence_rssi_b) & IN_BAND_FILTER;
		bcn_silence_c =
		le32_to_cpu(rx_info->beacon_silence_rssi_c) & IN_BAND_FILTER;

		if (bcn_silence_a) {
		total_silence += bcn_silence_a;
		num_active_rx++;
		}
		if (bcn_silence_b) {
		total_silence += bcn_silence_b;
		num_active_rx++;
		}
		if (bcn_silence_c) {
		total_silence += bcn_silence_c;
		num_active_rx++;
		}

		/* Average among active antennas */
		if (num_active_rx)
		last_rx_noise = (total_silence / num_active_rx) - 107;
		else
		last_rx_noise = IWL_NOISE_MEAS_NOT_AVAILABLE;

		IWL_DEBUG_CALIB(priv, "inband silence a %u, b %u, c %u, dBm %d\n",
		bcn_silence_a, bcn_silence_b, bcn_silence_c,
		last_rx_noise);
		}

		#ifdef CONFIG_IWLWIFI_DEBUGFS
		/*
		* based on the assumption of all statistics counter are in DWORD
		* FIXME: This function is for debugging, do not deal with
		* the case of counters roll-over.
		*/
		static void iwl_accumulative_statistics(struct iwl_priv *priv,
		__le32 *stats)
		{
		int i, size;
		__le32 *prev_stats;
		u32 *accum_stats;
		u32 delta, max_delta;
		struct statistics_general_common general, accum_general;
		struct statistics_tx tx, accum_tx;

		if (iwl_bt_statistics(priv)) {
		prev_stats = (__le32 *)&priv->_agn.statistics_bt;
		accum_stats = (u32 *)&priv->_agn.accum_statistics_bt;
		size = sizeof(struct iwl_bt_notif_statistics);
		general = &priv->_agn.statistics_bt.general.common;
		accum_general = &priv->_agn.accum_statistics_bt.general.common;
		tx = &priv->_agn.statistics_bt.tx;
		accum_tx = &priv->_agn.accum_statistics_bt.tx;
		delta = (u32 *)&priv->_agn.delta_statistics_bt;
		max_delta = (u32 *)&priv->_agn.max_delta_bt;
		} else {
		prev_stats = (__le32 *)&priv->_agn.statistics;
		accum_stats = (u32 *)&priv->_agn.accum_statistics;
		size = sizeof(struct iwl_notif_statistics);
		general = &priv->_agn.statistics.general.common;
		accum_general = &priv->_agn.accum_statistics.general.common;
		tx = &priv->_agn.statistics.tx;
		accum_tx = &priv->_agn.accum_statistics.tx;
		delta = (u32 *)&priv->_agn.delta_statistics;
		max_delta = (u32 *)&priv->_agn.max_delta;
		}
		for (i = sizeof(__le32); i < size;
		i += sizeof(__le32), stats++, prev_stats++, delta++,
		max_delta++, accum_stats++) {
		if (le32_to_cpu(stats) > le32_to_cpu(prev_stats)) {
		delta = (le32_to_cpu(stats) -
		le32_to_cpu(*prev_stats));
		accum_stats += delta;
		if (delta > max_delta)
		max_delta = delta;
		}
		}

		/* reset accumulative statistics for "no-counter" type statistics */
		accum_general->temperature = general->temperature;
		accum_general->temperature_m = general->temperature_m;
		accum_general->ttl_timestamp = general->ttl_timestamp;
		accum_tx->tx_power.ant_a = tx->tx_power.ant_a;
		accum_tx->tx_power.ant_b = tx->tx_power.ant_b;
		accum_tx->tx_power.ant_c = tx->tx_power.ant_c;
		}
		#endif

		#define REG_RECALIB_PERIOD (60)

		void iwl_rx_statistics(struct iwl_priv *priv,
		struct iwl_rx_mem_buffer *rxb)
		{
		int change;
		struct iwl_rx_packet *pkt = rxb_addr(rxb);

		if (iwl_bt_statistics(priv)) {
		IWL_DEBUG_RX(priv,
		"Statistics notification received (%d vs %d).\n",
		(int)sizeof(struct iwl_bt_notif_statistics),
		le32_to_cpu(pkt->len_n_flags) &
		FH_RSCSR_FRAME_SIZE_MSK);

		change = ((priv->_agn.statistics_bt.general.common.temperature !=
		pkt->u.stats_bt.general.common.temperature) \|\|
		((priv->_agn.statistics_bt.flag &
		STATISTICS_REPLY_FLG_HT40_MODE_MSK) !=
		(pkt->u.stats_bt.flag &
		STATISTICS_REPLY_FLG_HT40_MODE_MSK)));
		#ifdef CONFIG_IWLWIFI_DEBUGFS
		iwl_accumulative_statistics(priv, (__le32 *)&pkt->u.stats_bt);
		#endif

		} else {
		IWL_DEBUG_RX(priv,
		"Statistics notification received (%d vs %d).\n",
		(int)sizeof(struct iwl_notif_statistics),
		le32_to_cpu(pkt->len_n_flags) &
		FH_RSCSR_FRAME_SIZE_MSK);

		change = ((priv->_agn.statistics.general.common.temperature !=
		pkt->u.stats.general.common.temperature) \|\|
		((priv->_agn.statistics.flag &
		STATISTICS_REPLY_FLG_HT40_MODE_MSK) !=
		(pkt->u.stats.flag &
		STATISTICS_REPLY_FLG_HT40_MODE_MSK)));
		#ifdef CONFIG_IWLWIFI_DEBUGFS
		iwl_accumulative_statistics(priv, (__le32 *)&pkt->u.stats);
		#endif

		}

		iwl_recover_from_statistics(priv, pkt);

		if (iwl_bt_statistics(priv))
		memcpy(&priv->_agn.statistics_bt, &pkt->u.stats_bt,
		sizeof(priv->_agn.statistics_bt));
		else
		memcpy(&priv->_agn.statistics, &pkt->u.stats,
		sizeof(priv->_agn.statistics));

		set_bit(STATUS_STATISTICS, &priv->status);

		/* Reschedule the statistics timer to occur in
		* REG_RECALIB_PERIOD seconds to ensure we get a
		* thermal update even if the uCode doesn't give
		* us one */
		mod_timer(&priv->statistics_periodic, jiffies +
		msecs_to_jiffies(REG_RECALIB_PERIOD * 1000));

		if (unlikely(!test_bit(STATUS_SCANNING, &priv->status)) &&
		(pkt->hdr.cmd == STATISTICS_NOTIFICATION)) {
		iwl_rx_calc_noise(priv);
		queue_work(priv->workqueue, &priv->run_time_calib_work);
		}
		if (priv->cfg->ops->lib->temp_ops.temperature && change)
		priv->cfg->ops->lib->temp_ops.temperature(priv);
		}

		void iwl_reply_statistics(struct iwl_priv *priv,
		struct iwl_rx_mem_buffer *rxb)
		{
		struct iwl_rx_packet *pkt = rxb_addr(rxb);

		if (le32_to_cpu(pkt->u.stats.flag) & UCODE_STATISTICS_CLEAR_MSK) {
		#ifdef CONFIG_IWLWIFI_DEBUGFS
		memset(&priv->_agn.accum_statistics, 0,
		sizeof(struct iwl_notif_statistics));
		memset(&priv->_agn.delta_statistics, 0,
		sizeof(struct iwl_notif_statistics));
		memset(&priv->_agn.max_delta, 0,
		sizeof(struct iwl_notif_statistics));
		memset(&priv->_agn.accum_statistics_bt, 0,
		sizeof(struct iwl_bt_notif_statistics));
		memset(&priv->_agn.delta_statistics_bt, 0,
		sizeof(struct iwl_bt_notif_statistics));
		memset(&priv->_agn.max_delta_bt, 0,
		sizeof(struct iwl_bt_notif_statistics));
		#endif
		IWL_DEBUG_RX(priv, "Statistics have been cleared\n");
		}
		iwl_rx_statistics(priv, rxb);
		}

		void iwl_rx_missed_beacon_notif(struct iwl_priv *priv,
		struct iwl_rx_mem_buffer *rxb)

		{
		struct iwl_rx_packet *pkt = rxb_addr(rxb);
		struct iwl_missed_beacon_notif *missed_beacon;

		missed_beacon = &pkt->u.missed_beacon;
		if (le32_to_cpu(missed_beacon->consecutive_missed_beacons) >
		priv->missed_beacon_threshold) {
		IWL_DEBUG_CALIB(priv,
		"missed bcn cnsq %d totl %d rcd %d expctd %d\n",
		le32_to_cpu(missed_beacon->consecutive_missed_beacons),
		le32_to_cpu(missed_beacon->total_missed_becons),
		le32_to_cpu(missed_beacon->num_recvd_beacons),
		le32_to_cpu(missed_beacon->num_expected_beacons));
		if (!test_bit(STATUS_SCANNING, &priv->status))
		iwl_init_sensitivity(priv);
		}
		}

		/*
		* returns non-zero if packet should be dropped
		*/

Admin message