Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMian Yousaf Kaukab <ykaukab@suse.de>2019-10-01 16:21:50 +0200
committerMian Yousaf Kaukab <ykaukab@suse.de>2019-10-01 16:23:00 +0200
commit6f1ef96c652bdcfb114a352823731b12b52fd8a4 (patch)
tree05f05ffe3375ad1bf85f4cdffb72c84ce5356e1f
parent9c079c7ee817e53f112f5b6a493dc8018ee6f92f (diff)
PCI/VPD: Prevent VPD access for Amazon's Annapurna Labs Root
Port (bsc#1152187,bsc#1152525).
-rw-r--r--patches.suse/PCI-VPD-Prevent-VPD-access-for-Amazon-s-Annapurna-La.patch46
-rw-r--r--series.conf1
2 files changed, 47 insertions, 0 deletions
diff --git a/patches.suse/PCI-VPD-Prevent-VPD-access-for-Amazon-s-Annapurna-La.patch b/patches.suse/PCI-VPD-Prevent-VPD-access-for-Amazon-s-Annapurna-La.patch
new file mode 100644
index 0000000000..aabcab2e57
--- /dev/null
+++ b/patches.suse/PCI-VPD-Prevent-VPD-access-for-Amazon-s-Annapurna-La.patch
@@ -0,0 +1,46 @@
+From: Jonathan Chocron <jonnyc@amazon.com>
+Date: Thu, 12 Sep 2019 16:00:41 +0300
+Subject: PCI/VPD: Prevent VPD access for Amazon's Annapurna Labs Root Port
+
+Git-commit: a638b5de205af40bdadd867b1cb77320bbb2628e
+Patch-mainline: v5.4-rc1
+References: bsc#1152187,bsc#1152525
+
+The Amazon Annapurna Labs PCIe Root Port exposes the VPD capability,
+but there is no actual support for it.
+
+Trying to access the VPD (for example, as part of lspci -vv or when
+reading the vpd sysfs file), results in the following warning print:
+
+ pcieport 0001:00:00.0: VPD access failed. This is likely a firmware bug on this device. Contact the card vendor for a firmware update
+
+Signed-off-by: Jonathan Chocron <jonnyc@amazon.com>
+Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
+Reviewed-by: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
+Reviewed-by: Andrew Murray <andrew.murray@arm.com>
+Acked-by: Bjorn Helgaas <bhelgaas@google.com>
+Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>
+---
+ drivers/pci/vpd.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/drivers/pci/vpd.c b/drivers/pci/vpd.c
+index 4963c2e2bd4c..7915d10f9aa1 100644
+--- a/drivers/pci/vpd.c
++++ b/drivers/pci/vpd.c
+@@ -571,6 +571,12 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_LSI_LOGIC, 0x005f, quirk_blacklist_vpd);
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATTANSIC, PCI_ANY_ID,
+ quirk_blacklist_vpd);
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_QLOGIC, 0x2261, quirk_blacklist_vpd);
++/*
++ * The Amazon Annapurna Labs 0x0031 device id is reused for other non Root Port
++ * device types, so the quirk is registered for the PCI_CLASS_BRIDGE_PCI class.
++ */
++DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS, 0x0031,
++ PCI_CLASS_BRIDGE_PCI, 8, quirk_blacklist_vpd);
+
+ /*
+ * For Broadcom 5706, 5708, 5709 rev. A nics, any read beyond the
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index bbebd50917..97f61ced2f 100644
--- a/series.conf
+++ b/series.conf
@@ -201,6 +201,7 @@
patches.suse/livepatch-nullify-obj-mod-in-klp_module_coming-s-error-path.patch
patches.suse/PCI-Add-Amazon-s-Annapurna-Labs-vendor-ID.patch
patches.suse/PCI-Add-ACS-quirk-for-Amazon-Annapurna-Labs-root-por.patch
+ patches.suse/PCI-VPD-Prevent-VPD-access-for-Amazon-s-Annapurna-La.patch
patches.suse/0001-video-backlight-Drop-default-m-for-LCD-BACKLIGHT_CLA.patch
patches.suse/0004-drm-amdgpu-Fix-KFD-related-kernel-oops-on-Hawaii.patch