187 lines
7.8 KiB
Diff
187 lines
7.8 KiB
Diff
Backport of the following upstream commit...
|
|
|
|
commit beac5498b792ed8420885ee23e8d4f2885ee2d13
|
|
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
|
|
Date: Thu Mar 4 13:38:58 2010 -0800
|
|
|
|
iwlwifi: move plcp check to separated function
|
|
|
|
Move the plcp error checking into stand alone function and pointed by ops
|
|
to accommodate devices not needing this recovery.
|
|
|
|
Signed-off-by: Trieu 'Andrew' Nguyen <trieux.t.nguyen@intel.com>
|
|
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
|
|
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
|
|
|
|
diff -up linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-1000.c.orig linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-1000.c
|
|
--- linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-1000.c.orig 2010-04-13 14:40:14.000000000 -0400
|
|
+++ linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-04-13 14:40:43.000000000 -0400
|
|
@@ -139,6 +139,7 @@ static struct iwl_lib_ops iwl1000_lib =
|
|
.set_ct_kill = iwl1000_set_ct_threshold,
|
|
},
|
|
.recover_from_tx_stall = iwl_bg_monitor_recover,
|
|
+ .recover_from_statistics = iwl_recover_from_statistics,
|
|
};
|
|
|
|
static struct iwl_ops iwl1000_ops = {
|
|
diff -up linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c
|
|
--- linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig 2010-04-13 14:40:14.000000000 -0400
|
|
+++ linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-04-13 14:41:23.000000000 -0400
|
|
@@ -2213,6 +2213,7 @@ static struct iwl_lib_ops iwl4965_lib =
|
|
.temperature = iwl4965_temperature_calib,
|
|
.set_ct_kill = iwl4965_set_ct_threshold,
|
|
},
|
|
+ .recover_from_statistics = iwl_recover_from_statistics,
|
|
};
|
|
|
|
static struct iwl_ops iwl4965_ops = {
|
|
diff -up linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-5000.c.orig linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-5000.c
|
|
--- linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-5000.c.orig 2010-04-13 14:40:14.000000000 -0400
|
|
+++ linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-04-13 14:40:43.000000000 -0400
|
|
@@ -1507,6 +1507,7 @@ struct iwl_lib_ops iwl5000_lib = {
|
|
.set_ct_kill = iwl5000_set_ct_threshold,
|
|
},
|
|
.recover_from_tx_stall = iwl_bg_monitor_recover,
|
|
+ .recover_from_statistics = iwl_recover_from_statistics,
|
|
};
|
|
|
|
static struct iwl_lib_ops iwl5150_lib = {
|
|
@@ -1560,6 +1561,7 @@ static struct iwl_lib_ops iwl5150_lib =
|
|
.set_ct_kill = iwl5150_set_ct_threshold,
|
|
},
|
|
.recover_from_tx_stall = iwl_bg_monitor_recover,
|
|
+ .recover_from_statistics = iwl_recover_from_statistics,
|
|
};
|
|
|
|
static struct iwl_ops iwl5000_ops = {
|
|
diff -up linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-6000.c.orig linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-6000.c
|
|
--- linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-6000.c.orig 2010-04-13 14:40:14.000000000 -0400
|
|
+++ linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-04-13 14:42:29.000000000 -0400
|
|
@@ -251,6 +251,7 @@ static struct iwl_lib_ops iwl6000_lib =
|
|
.set_ct_kill = iwl6000_set_ct_threshold,
|
|
},
|
|
.recover_from_tx_stall = iwl_bg_monitor_recover,
|
|
+ .recover_from_statistics = iwl_recover_from_statistics,
|
|
};
|
|
|
|
static struct iwl_ops iwl6000_ops = {
|
|
diff -up linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-core.h.orig linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-core.h
|
|
--- linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-core.h.orig 2010-04-13 14:40:14.000000000 -0400
|
|
+++ linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-core.h 2010-04-13 14:43:12.000000000 -0400
|
|
@@ -189,6 +189,9 @@ struct iwl_lib_ops {
|
|
struct iwl_temp_ops temp_ops;
|
|
/* recover from tx queue stall */
|
|
void (*recover_from_tx_stall)(unsigned long data);
|
|
+ /* recover from errors showed in statistics */
|
|
+ void (*recover_from_statistics)(struct iwl_priv *priv,
|
|
+ struct iwl_rx_packet *pkt);
|
|
};
|
|
|
|
struct iwl_led_ops {
|
|
@@ -432,6 +435,8 @@ int iwl_tx_queue_reclaim(struct iwl_priv
|
|
/* Handlers */
|
|
void iwl_rx_missed_beacon_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_rx_statistics(struct iwl_priv *priv,
|
|
struct iwl_rx_mem_buffer *rxb);
|
|
void iwl_reply_statistics(struct iwl_priv *priv,
|
|
diff -up linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-rx.c.orig linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-rx.c
|
|
--- linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-rx.c.orig 2010-04-13 14:40:14.000000000 -0400
|
|
+++ linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-rx.c 2010-04-13 14:40:43.000000000 -0400
|
|
@@ -594,28 +594,18 @@ static void iwl_accumulative_statistics(
|
|
#define REG_RECALIB_PERIOD (60)
|
|
|
|
#define PLCP_MSG "plcp_err exceeded %u, %u, %u, %u, %u, %d, %u mSecs\n"
|
|
-void iwl_rx_statistics(struct iwl_priv *priv,
|
|
- struct iwl_rx_mem_buffer *rxb)
|
|
+/*
|
|
+ * This function checks for plcp error.
|
|
+ * - When the plcp error is exceeding the thresholds, it will reset the radio
|
|
+ * to improve the throughput.
|
|
+ */
|
|
+void iwl_recover_from_statistics(struct iwl_priv *priv,
|
|
+ struct iwl_rx_packet *pkt)
|
|
{
|
|
- int change;
|
|
- struct iwl_rx_packet *pkt = rxb_addr(rxb);
|
|
int combined_plcp_delta;
|
|
unsigned int plcp_msec;
|
|
unsigned long plcp_received_jiffies;
|
|
|
|
- IWL_DEBUG_RX(priv, "Statistics notification received (%d vs %d).\n",
|
|
- (int)sizeof(priv->statistics),
|
|
- le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK);
|
|
-
|
|
- change = ((priv->statistics.general.temperature !=
|
|
- pkt->u.stats.general.temperature) ||
|
|
- ((priv->statistics.flag &
|
|
- STATISTICS_REPLY_FLG_HT40_MODE_MSK) !=
|
|
- (pkt->u.stats.flag & STATISTICS_REPLY_FLG_HT40_MODE_MSK)));
|
|
-
|
|
-#ifdef CONFIG_IWLWIFI_DEBUG
|
|
- iwl_accumulative_statistics(priv, (__le32 *)&pkt->u.stats);
|
|
-#endif
|
|
/*
|
|
* check for plcp_err and trigger radio reset if it exceeds
|
|
* the plcp error threshold plcp_delta.
|
|
@@ -636,11 +626,11 @@ void iwl_rx_statistics(struct iwl_priv *
|
|
le32_to_cpu(priv->statistics.rx.ofdm_ht.plcp_err));
|
|
|
|
if ((combined_plcp_delta > 0) &&
|
|
- ((combined_plcp_delta * 100) / plcp_msec) >
|
|
+ ((combined_plcp_delta * 100) / plcp_msec) >
|
|
priv->cfg->plcp_delta_threshold) {
|
|
/*
|
|
- * if plcp_err exceed the threshold, the following
|
|
- * data is printed in csv format:
|
|
+ * 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,
|
|
@@ -655,9 +645,8 @@ void iwl_rx_statistics(struct iwl_priv *
|
|
le32_to_cpu(priv->statistics.rx.ofdm.plcp_err),
|
|
le32_to_cpu(pkt->u.stats.rx.ofdm_ht.plcp_err),
|
|
le32_to_cpu(
|
|
- priv->statistics.rx.ofdm_ht.plcp_err),
|
|
+ priv->statistics.rx.ofdm_ht.plcp_err),
|
|
combined_plcp_delta, plcp_msec);
|
|
-
|
|
/*
|
|
* Reset the RF radio due to the high plcp
|
|
* error rate
|
|
@@ -665,6 +654,31 @@ void iwl_rx_statistics(struct iwl_priv *
|
|
iwl_force_reset(priv, IWL_RF_RESET);
|
|
}
|
|
}
|
|
+}
|
|
+EXPORT_SYMBOL(iwl_recover_from_statistics);
|
|
+
|
|
+void iwl_rx_statistics(struct iwl_priv *priv,
|
|
+ struct iwl_rx_mem_buffer *rxb)
|
|
+{
|
|
+ int change;
|
|
+ struct iwl_rx_packet *pkt = rxb_addr(rxb);
|
|
+
|
|
+
|
|
+ IWL_DEBUG_RX(priv, "Statistics notification received (%d vs %d).\n",
|
|
+ (int)sizeof(priv->statistics),
|
|
+ le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK);
|
|
+
|
|
+ change = ((priv->statistics.general.temperature !=
|
|
+ pkt->u.stats.general.temperature) ||
|
|
+ ((priv->statistics.flag &
|
|
+ STATISTICS_REPLY_FLG_HT40_MODE_MSK) !=
|
|
+ (pkt->u.stats.flag & STATISTICS_REPLY_FLG_HT40_MODE_MSK)));
|
|
+
|
|
+#ifdef CONFIG_IWLWIFI_DEBUG
|
|
+ iwl_accumulative_statistics(priv, (__le32 *)&pkt->u.stats);
|
|
+#endif
|
|
+ if (priv->cfg->ops->lib->recover_from_statistics)
|
|
+ priv->cfg->ops->lib->recover_from_statistics(priv, pkt);
|
|
|
|
memcpy(&priv->statistics, &pkt->u.stats, sizeof(priv->statistics));
|
|
|