Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci:
  PCI hotplug: shpchp: don't blindly claim non-AMD 0x7450 device IDs
  PCI: pciehp: wait 100 ms after Link Training check
  PCI: pciehp: wait 1000 ms before Link Training check
  PCI: pciehp: Retrieve link speed after link is trained
  PCI: Let PCI_PRI depend on PCI
  PCI: Fix compile errors with PCI_ATS and !PCI_IOV
  PCI / ACPI: Make acpiphp ignore root bridges using PCIe native hotplug

5 files changed, 46 insertions, 21 deletions

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 596172b4ae95..fce1c54a0c8d 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -459,8 +459,17 @@ static int add_bridge(acpi_handle handle)
 {
         acpi_status status;
         unsigned long long tmp;
+        struct acpi_pci_root *root;
         acpi_handle dummy_handle;
 
+        /*
+         * We shouldn't use this bridge if PCIe native hotplug control has been
+         * granted by the BIOS for it.
+         */
+        root = acpi_pci_find_root(handle);
+        if (root && (root->osc_control_set & OSC_PCI_EXPRESS_NATIVE_HP_CONTROL))
+                return -ENODEV;
+
         /* if the bridge doesn't have _STA, we assume it is always there */
         status = acpi_get_handle(handle, "_STA", &dummy_handle);
         if (ACPI_SUCCESS(status)) {
@@ -1376,13 +1385,23 @@ static void handle_hotplug_event_func(acpi_handle handle, u32 type,
 static acpi_status
 find_root_bridges(acpi_handle handle, u32 lvl, void *context, void **rv)
 {
+        struct acpi_pci_root *root;
         int *count = (int *)context;
 
-        if (acpi_is_root_bridge(handle)) {
-                acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
-                                handle_hotplug_event_bridge, NULL);
-                        (*count)++;
-        }
+        if (!acpi_is_root_bridge(handle))
+                return AE_OK;
+
+        root = acpi_pci_find_root(handle);
+        if (!root)
+                return AE_OK;
+
+        if (root->osc_control_set & OSC_PCI_EXPRESS_NATIVE_HP_CONTROL)
+                return AE_OK;
+
+        (*count)++;
+        acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
+                                    handle_hotplug_event_bridge, NULL);
+
         return AE_OK ;
 }
 
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index 1e9c9aacc3a6..085dbb5fc168 100644
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -213,9 +213,6 @@ static int board_added(struct slot *p_slot)
                 goto err_exit;
         }
 
-        /* Wait for 1 second after checking link training status */
-        msleep(1000);
-
         /* Check for a power fault */
         if (ctrl->power_fault_detected || pciehp_query_power_fault(p_slot)) {
                 ctrl_err(ctrl, "Power fault on slot %s\n", slot_name(p_slot));
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 96dc4734e4af..7b1414810ae3 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -280,6 +280,14 @@ int pciehp_check_link_status(struct controller *ctrl)
         else
                 msleep(1000);
 
+        /*
+         * Need to wait for 1000 ms after Data Link Layer Link Active
+         * (DLLLA) bit reads 1b before sending configuration request.
+         * We need it before checking Link Training (LT) bit becuase
+         * LT is still set even after DLLLA bit is set on some platform.
+         */
+        msleep(1000);
+
         retval = pciehp_readw(ctrl, PCI_EXP_LNKSTA, &lnk_status);
         if (retval) {
                 ctrl_err(ctrl, "Cannot read LNKSTATUS register\n");
@@ -294,6 +302,16 @@ int pciehp_check_link_status(struct controller *ctrl)
                 return retval;
         }
 
+        /*
+         * If the port supports Link speeds greater than 5.0 GT/s, we
+         * must wait for 100 ms after Link training completes before
+         * sending configuration request.
+         */
+        if (ctrl->pcie->port->subordinate->max_bus_speed > PCIE_SPEED_5_0GT)
+                msleep(100);
+
+        pcie_update_link_speed(ctrl->pcie->port->subordinate, lnk_status);
+
         return retval;
 }
 
@@ -484,7 +502,6 @@ int pciehp_power_on_slot(struct slot * slot)
         u16 slot_cmd;
         u16 cmd_mask;
         u16 slot_status;
-        u16 lnk_status;
         int retval = 0;
 
         /* Clear sticky power-fault bit from previous power failures */
@@ -516,14 +533,6 @@ int pciehp_power_on_slot(struct slot * slot)
         ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n", __func__,
                  pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL, slot_cmd);
 
-        retval = pciehp_readw(ctrl, PCI_EXP_LNKSTA, &lnk_status);
-        if (retval) {
-                ctrl_err(ctrl, "%s: Cannot read LNKSTA register\n",
-                                __func__);
-                return retval;
-        }
-        pcie_update_link_speed(ctrl->pcie->port->subordinate, lnk_status);
-
         return retval;
 }
 
diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c
index aca972bbfb4c..dd7e0c51a33e 100644
--- a/drivers/pci/hotplug/shpchp_core.c
+++ b/drivers/pci/hotplug/shpchp_core.c
@@ -278,8 +278,8 @@ static int get_adapter_status (struct hotplug_slot *hotplug_slot, u8 *value)
 
 static int is_shpc_capable(struct pci_dev *dev)
 {
-        if ((dev->vendor == PCI_VENDOR_ID_AMD) || (dev->device ==
-                                                PCI_DEVICE_ID_AMD_GOLAM_7450))
+        if (dev->vendor == PCI_VENDOR_ID_AMD &&
+            dev->device == PCI_DEVICE_ID_AMD_GOLAM_7450)
                 return 1;
         if (!pci_find_capability(dev, PCI_CAP_ID_SHPC))
                 return 0;
diff --git a/drivers/pci/hotplug/shpchp_hpc.c b/drivers/pci/hotplug/shpchp_hpc.c
index 36547f0ce305..75ba2311b54f 100644
--- a/drivers/pci/hotplug/shpchp_hpc.c
+++ b/drivers/pci/hotplug/shpchp_hpc.c
@@ -944,8 +944,8 @@ int shpc_init(struct controller *ctrl, struct pci_dev *pdev)
         ctrl->pci_dev = pdev;  /* pci_dev of the P2P bridge */
         ctrl_dbg(ctrl, "Hotplug Controller:\n");
 
-        if ((pdev->vendor == PCI_VENDOR_ID_AMD) || (pdev->device ==
-                                PCI_DEVICE_ID_AMD_GOLAM_7450)) {
+        if (pdev->vendor == PCI_VENDOR_ID_AMD &&
+            pdev->device == PCI_DEVICE_ID_AMD_GOLAM_7450) {
                 /* amd shpc driver doesn't use Base Offset; assume 0 */
                 ctrl->mmio_base = pci_resource_start(pdev, 0);
                 ctrl->mmio_size = pci_resource_len(pdev, 0);