Commit 41cd3fd1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v6.17-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci 

Pull pci fixes from Bjorn Helgaas:

 - Remove vmd restriction on children using MSI-X because VMD does in
   fact support both MSI and MSI-X for children (Nam Cao)

 - Fix a NULL pointer dereference in the xilinx interrupt handler (Nam
   Cao)

* tag 'pci-v6.17-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
  PCI: vmd: Remove MSI-X check on child devices
  PCI: xilinx: Fix NULL pointer dereference in xilinx_pcie_intr_handler()
parents b19a97d5 5149bbb5

drivers/pci/controller/pcie-xilinx.c

+1 −1
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ static irqreturn_t xilinx_pcie_intr_handler(int irq, void *data) 
		if (val & XILINX_PCIE_RPIFR1_MSI_INTR) {

			val = pcie_read(pcie, XILINX_PCIE_REG_RPIFR2) &

				XILINX_PCIE_RPIFR2_MSG_DATA;

			domain = pcie->msi_domain->parent;

			domain = pcie->msi_domain;

		} else {

			val = (val & XILINX_PCIE_RPIFR1_INTR_MASK) >>

				XILINX_PCIE_RPIFR1_INTR_SHIFT;

drivers/pci/controller/vmd.c

+0 −3
Original line number Diff line number Diff line
@@ -306,9 +306,6 @@ static bool vmd_init_dev_msi_info(struct device *dev, struct irq_domain *domain, 
				  struct irq_domain *real_parent,

				  struct msi_domain_info *info)

{

	if (WARN_ON_ONCE(info->bus_token != DOMAIN_BUS_PCI_DEVICE_MSIX))

		return false;



	if (!msi_lib_init_dev_msi_info(dev, domain, real_parent, info))

		return false;