Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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()

+1 -4
+1 -1
drivers/pci/controller/pcie-xilinx.c
··· 400 400 if (val & XILINX_PCIE_RPIFR1_MSI_INTR) { 401 401 val = pcie_read(pcie, XILINX_PCIE_REG_RPIFR2) & 402 402 XILINX_PCIE_RPIFR2_MSG_DATA; 403 - domain = pcie->msi_domain->parent; 403 + domain = pcie->msi_domain; 404 404 } else { 405 405 val = (val & XILINX_PCIE_RPIFR1_INTR_MASK) >> 406 406 XILINX_PCIE_RPIFR1_INTR_SHIFT;
-3
drivers/pci/controller/vmd.c
··· 306 306 struct irq_domain *real_parent, 307 307 struct msi_domain_info *info) 308 308 { 309 - if (WARN_ON_ONCE(info->bus_token != DOMAIN_BUS_PCI_DEVICE_MSIX)) 310 - return false; 311 - 312 309 if (!msi_lib_init_dev_msi_info(dev, domain, real_parent, info)) 313 310 return false; 314 311