eeepc-laptop: check wireless hotplug events (bc9d24a3) · Commits · 戴 / test

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>

drivers/platform/x86/eeepc-laptop.c

+18 −0

Original line number	Diff line number	Diff line
		@@ -578,6 +578,8 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc)
		struct pci_dev *dev;
		struct pci_bus *bus;
		bool blocked = eeepc_wlan_rfkill_blocked(eeepc);
		bool absent;
		u32 l;

		if (eeepc->wlan_rfkill)
		rfkill_set_sw_state(eeepc->wlan_rfkill, blocked);
		@@ -591,6 +593,22 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc)
		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) {

Admin message