From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 20 Jan 2016 17:47:54 +0000 (-0600)
Subject: Merge branches 'pci/iommu' and 'pci/misc' into next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=904f664b585cc9f3dc134a8c0dd08e9bce6c10bc;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

904f664b585cc9f3dc134a8c0dd08e9bce6c10bc
diff --cc drivers/pci/quirks.c
index 83e93d7ca4b9,9f61be560ed8,8b13b41257b8..13ac34ddec19
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@@@ -287,17 -287,6 -287,18 +287,18 @@@@ static void quirk_citrine(struct pci_de
   }
   DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_IBM,	PCI_DEVICE_ID_IBM_CITRINE,	quirk_citrine);
   
 + /*
 +  * This chip can cause bus lockups if config addresses above 0x600
 +  * are read or written.
 +  */
 + 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);
 + 
   /*  On IBM Crocodile ipr SAS adapters, expand BAR to system page size */
   static void quirk_extend_bar_to_page(struct pci_dev *dev)
   {