| From 50ca031b51106b1b46162d4e9ecccb7edc95682f Mon Sep 17 00:00:00 2001 |
| From: Mika Westerberg <mika.westerberg@linux.intel.com> |
| Date: Wed, 5 Sep 2018 14:09:54 +0300 |
| Subject: Revert "PCI: Add ACS quirk for Intel 300 series" |
| |
| From: Mika Westerberg <mika.westerberg@linux.intel.com> |
| |
| commit 50ca031b51106b1b46162d4e9ecccb7edc95682f upstream. |
| |
| This reverts f154a718e6cc ("PCI: Add ACS quirk for Intel 300 series"). |
| |
| It turns out that erratum "PCH PCIe* Controller Root Port (ACSCTLR) Appear |
| As Read Only" has been fixed in 300 series chipsets, even though the |
| datasheet [1] claims otherwise. To make ACS work properly on 300 series |
| root ports, revert the faulty commit. |
| |
| [1] https://www.intel.com/content/dam/www/public/us/en/documents/specification-updates/300-series-c240-series-chipset-pch-spec-update.pdf |
| |
| Fixes: f154a718e6cc ("PCI: Add ACS quirk for Intel 300 series") |
| Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> |
| Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> |
| Cc: stable@vger.kernel.org # v4.18+ |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/pci/quirks.c | 6 ------ |
| 1 file changed, 6 deletions(-) |
| |
| --- a/drivers/pci/quirks.c |
| +++ b/drivers/pci/quirks.c |
| @@ -4235,11 +4235,6 @@ static int pci_quirk_qcom_rp_acs(struct |
| * |
| * 0x9d10-0x9d1b PCI Express Root port #{1-12} |
| * |
| - * The 300 series chipset suffers from the same bug so include those root |
| - * ports here as well. |
| - * |
| - * 0xa32c-0xa343 PCI Express Root port #{0-24} |
| - * |
| * [1] http://www.intel.com/content/www/us/en/chipsets/100-series-chipset-datasheet-vol-2.html |
| * [2] http://www.intel.com/content/www/us/en/chipsets/100-series-chipset-datasheet-vol-1.html |
| * [3] http://www.intel.com/content/www/us/en/chipsets/100-series-chipset-spec-update.html |
| @@ -4257,7 +4252,6 @@ static bool pci_quirk_intel_spt_pch_acs_ |
| case 0xa110 ... 0xa11f: case 0xa167 ... 0xa16a: /* Sunrise Point */ |
| case 0xa290 ... 0xa29f: case 0xa2e7 ... 0xa2ee: /* Union Point */ |
| case 0x9d10 ... 0x9d1b: /* 7th & 8th Gen Mobile */ |
| - case 0xa32c ... 0xa343: /* 300 series */ |
| return true; |
| } |
| |