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

Commit ecaee0ff authored Jun 08, 2011 by Stanislaw Gruszka Committed by John W. Linville Jun 10, 2011

iwlegacy: remove recover from statistics

Recover from statistics code was added during 6xxx devices development,
I don't think is needed on old devices. Also it is suspicious to cause
random, unreproducible microcode errors and hangs. So remove it.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 3c09b174

drivers/net/wireless/iwlegacy/iwl-3945.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -408,7 +408,6 @@ void iwl3945_hw_rx_statistics(struct iwl_priv *priv,
	#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS		#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS
	iwl3945_accumulative_statistics(priv, (__le32 *)&pkt->u.raw);		iwl3945_accumulative_statistics(priv, (__le32 *)&pkt->u.raw);
	#endif		#endif
	iwl_legacy_recover_from_statistics(priv, pkt);

	memcpy(&priv->_3945.statistics, pkt->u.raw, sizeof(priv->_3945.statistics));		memcpy(&priv->_3945.statistics, pkt->u.raw, sizeof(priv->_3945.statistics));
	}		}

drivers/net/wireless/iwlegacy/iwl-4965-rx.c

+1 −77

Original line number	Original line	Diff line number	Diff line
	@@ -151,81 +151,6 @@ static void iwl4965_accumulative_statistics(struct iwl_priv *priv,

	#define REG_RECALIB_PERIOD (60)		#define REG_RECALIB_PERIOD (60)

	/**
	* iwl4965_good_plcp_health - checks for plcp error.
	*
	* When the plcp error is exceeding the thresholds, reset the radio
	* to improve the throughput.
	*/
	bool iwl4965_good_plcp_health(struct iwl_priv *priv,
	struct iwl_rx_packet *pkt)
	{
	bool rc = true;
	int combined_plcp_delta;
	unsigned int plcp_msec;
	unsigned long plcp_received_jiffies;

	if (priv->cfg->base_params->plcp_delta_threshold ==
	IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE) {
	IWL_DEBUG_RADIO(priv, "plcp_err check disabled\n");
	return rc;
	}

	/*
	* check for plcp_err and trigger radio reset if it exceeds
	* the plcp error threshold plcp_delta.
	*/
	plcp_received_jiffies = jiffies;
	plcp_msec = jiffies_to_msecs((long) plcp_received_jiffies -
	(long) priv->plcp_jiffies);
	priv->plcp_jiffies = plcp_received_jiffies;
	/*
	* check to make sure plcp_msec is not 0 to prevent division
	* by zero.
	*/
	if (plcp_msec) {
	struct statistics_rx_phy *ofdm;
	struct statistics_rx_ht_phy *ofdm_ht;

	ofdm = &pkt->u.stats.rx.ofdm;
	ofdm_ht = &pkt->u.stats.rx.ofdm_ht;
	combined_plcp_delta =
	(le32_to_cpu(ofdm->plcp_err) -
	le32_to_cpu(priv->_4965.statistics.
	rx.ofdm.plcp_err)) +
	(le32_to_cpu(ofdm_ht->plcp_err) -
	le32_to_cpu(priv->_4965.statistics.
	rx.ofdm_ht.plcp_err));

	if ((combined_plcp_delta > 0) &&
	((combined_plcp_delta * 100) / plcp_msec) >
	priv->cfg->base_params->plcp_delta_threshold) {
	/*
	* if plcp_err exceed the threshold,
	* the following data is printed in csv format:
	* Text: plcp_err exceeded %d,
	* Received ofdm.plcp_err,
	* Current ofdm.plcp_err,
	* Received ofdm_ht.plcp_err,
	* Current ofdm_ht.plcp_err,
	* combined_plcp_delta,
	* plcp_msec
	*/
	IWL_DEBUG_RADIO(priv, "plcp_err exceeded %u, "
	"%u, %u, %u, %u, %d, %u mSecs\n",
	priv->cfg->base_params->plcp_delta_threshold,
	le32_to_cpu(ofdm->plcp_err),
	le32_to_cpu(ofdm->plcp_err),
	le32_to_cpu(ofdm_ht->plcp_err),
	le32_to_cpu(ofdm_ht->plcp_err),
	combined_plcp_delta, plcp_msec);

	rc = false;
	}
	}
	return rc;
	}

	void iwl4965_rx_statistics(struct iwl_priv *priv,		void iwl4965_rx_statistics(struct iwl_priv *priv,
	struct iwl_rx_mem_buffer *rxb)		struct iwl_rx_mem_buffer *rxb)
	{		{
	@@ -248,8 +173,7 @@ void iwl4965_rx_statistics(struct iwl_priv *priv,
	iwl4965_accumulative_statistics(priv, (__le32 *)&pkt->u.stats);		iwl4965_accumulative_statistics(priv, (__le32 *)&pkt->u.stats);
	#endif		#endif

	iwl_legacy_recover_from_statistics(priv, pkt);		/* TODO: reading some of statistics is unneeded */

	memcpy(&priv->_4965.statistics, &pkt->u.stats,		memcpy(&priv->_4965.statistics, &pkt->u.stats,
	sizeof(priv->_4965.statistics));		sizeof(priv->_4965.statistics));

drivers/net/wireless/iwlegacy/iwl-4965.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2100,7 +2100,6 @@ static struct iwl_lib_ops iwl4965_lib = {
	.tx_stats_read = iwl4965_ucode_tx_stats_read,		.tx_stats_read = iwl4965_ucode_tx_stats_read,
	.general_stats_read = iwl4965_ucode_general_stats_read,		.general_stats_read = iwl4965_ucode_general_stats_read,
	},		},
	.check_plcp_health = iwl4965_good_plcp_health,
	};		};

	static const struct iwl_legacy_ops iwl4965_legacy_ops = {		static const struct iwl_legacy_ops iwl4965_legacy_ops = {

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

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -161,9 +161,6 @@ struct iwl_lib_ops {

	/* temperature */		/* temperature */
	struct iwl_temp_ops temp_ops;		struct iwl_temp_ops temp_ops;
	/* check for plcp health */
	bool (check_plcp_health)(struct iwl_priv priv,
	struct iwl_rx_packet *pkt);

	struct iwl_debugfs_ops debugfs_ops;		struct iwl_debugfs_ops debugfs_ops;

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

+0 −21

Original line number	Original line	Diff line number	Diff line
	@@ -227,27 +227,6 @@ void iwl_legacy_rx_spectrum_measure_notif(struct iwl_priv *priv,
	}		}
	EXPORT_SYMBOL(iwl_legacy_rx_spectrum_measure_notif);		EXPORT_SYMBOL(iwl_legacy_rx_spectrum_measure_notif);

	void iwl_legacy_recover_from_statistics(struct iwl_priv *priv,
	struct iwl_rx_packet *pkt)
	{
	if (test_bit(STATUS_EXIT_PENDING, &priv->status))
	return;
	if (iwl_legacy_is_any_associated(priv)) {
	if (priv->cfg->ops->lib->check_plcp_health) {
	if (!priv->cfg->ops->lib->check_plcp_health(
	priv, pkt)) {
	/*
	* high plcp error detected
	* reset Radio
	*/
	iwl_legacy_force_reset(priv,
	IWL_RF_RESET, false);
	}
	}
	}
	}
	EXPORT_SYMBOL(iwl_legacy_recover_from_statistics);

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