Patchwork [stable] Request to include SHAID: bc9d24a3aeb1532fc3e234907a8b6d671f7ed68f in 2.6.32 stable.

login
register
mail settings
Submitter Tim Gardner
Date June 29, 2010, 1:49 p.m.
Message ID <4C29F9F5.50104@canonical.com>
Download mbox | patch
Permalink /patch/57269/
State Awaiting Upstream
Headers show

Comments

Tim Gardner - June 29, 2010, 1:49 p.m.
On 06/25/2010 04:49 PM, Greg KH wrote:
> On Thu, Jun 10, 2010 at 03:29:26PM -0500, Manoj Iyer wrote:
>>
>> Please include the following patch in 2.6.32 stable.
>>
>> SHAID: bc9d24a3aeb1532fc3e234907a8b6d671f7ed68f
>> Subject: eeepc-laptop: check wireless hotplug events
>
> It does not apply to the 2.6.32-stable kernel, care to provide a
> backported version of this patch?
>
> thanks,
>
> greg k-h
>

Please find attached a backport of commit 
bc9d24a3aeb1532fc3e234907a8b6d671f7ed68f. The only minor difference is 
that the 2.6.32 version of eeepc_wlan_rfkill_blocked() does not require 
a context whereas 2.6.35 does.

rtg

Patch

From cb29b9140007b64fa158b3474c58e595dab4a22e Mon Sep 17 00:00:00 2001
From: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Date: Mon, 22 Feb 2010 16:03:58 +0000
Subject: [PATCH] eeepc-laptop: check wireless hotplug events

Backported from bc9d24a3aeb1532fc3e234907a8b6d671f7ed68f.

Before we mark the wireless device as unplugged, check PCI config space
to see whether the wireless device is really disabled (and vice versa).
This works around newer models which don't want the hotplug code, where
we end up disabling the wired network device.

My old 701 still works correctly with this.  I can also simulate an
afflicted model by changing the hardcoded PCI bus/slot number in the
driver, and it seems to work nicely (although it is a bit noisy).

In future this type of hotplug support will be implemented by the PCI
core.  The existing blacklist and the new warning message will be
removed at that point.

Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 drivers/platform/x86/eeepc-laptop.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 329093e..c533b1c 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -752,6 +752,8 @@  static void eeepc_rfkill_hotplug(void)
 	struct pci_dev *dev;
 	struct pci_bus *bus;
 	bool blocked = eeepc_wlan_rfkill_blocked();
+	bool absent;
+	u32 l;
 
 	if (ehotk->wlan_rfkill)
 		rfkill_set_sw_state(ehotk->wlan_rfkill, blocked);
@@ -765,6 +767,22 @@  static void eeepc_rfkill_hotplug(void)
 			goto out_unlock;
 		}
 
+		if (pci_bus_read_config_dword(bus, 0, PCI_VENDOR_ID, &l)) {
+			pr_err("Unable to read PCI config space?\n");
+			goto out_unlock;
+		}
+		absent = (l == 0xffffffff);
+
+		if (blocked != absent) {
+			pr_warning("BIOS says wireless lan is %s, "
+					"but the pci device is %s\n",
+				blocked ? "blocked" : "unblocked",
+				absent ? "absent" : "present");
+			pr_warning("skipped wireless hotplug as probably "
+					"inappropriate for this model\n");
+			goto out_unlock;
+		}
+
 		if (!blocked) {
 			dev = pci_get_slot(bus, 0);
 			if (dev) {
-- 
1.7.0.4