more iwlwifi fixes submitted to stable by Stanislaw
This commit is contained in:
Kyle McMartin
parent
915385f9f0
commit
da9a09fb91
|
|
@ -0,0 +1,57 @@
|
|||
From kernel-bounces@lists.fedoraproject.org Thu Apr 28 08:09:29 2011
|
||||
From: Stanislaw Gruszka <sgruszka@redhat.com>
|
||||
To: stable@kernel.org, kernel@lists.fedoraproject.org
|
||||
Subject: [PATCH 2.6.38 3/4] iwl3945: disable hw scan by default
|
||||
Date: Thu, 28 Apr 2011 14:08:14 +0200
|
||||
Message-Id: <1303992495-7337-4-git-send-email-sgruszka@redhat.com>
|
||||
|
||||
commit 0263aa45293838b514b8af674a03faf040991a90 upstream.
|
||||
|
||||
After new NetworkManager 0.8.996 changes, hardware scanning is causing
|
||||
microcode errors as reported here:
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=683571
|
||||
and sometimes kernel crashes:
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=688252
|
||||
|
||||
Also with hw scan there are very bad performance on some systems
|
||||
as reported here:
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=671366
|
||||
|
||||
Since Intel no longer supports 3945, there is no chance to get proper
|
||||
firmware fixes, we need workaround problems by disable hardware scanning
|
||||
by default.
|
||||
|
||||
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
||||
---
|
||||
drivers/net/wireless/iwlwifi/iwl3945-base.c | 3 ++-
|
||||
1 files changed, 2 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
|
||||
index cf0699a..a8340f7 100644
|
||||
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
|
||||
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
|
||||
@@ -94,6 +94,7 @@ MODULE_LICENSE("GPL");
|
||||
struct iwl_mod_params iwl3945_mod_params = {
|
||||
.sw_crypto = 1,
|
||||
.restart_fw = 1,
|
||||
+ .disable_hw_scan = 1,
|
||||
/* the rest are 0 by default */
|
||||
};
|
||||
|
||||
@@ -4317,7 +4318,7 @@ MODULE_PARM_DESC(debug, "debug output mask");
|
||||
#endif
|
||||
module_param_named(disable_hw_scan, iwl3945_mod_params.disable_hw_scan,
|
||||
int, S_IRUGO);
|
||||
-MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 0)");
|
||||
+MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 1)");
|
||||
module_param_named(fw_restart3945, iwl3945_mod_params.restart_fw, int, S_IRUGO);
|
||||
MODULE_PARM_DESC(fw_restart3945, "restart firmware in case of error");
|
||||
|
||||
--
|
||||
1.7.1
|
||||
|
||||
_______________________________________________
|
||||
kernel mailing list
|
||||
kernel@lists.fedoraproject.org
|
||||
https://admin.fedoraproject.org/mailman/listinfo/kernel
|
||||
|
||||
|
|
@ -0,0 +1,49 @@
|
|||
From kernel-bounces@lists.fedoraproject.org Thu Apr 28 08:09:23 2011
|
||||
From: Stanislaw Gruszka <sgruszka@redhat.com>
|
||||
To: stable@kernel.org, kernel@lists.fedoraproject.org
|
||||
Subject: [PATCH 2.6.38 2/4] iwl3945: do not deprecate software scan
|
||||
Date: Thu, 28 Apr 2011 14:08:13 +0200
|
||||
Message-Id: <1303992495-7337-3-git-send-email-sgruszka@redhat.com>
|
||||
|
||||
commit 3bda50e3eaf58a4b9c4ce34204e5faa15c8b1b97 upstream.
|
||||
|
||||
Software scanning can be used for workaround some performance problems,
|
||||
so do not deprecate it.
|
||||
|
||||
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
||||
---
|
||||
drivers/net/wireless/iwlwifi/iwl3945-base.c | 6 ++----
|
||||
1 files changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
|
||||
index 371abbf..cf0699a 100644
|
||||
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
|
||||
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
|
||||
@@ -3995,8 +3995,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
|
||||
* "the hard way", rather than using device's scan.
|
||||
*/
|
||||
if (iwl3945_mod_params.disable_hw_scan) {
|
||||
- dev_printk(KERN_DEBUG, &(pdev->dev),
|
||||
- "sw scan support is deprecated\n");
|
||||
+ IWL_DEBUG_INFO(priv, "Disabling hw_scan\n");
|
||||
iwl3945_hw_ops.hw_scan = NULL;
|
||||
}
|
||||
|
||||
@@ -4318,8 +4317,7 @@ MODULE_PARM_DESC(debug, "debug output mask");
|
||||
#endif
|
||||
module_param_named(disable_hw_scan, iwl3945_mod_params.disable_hw_scan,
|
||||
int, S_IRUGO);
|
||||
-MODULE_PARM_DESC(disable_hw_scan,
|
||||
- "disable hardware scanning (default 0) (deprecated)");
|
||||
+MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 0)");
|
||||
module_param_named(fw_restart3945, iwl3945_mod_params.restart_fw, int, S_IRUGO);
|
||||
MODULE_PARM_DESC(fw_restart3945, "restart firmware in case of error");
|
||||
|
||||
--
|
||||
1.7.1
|
||||
|
||||
_______________________________________________
|
||||
kernel mailing list
|
||||
kernel@lists.fedoraproject.org
|
||||
https://admin.fedoraproject.org/mailman/listinfo/kernel
|
||||
|
||||
|
|
@ -1,7 +1,12 @@
|
|||
From dda82c37c366672fa74499f4b639d059a802d16e Mon Sep 17 00:00:00 2001
|
||||
From kernel-bounces@lists.fedoraproject.org Thu Apr 28 08:09:22 2011
|
||||
From: Stanislaw Gruszka <sgruszka@redhat.com>
|
||||
Date: Fri, 28 Jan 2011 16:47:44 +0100
|
||||
Subject: [PATCH] iwlwifi: do not set tx power when channel is changing
|
||||
To: stable@kernel.org, kernel@lists.fedoraproject.org
|
||||
Subject: [PATCH 2.6.38 1/4] iwlwifi: do not set tx power when channel is
|
||||
changing
|
||||
Date: Thu, 28 Apr 2011 14:08:12 +0200
|
||||
Message-Id: <1303992495-7337-2-git-send-email-sgruszka@redhat.com>
|
||||
|
||||
commit f844a709a7d8f8be61a571afc31dfaca9e779621 upstream.
|
||||
|
||||
Mac80211 can request for tx power and channel change in one ->config
|
||||
call. If that happens, *_send_tx_power functions will try to setup tx
|
||||
|
|
@ -10,8 +15,6 @@ the band. I.e error "Failed to get channel info for channel 140 [0]",
|
|||
can be printed frequently when operating in software scanning mode.
|
||||
|
||||
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
||||
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
|
||||
Signed-off-by: John W. Linville <linville@tuxdriver.com>
|
||||
---
|
||||
drivers/net/wireless/iwlwifi/iwl-3945.c | 2 +-
|
||||
drivers/net/wireless/iwlwifi/iwl-4965.c | 2 +-
|
||||
|
|
@ -95,5 +98,10 @@ index efbde1f..91cac6f 100644
|
|||
}
|
||||
|
||||
--
|
||||
1.7.4.4
|
||||
1.7.1
|
||||
|
||||
_______________________________________________
|
||||
kernel mailing list
|
||||
kernel@lists.fedoraproject.org
|
||||
https://admin.fedoraproject.org/mailman/listinfo/kernel
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,134 @@
|
|||
From kernel-bounces@lists.fedoraproject.org Thu Apr 28 08:09:35 2011
|
||||
From: Stanislaw Gruszka <sgruszka@redhat.com>
|
||||
To: stable@kernel.org, kernel@lists.fedoraproject.org
|
||||
Subject: [PATCH 2.6.38 4/4] iwlwifi: fix tx_power initialization
|
||||
Date: Thu, 28 Apr 2011 14:08:15 +0200
|
||||
Message-Id: <1303992495-7337-5-git-send-email-sgruszka@redhat.com>
|
||||
|
||||
commit 332704a51498a7e29aa92c19dc03f11f80b71bfe upstream.
|
||||
|
||||
priv->tx_power_next is not initialized to max supported power,
|
||||
but instead default value is used, what cause errors like
|
||||
|
||||
[ 58.597834] iwl3945 0000:03:00.0: Requested user TXPOWER 15 above upper limit 14.
|
||||
[ 58.597839] iwl3945 0000:03:00.0: Error setting Tx power (-22).
|
||||
|
||||
if maximum tx power read from the eeprom is smaller than default.
|
||||
In consequence card is unable to initialize properly. Fix the problem
|
||||
and cleanup tx power initialization.
|
||||
|
||||
Reported-and-tested-by: Robin Dong <hao.bigrat@gmail.com>
|
||||
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
||||
---
|
||||
drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 2 --
|
||||
drivers/net/wireless/iwlwifi/iwl-agn.c | 6 ------
|
||||
drivers/net/wireless/iwlwifi/iwl-core.c | 9 +++++++--
|
||||
drivers/net/wireless/iwlwifi/iwl-eeprom.c | 7 -------
|
||||
drivers/net/wireless/iwlwifi/iwl3945-base.c | 4 ----
|
||||
5 files changed, 7 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-hw.h b/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
|
||||
index 65b5834..c2dd4cd 100644
|
||||
--- a/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
|
||||
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
|
||||
@@ -74,8 +74,6 @@
|
||||
/* RSSI to dBm */
|
||||
#define IWL39_RSSI_OFFSET 95
|
||||
|
||||
-#define IWL_DEFAULT_TX_POWER 0x0F
|
||||
-
|
||||
/*
|
||||
* EEPROM related constants, enums, and structures.
|
||||
*/
|
||||
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
|
||||
index c1cfd99..35239f0 100644
|
||||
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
|
||||
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
|
||||
@@ -3841,12 +3841,6 @@ static int iwl_init_drv(struct iwl_priv *priv)
|
||||
priv->dynamic_frag_thresh = BT_FRAG_THRESHOLD_DEF;
|
||||
}
|
||||
|
||||
- /* Set the tx_power_user_lmt to the lowest power level
|
||||
- * this value will get overwritten by channel max power avg
|
||||
- * from eeprom */
|
||||
- priv->tx_power_user_lmt = IWLAGN_TX_POWER_TARGET_POWER_MIN;
|
||||
- priv->tx_power_next = IWLAGN_TX_POWER_TARGET_POWER_MIN;
|
||||
-
|
||||
ret = iwl_init_channel_map(priv);
|
||||
if (ret) {
|
||||
IWL_ERR(priv, "initializing regulatory failed: %d\n", ret);
|
||||
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
|
||||
index 91cac6f..294e9fc 100644
|
||||
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
|
||||
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
|
||||
@@ -168,6 +168,7 @@ int iwlcore_init_geos(struct iwl_priv *priv)
|
||||
struct ieee80211_channel *geo_ch;
|
||||
struct ieee80211_rate *rates;
|
||||
int i = 0;
|
||||
+ s8 max_tx_power = 0;
|
||||
|
||||
if (priv->bands[IEEE80211_BAND_2GHZ].n_bitrates ||
|
||||
priv->bands[IEEE80211_BAND_5GHZ].n_bitrates) {
|
||||
@@ -244,8 +245,8 @@ int iwlcore_init_geos(struct iwl_priv *priv)
|
||||
|
||||
geo_ch->flags |= ch->ht40_extension_channel;
|
||||
|
||||
- if (ch->max_power_avg > priv->tx_power_device_lmt)
|
||||
- priv->tx_power_device_lmt = ch->max_power_avg;
|
||||
+ if (ch->max_power_avg > max_tx_power)
|
||||
+ max_tx_power = ch->max_power_avg;
|
||||
} else {
|
||||
geo_ch->flags |= IEEE80211_CHAN_DISABLED;
|
||||
}
|
||||
@@ -258,6 +259,10 @@ int iwlcore_init_geos(struct iwl_priv *priv)
|
||||
geo_ch->flags);
|
||||
}
|
||||
|
||||
+ priv->tx_power_device_lmt = max_tx_power;
|
||||
+ priv->tx_power_user_lmt = max_tx_power;
|
||||
+ priv->tx_power_next = max_tx_power;
|
||||
+
|
||||
if ((priv->bands[IEEE80211_BAND_5GHZ].n_channels == 0) &&
|
||||
priv->cfg->sku & IWL_SKU_A) {
|
||||
IWL_INFO(priv, "Incorrectly detected BG card as ABG. "
|
||||
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
|
||||
index 358cfd7..8b3c127 100644
|
||||
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c
|
||||
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
|
||||
@@ -724,13 +724,6 @@ int iwl_init_channel_map(struct iwl_priv *priv)
|
||||
flags & EEPROM_CHANNEL_RADAR))
|
||||
? "" : "not ");
|
||||
|
||||
- /* Set the tx_power_user_lmt to the highest power
|
||||
- * supported by any channel */
|
||||
- if (eeprom_ch_info[ch].max_power_avg >
|
||||
- priv->tx_power_user_lmt)
|
||||
- priv->tx_power_user_lmt =
|
||||
- eeprom_ch_info[ch].max_power_avg;
|
||||
-
|
||||
ch_info++;
|
||||
}
|
||||
}
|
||||
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
|
||||
index a8340f7..64917ed 100644
|
||||
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
|
||||
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
|
||||
@@ -3859,10 +3859,6 @@ static int iwl3945_init_drv(struct iwl_priv *priv)
|
||||
priv->force_reset[IWL_FW_RESET].reset_duration =
|
||||
IWL_DELAY_NEXT_FORCE_FW_RELOAD;
|
||||
|
||||
-
|
||||
- priv->tx_power_user_lmt = IWL_DEFAULT_TX_POWER;
|
||||
- priv->tx_power_next = IWL_DEFAULT_TX_POWER;
|
||||
-
|
||||
if (eeprom->version < EEPROM_3945_EEPROM_VERSION) {
|
||||
IWL_WARN(priv, "Unsupported EEPROM version: 0x%04X\n",
|
||||
eeprom->version);
|
||||
--
|
||||
1.7.1
|
||||
|
||||
_______________________________________________
|
||||
kernel mailing list
|
||||
kernel@lists.fedoraproject.org
|
||||
https://admin.fedoraproject.org/mailman/listinfo/kernel
|
||||
|
||||
13
kernel.spec
13
kernel.spec
|
|
@ -51,7 +51,7 @@ Summary: The Linux kernel
|
|||
# For non-released -rc kernels, this will be prepended with "0.", so
|
||||
# for example a 3 here will become 0.3
|
||||
#
|
||||
%global baserelease 19
|
||||
%global baserelease 20
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
# base_sublevel is the kernel version we're starting with and patching
|
||||
|
|
@ -727,7 +727,10 @@ Patch12303: dmar-disable-when-ricoh-multifunction.patch
|
|||
Patch12305: printk-do-not-mangle-valid-userspace-syslog-prefixes.patch
|
||||
Patch12306: scsi-sd-downgrade-caching-printk-from-error-to-notice.patch
|
||||
|
||||
Patch12307: iwlwifi-do-not-set-tx-power-when-channel-is-changing.patch
|
||||
Patch12310: iwlwifi-do-not-set-tx-power-when-channel-is-changing.patch
|
||||
Patch12311: iwl3945-do-not-deprecate-software-scan.patch
|
||||
Patch12312: iwl3945-disable-hw-scan-by-default.patch
|
||||
Patch12313: iwlwifi-fix-tx_power-initialization.patch
|
||||
|
||||
#netconsole fixes
|
||||
Patch12400: linux-2.6-netconsole-deadlock.patch
|
||||
|
|
@ -1258,6 +1261,9 @@ ApplyPatch hda_intel-prealloc-4mb-dmabuffer.patch
|
|||
|
||||
# rhbz#688252
|
||||
ApplyPatch iwlwifi-do-not-set-tx-power-when-channel-is-changing.patch
|
||||
ApplyPatch iwl3945-do-not-deprecate-software-scan.patch
|
||||
ApplyPatch iwl3945-disable-hw-scan-by-default.patch
|
||||
ApplyPatch iwlwifi-fix-tx_power-initialization.patch
|
||||
|
||||
# Misc fixes
|
||||
# The input layer spews crap no-one cares about.
|
||||
|
|
@ -1966,6 +1972,9 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
* Thu Apr 28 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38.4-20
|
||||
- [sgruszka@] Upstream fixes for iwl3945 bugs (#683571, #688252, #671366)
|
||||
|
||||
* Tue Apr 26 2011 Chuck Ebbert <cebbert@redhat.com>
|
||||
- Another fix for ASPM powersave mode
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue