From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 23 Sep 2019 21:10:17 +0000 (-0500)
Subject: Merge branch 'remotes/lorenzo/pci/al'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=af47f25f33f7f628cb50a82bc60b8ad1677626a2;p=linux.git

Merge branch 'remotes/lorenzo/pci/al'

  - Add driver for Amazon Annapurna Labs PCIe controller (Jonathan Chocron)

  - Disable MSI-X since Annapurna Labs advertises it, but it's broken
    (Jonathan Chocron)

  - Disable VPD since Annapurna Labs advertises it, but it's broken
    (Jonathan Chocron)

  - Add ACS quirk since Annapurna Labs doesn't support ACS but does provide
    some equivalent protections (Ali Saidi)

* remotes/lorenzo/pci/al:
  PCI: dwc: Add validation that PCIe core is set to correct mode
  PCI: dwc: al: Add Amazon Annapurna Labs PCIe controller driver
  dt-bindings: PCI: Add Amazon's Annapurna Labs PCIe host bridge binding
  PCI: Add quirk to disable MSI-X support for Amazon's Annapurna Labs Root Port
  PCI/VPD: Prevent VPD access for Amazon's Annapurna Labs Root Port
  PCI: Add ACS quirk for Amazon Annapurna Labs root ports
  PCI: Add Amazon's Annapurna Labs vendor ID

# Conflicts:
#	drivers/pci/quirks.c
---

af47f25f33f7f628cb50a82bc60b8ad1677626a2
diff --cc drivers/pci/quirks.c
index a5be6291ebb86,44524d351a269..87f591caccd9a
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@@ -4571,7 -4595,8 +4607,9 @@@ static const struct pci_dev_acs_enable
  	{ PCI_VENDOR_ID_AMPERE, 0xE00A, pci_quirk_xgene_acs },
  	{ PCI_VENDOR_ID_AMPERE, 0xE00B, pci_quirk_xgene_acs },
  	{ PCI_VENDOR_ID_AMPERE, 0xE00C, pci_quirk_xgene_acs },
 +	{ PCI_VENDOR_ID_BROADCOM, 0xD714, pci_quirk_brcm_acs },
+ 	/* Amazon Annapurna Labs */
+ 	{ PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS, 0x0031, pci_quirk_al_acs },
  	{ 0 }
  };