Merge branch 'pci/msi'

  - Remove unused pci_irq_get_node() Greg Kroah-Hartman)

  - Move power state check out of pci_msi_supported() (Bjorn Helgaas)

  - Fix incorrect MSI-X masking on resume and revert related nvme quirk for
    Kingston NVME SSD running FW E8FK11.T (Jian-Hong Pan)

  - Make asm/msi.h mandatory and simplify PCI_MSI_IRQ_DOMAIN Kconfig
    (Palmer Dabbelt, Michal Simek)

* pci/msi:
  PCI: Remove PCI_MSI_IRQ_DOMAIN architecture whitelist
  asm-generic: Make msi.h a mandatory include/asm header
  Revert "nvme: Add quirk for Kingston NVME SSD running FW E8FK11.T"
  PCI/MSI: Fix incorrect MSI-X masking on resume
  PCI/MSI: Move power state check out of pci_msi_supported()
  PCI/MSI: Remove unused pci_irq_get_node()

diff --combined include/linux/pci.h
index 9dc5bee14ae90301d46f7a651dcc593bdc9315e1,755d8c0176b969735684d120ebbde341ade3282e..1c497a8b19bad3d63181ec7aac8a70b906d532f5
--- 1/include/linux/pci.h
--- 2/include/linux/pci.h
+++ b/include/linux/pci.h
@@@ -1454,7 -1454,6 +1454,6 @@@ int pci_alloc_irq_vectors_affinity(stru
  void pci_free_irq_vectors(struct pci_dev *dev);
  int pci_irq_vector(struct pci_dev *dev, unsigned int nr);
  const struct cpumask *pci_irq_get_affinity(struct pci_dev *pdev, int vec);
- int pci_irq_get_node(struct pci_dev *pdev, int vec);
  
  #else
  static inline int pci_msi_vec_count(struct pci_dev *dev) { return -ENOSYS; }
@@@ -1497,11 -1496,6 +1496,6 @@@ static inline const struct cpumask *pci
  {
        return cpu_possible_mask;
  }
- 
- static inline int pci_irq_get_node(struct pci_dev *pdev, int vec)
- {
-       return first_online_node;
- }
  #endif
  
  /**
@@@ -1544,13 -1538,9 +1538,13 @@@ extern bool pcie_ports_native
  #define pcie_ports_native     false
  #endif
  
 -#define PCIE_LINK_STATE_L0S   1
 -#define PCIE_LINK_STATE_L1    2
 -#define PCIE_LINK_STATE_CLKPM 4
 +#define PCIE_LINK_STATE_L0S           BIT(0)
 +#define PCIE_LINK_STATE_L1            BIT(1)
 +#define PCIE_LINK_STATE_CLKPM         BIT(2)
 +#define PCIE_LINK_STATE_L1_1          BIT(3)
 +#define PCIE_LINK_STATE_L1_2          BIT(4)
 +#define PCIE_LINK_STATE_L1_1_PCIPM    BIT(5)
 +#define PCIE_LINK_STATE_L1_2_PCIPM    BIT(6)
  
  #ifdef CONFIG_PCIEASPM
  int pci_disable_link_state(struct pci_dev *pdev, int state);