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

diff --cc drivers/pci/quirks.c
index 83e93d7ca4b9ac3658416c998b6906bd2ccf35f0,9f61be560ed8daf74bfa5c46a21ec88af1ff1fd2,8b13b41257b8035e6bf6b6356361faf69797b483..13ac34ddec196aece54734fed550590523a263f3
--- 1/drivers/pci/quirks.c
--- 2/drivers/pci/quirks.c
--- 3/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)
   {