Commit 904f664b authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branches 'pci/iommu' and 'pci/misc' into next 

* pci/iommu:
  PCI: Add function 1 DMA alias quirk for Lite-On/Plextor M6e/Marvell 88SS9183

* pci/misc:
  PCI: Limit config space size for Netronome NFP4000
  PCI: Add Netronome NFP4000 PF device ID
parents 3a6384ba 8b9b963e c2e771b0

drivers/pci/quirks.c

+5 −0
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ static void quirk_nfp6000(struct pci_dev *dev) 
{

	dev->cfg_size = 0x600;

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NETRONOME,	PCI_DEVICE_ID_NETRONOME_NFP4000,	quirk_nfp6000);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NETRONOME,	PCI_DEVICE_ID_NETRONOME_NFP6000,	quirk_nfp6000);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NETRONOME,	PCI_DEVICE_ID_NETRONOME_NFP6000_VF,	quirk_nfp6000);
@@ -3631,6 +3632,10 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TTI, 0x0642, 
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_JMICRON,

			 PCI_DEVICE_ID_JMICRON_JMB388_ESD,

			 quirk_dma_func1_alias);

/* https://bugzilla.kernel.org/show_bug.cgi?id=42679#c117 */

DECLARE_PCI_FIXUP_HEADER(0x1c28, /* Lite-On */

			 0x0122, /* Plextor M6E (Marvell 88SS9183)*/

			 quirk_dma_func1_alias);



/*

 * Some devices DMA with the wrong devfn, not just the wrong function.

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -2498,6 +2498,7 @@ 
#define PCI_VENDOR_ID_NETRONOME		0x19ee

#define PCI_DEVICE_ID_NETRONOME_NFP3200	0x3200

#define PCI_DEVICE_ID_NETRONOME_NFP3240	0x3240

#define PCI_DEVICE_ID_NETRONOME_NFP4000	0x4000

#define PCI_DEVICE_ID_NETRONOME_NFP6000	0x6000

#define PCI_DEVICE_ID_NETRONOME_NFP6000_VF	0x6003