Messages in this thread Patch in this message |  | | From | Adam Lee <> | Subject | [PATCH] pci: check PCI_EXP_FLAGS_SLOT before setting hotplug bridge | Date | Mon, 18 Nov 2013 17:40:52 +0800 |
| |
This patch adds the PCI_EXP_FLAGS_SLOT check back before setting hotplug bridge, which is omitted by an API switching commit, 59875ae489609b2267548dc85160c5f0f0c6f9d4 "PCI/core: Use PCI Express Capability accessors".
Some Lenovo laptops hang in booting without this fix.
Signed-off-by: Adam Lee <adam.lee@canonical.com> --- drivers/pci/probe.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 5e14f5a..b93d5ac 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -992,8 +992,13 @@ void set_pcie_port_type(struct pci_dev *pdev) void set_pcie_hotplug_bridge(struct pci_dev *pdev) { + u16 reg16; u32 reg32; + pcie_capability_read_word(pdev, PCI_EXP_FLAGS, ®16); + if (!(reg16 & PCI_EXP_FLAGS_SLOT)) + return; + pcie_capability_read_dword(pdev, PCI_EXP_SLTCAP, ®32); if (reg32 & PCI_EXP_SLTCAP_HPC) pdev->is_hotplug_bridge = 1; -- 1.8.4.3
|  |