Merge branch 'pci/enumeration'

  - Remove x86 and arm64 node-local allocation for host bridge structures
    (Punit Agrawal)

  - Pay attention to device-specific _PXM node values (Jonathan Cameron)

  - Support new Immediate Readiness bit (Felipe Balbi)

* pci/enumeration:
  PCI: Add support for Immediate Readiness
  ACPI/PCI: Pay attention to device-specific _PXM node values
  x86/PCI: Remove node-local allocation when initialising host controller
  arm64: PCI: Remove node-local allocations when initialising host controller

6 files changed, 22 insertions, 5 deletions

diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c
index 0e2ea1c78542..bb85e2f4603f 100644
--- a/arch/arm64/kernel/pci.c
+++ b/arch/arm64/kernel/pci.c
@@ -165,16 +165,15 @@ static void pci_acpi_generic_release_info(struct acpi_pci_root_info *ci)
 /* Interface called from ACPI code to setup PCI host controller */
 struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
 {
-        int node = acpi_get_node(root->device->handle);
         struct acpi_pci_generic_root_info *ri;
         struct pci_bus *bus, *child;
         struct acpi_pci_root_ops *root_ops;
 
-        ri = kzalloc_node(sizeof(*ri), GFP_KERNEL, node);
+        ri = kzalloc(sizeof(*ri), GFP_KERNEL);
         if (!ri)
                 return NULL;
 
-        root_ops = kzalloc_node(sizeof(*root_ops), GFP_KERNEL, node);
+        root_ops = kzalloc(sizeof(*root_ops), GFP_KERNEL);
         if (!root_ops) {
                 kfree(ri);
                 return NULL;
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 5559dcaddd5e..948656069cdd 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -356,7 +356,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
         } else {
                 struct pci_root_info *info;
 
-                info = kzalloc_node(sizeof(*info), GFP_KERNEL, node);
+                info = kzalloc(sizeof(*info), GFP_KERNEL);
                 if (!info)
                         dev_err(&root->device->dev,
                                 "pci_bus %04x:%02x: ignored (out of memory)\n",
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index c2ab57705043..8f75ba068d45 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -751,10 +751,15 @@ static void pci_acpi_setup(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
         struct acpi_device *adev = ACPI_COMPANION(dev);
+        int node;
 
         if (!adev)
                 return;
 
+        node = acpi_get_node(adev->handle);
+        if (node != NUMA_NO_NODE)
+                set_dev_node(dev, node);
+
         pci_acpi_optimize_delay(pci_dev, adev->handle);
 
         pci_acpi_add_pm_notifier(adev, pci_dev);
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 1835f3a7aa8d..ee7c2f4eef9b 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -999,7 +999,7 @@ static void __pci_start_power_transition(struct pci_dev *dev, pci_power_t state)
                  * because have already delayed for the bridge.
                  */
                 if (dev->runtime_d3cold) {
-                        if (dev->d3cold_delay)
+                        if (dev->d3cold_delay && !dev->imm_ready)
                                 msleep(dev->d3cold_delay);
                         /*
                          * When powering on a bridge from D3cold, the
@@ -2644,6 +2644,7 @@ EXPORT_SYMBOL_GPL(pci_d3cold_disable);
 void pci_pm_init(struct pci_dev *dev)
 {
         int pm;
+        u16 status;
         u16 pmc;
 
         pm_runtime_forbid(&dev->dev);
@@ -2706,6 +2707,10 @@ void pci_pm_init(struct pci_dev *dev)
                 /* Disable the PME# generation functionality */
                 pci_pme_active(dev, false);
         }
+
+        pci_read_config_word(dev, PCI_STATUS, &status);
+        if (status & PCI_STATUS_IMM_READY)
+                dev->imm_ready = 1;
 }
 
 static unsigned long pci_ea_flags(struct pci_dev *dev, u8 prop)
@@ -4376,6 +4381,9 @@ int pcie_flr(struct pci_dev *dev)
 
         pcie_capability_set_word(dev, PCI_EXP_DEVCTL, PCI_EXP_DEVCTL_BCR_FLR);
 
+        if (dev->imm_ready)
+                return 0;
+
         /*
          * Per PCIe r4.0, sec 6.6.2, a device must complete an FLR within
          * 100ms, but may silently discard requests while the FLR is in
@@ -4417,6 +4425,9 @@ static int pci_af_flr(struct pci_dev *dev, int probe)
 
         pci_write_config_byte(dev, pos + PCI_AF_CTRL, PCI_AF_CTRL_FLR);
 
+        if (dev->imm_ready)
+                return 0;
+
         /*
          * Per Advanced Capabilities for Conventional PCI ECN, 13 April 2006,
          * updated 27 July 2006; a device must complete an FLR within
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 6925828f9f25..60da5d7d4310 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -325,6 +325,7 @@ struct pci_dev {
         pci_power_t     current_state;  /* Current operating state. In ACPI,
                                            this is D0-D3, D0 being fully
                                            functional, and D3 being off. */
+        unsigned int    imm_ready:1;    /* Supports Immediate Readiness */
         u8              pm_cap;         /* PM capability offset */
         unsigned int    pme_support:5;  /* Bitmask of states from which PME#
                                            can be generated */
diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h
index ee556ccc93f4..e1e9888c85e6 100644
--- a/include/uapi/linux/pci_regs.h
+++ b/include/uapi/linux/pci_regs.h
@@ -52,6 +52,7 @@
 #define  PCI_COMMAND_INTX_DISABLE 0x400 /* INTx Emulation Disable */
 
 #define PCI_STATUS              0x06    /* 16 bits */
+#define  PCI_STATUS_IMM_READY   0x01    /* Immediate Readiness */
 #define  PCI_STATUS_INTERRUPT   0x08    /* Interrupt status */
 #define  PCI_STATUS_CAP_LIST    0x10    /* Support Capability List */
 #define  PCI_STATUS_66MHZ       0x20    /* Support 66 MHz PCI 2.1 bus */