The patch has been merged in the v3.16-rc1 as following:
commit 882d18a702c66404fcb62b84748f719f9b47441c
Author: Rafael J. Wysocki <rafael.j.wyso...@intel.com>
Date: Tue Jun 10 22:46:35 2014 +0200
ACPI / hotplug / PCI: Add hotplug contexts to PCI host bridges
After relatively recent changes in the ACPI-based PCI hotplug
(ACPIPHP) code, the acpiphp_check_host_bridge() executed for PCI
host bridges via acpi_pci_root_scan_dependent() doesn't do anything
useful, because those bridges do not have hotplug contexts. That
happens by mistake, so fix it by making acpiphp_enumerate_slots()
add hotplug contexts to PCI host bridges too and modify
acpiphp_remove_slots() to drop those contexts for host bridges
as appropriate.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=76901
Fixes: 2d8b1d566a5f (ACPI / hotplug / PCI: Get rid of check_sub_bridges())
Reported-and-tested-by: Gavin Guo <gavin....@canonical.com>
Acked-by: Bjorn Helgaas <bhelg...@google.com>
Reviewed-by: Mika Westerberg <mika.westerb...@linux.intel.com>
Cc: 3.15+ <sta...@vger.kernel.org> # 3.15+
Signed-off-by: Rafael J. Wysocki <rafael.j.wyso...@intel.com>
I've tried to cherry-picked the commit. But it caused a lot of conflicts. And I
tried to show the difference between v3.13 to v3.16-rc1:
Wed Jun 18 08:37:57 gavin@gavin-w530:~/os/ubuntu-trusty$ git log
v3.13..v3.16-rc1 --pretty=oneline drivers/pci/hotplug/acpiphp_glue.c
7550cfab3d4053b54f16e2fe337affde71d1eb51 Merge tag 'pci-v3.16-changes-2' of
git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
882d18a702c66404fcb62b84748f719f9b47441c ACPI / hotplug / PCI: Add hotplug
contexts to PCI host bridges
227f06470502c4fea3d93df1f12a77e3e37f6263 PCI: Merge multi-line quoted strings
d1a2523d2adc0b6910dbc2a9aed44c4217134db1 Merge branches 'pci/hotplug',
'pci/pci_is_bridge' and 'pci/virtualization' into next
c7a071f6a9f02c9fd2d0aa81d000c814a7adb914 PCI: acpiphp: Use pci_is_bridge() to
simplify code
10874f5a00266343a06e95da680e8a5a383d9a80 PCI: Remove unnecessary __ref
annotations
56a3d18279f00c7ccbcdc193ceaf1a2f88c51457 PCI: Remove unnecessary includes of
<linux/init.h>
4b1779c2cf030c68aefe939d946475e4136c1895 Merge tag 'pci-v3.15-changes' of
git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
d901188f002104905a7845298e1a7dc94189007a Merge branch 'acpi-pci-hotplug' into
acpi-hotplug
b8a62d540240387c7e97a69127cab3ab9cadc70a ACPI / hotplug / PCI: Use
pci_device_is_present()
be27b3dcb02335ec093b81053fc8c84b32d3106e ACPI / dock: Add .uevent() callback to
struct acpi_hotplug_context
edf5bf34d40804fbef32f240a79b74ffc69a658b ACPI / dock: Use callback pointers
from devices' ACPI hotplug contexts
3b52b21fa1f44c8956e21dfba645eda959111b5e ACPI / dock: Use ACPI device object
pointers instead of ACPI handles
96075315c5e7077fc5a3ac54c9b9e97e376e66ed Merge branch 'acpi-pci-hotplug' into
acpi-dock
59b42fa01fe2d84f3c3f28ee6f25510820ace35b ACPI / hotplug: Add .fixup() callback
to struct acpi_hotplug_context
d7c7c0256b936901eb7a70fbc6d674a6bdfd463e ACPI / hotplug / PCI: Do not clear
event callback pointer for docks
cc6254e00eb676dda6501655f8185aef7b761b4f ACPI / hotplug / PCI: Add ACPIPHP
contexts to devices handled by PCIeHP
3799c5a032aefb258e2a19dfdb1e3780b78ee3ad ACPI / hotplug / PCI: Rename
register_slot() to acpiphp_add_context()
c6f0d5adc21e2d9623fe757f35a0a642a1d863c4 ACPI / hotplug / PCI: Use
list_for_each_entry() for bus traversal
4b49b9fe2b5220374ddc1c122cc31e00cc20365f Merge back earlier 'acpi-pci-hotplug'
material.
7282059489868e0ed1b0d79765730c6b233a8399 ACPI / hotplug / PCI: Relax the
checking of _STA return values
21369c77477a7f937174833c8094154f0f995710 ACPI / hotplug / PCI: Execute _EJ0
under the ACPI scan lock
1f7c164b6f2a8a028bfc36097fc42bf061c5212e ACPI / hotplug / PCI: Rework
acpiphp_check_host_bridge()
1a699476e25814343766342672c655fb135224cc ACPI / hotplug / PCI: Hotplug
notifications from acpi_bus_notify()
5e6f236c263117cef5f0d68e3fec241ba2adc4fc ACPI / hotplug / PCI: Simplify
acpi_install_hotplug_notify_handler()
3c2cc7ff9e2522e42468f8e81a7277be386c5ec4 ACPI / hotplug / PCI: Consolidate
ACPIPHP with ACPI core hotplug
e525506fcb67a9bbd94f01eac84af802139004eb ACPI / hotplug / PCI: Define hotplug
context lock in the core
d3a1ebb063cc45d5f4a5655534b87c3547fd9bbf ACPI / hotplug / PCI: Do not pass ACPI
handle to hotplug_event()
1d4a5b610e500fe860570db4ceb64e45255221ab ACPI / hotplug / PCI: Use
acpi_handle_debug() in hotplug_event()
b75cece1a79a6259185442004e040511ed3a7341 ACPI / hotplug / PCI: Simplify
hotplug_event()
661b40644190eb5987907584920cb11a4a2c7a9e ACPI / hotplug / PCI: Drop crit_sect
locking
b6708fbf98ac01d27c8d4d7f7b4fa87583b658cc ACPI / hotplug / PCI: Drop
acpiphp_bus_add()
bbcbfc0eed6220591ccc5752edd079099bb1920c ACPI / hotplug / PCI: Store
acpi_device pointer in acpiphp_context
b2118d6a4073e394312072b6666cb576e18653b2 ACPI / hotplug / PCI: Rework
acpiphp_no_hotplug()
4dc3082dc1dd1415177d71f15d4b19bebb1365c0 ACPI / hotplug / PCI: Drop
acpiphp_bus_trim()
146fc68a4bdd78e49d56f1530f6b8072034cf3ef ACPI / hotplug / PCI: Simplify
register_slot()
454481adf54417ef59b97e92ccb3dc69f3cd02c7 ACPI / hotplug / PCI: Proper kerneldoc
comments for enumeration/removal
1c0c5443de5f1f03ae2abce569fb673377f0fd0e ACPI / hotplug / PCI: Simplify
disable_slot()
af9d8adc6b832003bbe3d83fde665ae6b4f072eb ACPI / hotplug / PCI: Fix bridge
removal race vs dock events
1b360f44d009059e446532f29c1a889951e72667 ACPI / hotplug / PCI: Fix bridge
removal race in handle_hotplug_event()
d42f5da2340083301dd2c48ff2d75f6ce4b30767 ACPI / hotplug / PCI: Scan root bus
under the PCI rescan-remove lock
f41b32613138ae05329a0f0e7170223b775d6b24 ACPI / hotplug / PCI: Move PCI
rescan-remove locking to hotplug_event()
2d7c1b77dd59387070aab355532dd157f888325c ACPI / hotplug / PCI: Remove entries
from bus->devices in reverse order
09da8dfa98682d871987145ed11e3232accac860 Merge tag 'pm+acpi-3.14-rc1' of
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
e1ba84597c9012b9f9075aac283ac7537d7561ba Merge tag 'pci-v3.14-changes' of
git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
9217a984671e8a7e38f1822eba754898066e2ae1 ACPI / hotplug / PCI: Use global PCI
rescan-remove locking
d1badf8d4323cfc9325b06651bdfcf7df09f1f0e Merge branch 'acpi-pci-hotplug' into
acpi-hotplug
8ff47aafb25cc80417118e4968d4e7ca3f46c3ee Merge branch 'acpi-pci-hotplug' into
acpi-hotplug
202317a573b20d77a9abb7c16a3fd5b40cef3d9d ACPI / scan: Add acpi_device objects
for all device nodes in the namespace
76540969b1cf26349eb8867b57657b03c89025e5 Merge back earlier acpi-hotplug
material.
It got a lot of difference and have difficulties to merge.
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/1290189
Title:
Unable to hotplug ExpressCard in 12.04.4
To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/linux-lts-saucy/+bug/1290189/+subscriptions
--
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
