Merge tag 'pci-v4.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI updates from Bjorn Helgaas:
 "PCI changes:

   - add support for PCI on ARM64 boxes with ACPI. We already had this
     for theoretical spec-compliant hardware; now we're adding quirks
     for the actual hardware (Cavium, HiSilicon, Qualcomm, X-Gene)

   - add runtime PM support for hotplug ports

   - enable runtime suspend for Intel UHCI that uses platform-specific
     wakeup signaling

   - add yet another host bridge registration interface. We hope this is
     extensible enough to subsume the others

   - expose device revision in sysfs for DRM

   - to avoid device conflicts, make sure any VF BAR updates are done
     before enabling the VF

   - avoid unnecessary link retrains for ASPM

   - allow INTx masking on Mellanox devices that support it

   - allow access to non-standard VPD for Chelsio devices

   - update Broadcom iProc support for PAXB v2, PAXC v2, inbound DMA,
     etc

   - update Rockchip support for max-link-speed

   - add NVIDIA Tegra210 support

   - add Layerscape LS1046a support

   - update R-Car compatibility strings

   - add Qualcomm MSM8996 support

   - remove some uninformative bootup messages"

* tag 'pci-v4.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (115 commits)
  PCI: Enable access to non-standard VPD for Chelsio devices (cxgb3)
  PCI: Expand "VPD access disabled" quirk message
  PCI: pciehp: Remove loading message
  PCI: hotplug: Remove hotplug core message
  PCI: Remove service driver load/unload messages
  PCI/AER: Log AER IRQ when claiming Root Port
  PCI/AER: Log errors with PCI device, not PCIe service device
  PCI/AER: Remove unused version macros
  PCI/PME: Log PME IRQ when claiming Root Port
  PCI/PME: Drop unused support for PMEs from Root Complex Event Collectors
  PCI: Move config space size macros to pci_regs.h
  x86/platform/intel-mid: Constify mid_pci_platform_pm
  PCI/ASPM: Don't retrain link if ASPM not possible
  PCI: iproc: Skip check for legacy IRQ on PAXC buses
  PCI: pciehp: Leave power indicator on when enabling already-enabled slot
  PCI: pciehp: Prioritize data-link event over presence detect
  PCI: rcar: Add gen3 fallback compatibility string for pcie-rcar
  PCI: rcar: Use gen2 fallback compatibility last
  PCI: rcar-gen2: Use gen2 fallback compatibility last
  PCI: rockchip: Move the deassert of pm/aclk/pclk after phy_init()
  ..

1 files changed, 100 insertions, 0 deletions

diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index d966d47c9e80..001860361434 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -29,6 +29,82 @@ const u8 pci_acpi_dsm_uuid[] = {
         0x91, 0x17, 0xea, 0x4d, 0x19, 0xc3, 0x43, 0x4d
 };
 
+#if defined(CONFIG_PCI_QUIRKS) && defined(CONFIG_ARM64)
+static int acpi_get_rc_addr(struct acpi_device *adev, struct resource *res)
+{
+        struct device *dev = &adev->dev;
+        struct resource_entry *entry;
+        struct list_head list;
+        unsigned long flags;
+        int ret;
+
+        INIT_LIST_HEAD(&list);
+        flags = IORESOURCE_MEM;
+        ret = acpi_dev_get_resources(adev, &list,
+                                     acpi_dev_filter_resource_type_cb,
+                                     (void *) flags);
+        if (ret < 0) {
+                dev_err(dev, "failed to parse _CRS method, error code %d\n",
+                        ret);
+                return ret;
+        }
+
+        if (ret == 0) {
+                dev_err(dev, "no IO and memory resources present in _CRS\n");
+                return -EINVAL;
+        }
+
+        entry = list_first_entry(&list, struct resource_entry, node);
+        *res = *entry->res;
+        acpi_dev_free_resource_list(&list);
+        return 0;
+}
+
+static acpi_status acpi_match_rc(acpi_handle handle, u32 lvl, void *context,
+                                 void **retval)
+{
+        u16 *segment = context;
+        unsigned long long uid;
+        acpi_status status;
+
+        status = acpi_evaluate_integer(handle, "_UID", NULL, &uid);
+        if (ACPI_FAILURE(status) || uid != *segment)
+                return AE_CTRL_DEPTH;
+
+        *(acpi_handle *)retval = handle;
+        return AE_CTRL_TERMINATE;
+}
+
+int acpi_get_rc_resources(struct device *dev, const char *hid, u16 segment,
+                          struct resource *res)
+{
+        struct acpi_device *adev;
+        acpi_status status;
+        acpi_handle handle;
+        int ret;
+
+        status = acpi_get_devices(hid, acpi_match_rc, &segment, &handle);
+        if (ACPI_FAILURE(status)) {
+                dev_err(dev, "can't find _HID %s device to locate resources\n",
+                        hid);
+                return -ENODEV;
+        }
+
+        ret = acpi_bus_get_device(handle, &adev);
+        if (ret)
+                return ret;
+
+        ret = acpi_get_rc_addr(adev, res);
+        if (ret) {
+                dev_err(dev, "can't get resource from %s\n",
+                        dev_name(&adev->dev));
+                return ret;
+        }
+
+        return 0;
+}
+#endif
+
 phys_addr_t acpi_pci_root_get_mcfg_addr(acpi_handle handle)
 {
         acpi_status status = AE_NOT_EXIST;
@@ -294,6 +370,30 @@ int pci_get_hp_params(struct pci_dev *dev, struct hotplug_params *hpp)
 EXPORT_SYMBOL_GPL(pci_get_hp_params);
 
 /**
+ * pciehp_is_native - Check whether a hotplug port is handled by the OS
+ * @pdev: Hotplug port to check
+ *
+ * Walk up from @pdev to the host bridge, obtain its cached _OSC Control Field
+ * and return the value of the "PCI Express Native Hot Plug control" bit.
+ * On failure to obtain the _OSC Control Field return %false.
+ */
+bool pciehp_is_native(struct pci_dev *pdev)
+{
+        struct acpi_pci_root *root;
+        acpi_handle handle;
+
+        handle = acpi_find_root_bridge_handle(pdev);
+        if (!handle)
+                return false;
+
+        root = acpi_pci_find_root(handle);
+        if (!root)
+                return false;
+
+        return root->osc_control_set & OSC_PCI_EXPRESS_NATIVE_HP_CONTROL;
+}
+
+/**
  * pci_acpi_wake_bus - Root bus wakeup notification fork function.
  * @work: Work item to handle.
  */