Skip to content

Commit cf761e3

Browse files
dullfireKAGA-KOKO
authored andcommitted
PCI/MSI: Add an option to write MSIX ENTRY_DATA before any reads
Commit 7d5ec3d ("PCI/MSI: Mask all unused MSI-X entries") introduced a readl() from ENTRY_VECTOR_CTRL before the writel() to ENTRY_DATA. This is correct, however some hardware, like the Sun Neptune chips, the NIU module, will cause an error and/or fatal trap if any MSIX table entry is read before the corresponding ENTRY_DATA field is written to. Add an optional early writel() in msix_prepare_msi_desc(). Fixes: 7d5ec3d ("PCI/MSI: Mask all unused MSI-X entries") Signed-off-by: Jonathan Currier <dullfire@yahoo.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/all/20241117234843.19236-2-dullfire@yahoo.com
1 parent 8ffd015 commit cf761e3

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

drivers/pci/msi/msi.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -615,6 +615,9 @@ void msix_prepare_msi_desc(struct pci_dev *dev, struct msi_desc *desc)
615615
void __iomem *addr = pci_msix_desc_addr(desc);
616616

617617
desc->pci.msi_attrib.can_mask = 1;
618+
/* Workaround for SUN NIU insanity, which requires write before read */
619+
if (dev->dev_flags & PCI_DEV_FLAGS_MSIX_TOUCH_ENTRY_DATA_FIRST)
620+
writel(0, addr + PCI_MSIX_ENTRY_DATA);
618621
desc->pci.msix_ctrl = readl(addr + PCI_MSIX_ENTRY_VECTOR_CTRL);
619622
}
620623
}

include/linux/pci.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,8 @@ enum pci_dev_flags {
245245
PCI_DEV_FLAGS_NO_RELAXED_ORDERING = (__force pci_dev_flags_t) (1 << 11),
246246
/* Device does honor MSI masking despite saying otherwise */
247247
PCI_DEV_FLAGS_HAS_MSI_MASKING = (__force pci_dev_flags_t) (1 << 12),
248+
/* Device requires write to PCI_MSIX_ENTRY_DATA before any MSIX reads */
249+
PCI_DEV_FLAGS_MSIX_TOUCH_ENTRY_DATA_FIRST = (__force pci_dev_flags_t) (1 << 13),
248250
};
249251

250252
enum pci_irq_reroute_variant {

0 commit comments

Comments
 (0)