path: root/drivers/pci
diff options
authorArun Easi <>2021-04-09 14:51:53 -0700
committerBjorn Helgaas <>2021-04-30 14:38:32 -0500
commite00dc69b5f17c444a38cd9745a0f76bc989b3af4 (patch)
tree825dc812aadce634fa77d6cb9a356456fb1bc3cb /drivers/pci
parent5881b38912f3f48a4bd74a4eed58be12df012063 (diff)
PCI: Allow VPD access for QLogic ISP2722
0d5370d1d852 ("PCI: Prevent VPD access for QLogic ISP2722") disabled access to VPD of the ISP2722-based 16/32Gb Fibre Channel to PCIe Adapter because reading past the end of the VPD caused NMIs. 104daa71b396 ("PCI: Determine actual VPD size on first access") limits reads to the actual size of VPD, which should prevent these NMIs. 104daa71b396 was merged *before* 0d5370d1d852, but we think the testing that prompted 0d5370d1d852 ("PCI: Prevent VPD access for QLogic ISP2722") was done with a kernel that lacked 104daa71b396. See [1, 2]. Remove the quirk added by 0d5370d1d852 ("PCI: Prevent VPD access for QLogic ISP2722") so customers can read the HBA VPD. [1] [2] [bhelgaas: commit log] Link: Signed-off-by: Arun Easi <> Signed-off-by: Bjorn Helgaas <> Cc: # v4.6+
Diffstat (limited to 'drivers/pci')
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pci/vpd.c b/drivers/pci/vpd.c
index c6aad87dd0f9..8af31c5eec2d 100644
--- a/drivers/pci/vpd.c
+++ b/drivers/pci/vpd.c
@@ -500,7 +500,6 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_LSI_LOGIC, 0x005d, quirk_blacklist_vpd);
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_LSI_LOGIC, 0x005f, 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.