From: Dongdong Liu Date: Thu, 28 Dec 2017 09:53:32 +0000 (+0800) Subject: PCI: Disable MSI for HiSilicon Hip06/Hip07 only in Root Port mode X-Git-Tag: Ubuntu-4.15.0-11.12~62 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6524723ec384a99ee7a87f0c3c705ced925859c8;p=mirror_ubuntu-bionic-kernel.git PCI: Disable MSI for HiSilicon Hip06/Hip07 only in Root Port mode BugLink: http://bugs.launchpad.net/bugs/1751131 commit deb86999323661c019ef2740eb9d479d1e526b5c upstream. HiSilicon Hip06/Hip07 can operate as either a Root Port or an Endpoint. It always advertises an MSI capability, but it can only generate MSIs when in Endpoint mode. The device has the same Vendor and Device IDs in both modes, so check the Class Code and disable MSI only when operating as a Root Port. [bhelgaas: changelog] Fixes: 72f2ff0deb87 ("PCI: Disable MSI for HiSilicon Hip06/Hip07 Root Ports") Signed-off-by: Dongdong Liu Signed-off-by: Bjorn Helgaas Reviewed-by: Zhou Wang Cc: stable@vger.kernel.org # v4.11+ Signed-off-by: Greg Kroah-Hartman Signed-off-by: Seth Forshee --- diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index db82bef43b99..15bc432fb6fd 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -1651,8 +1651,8 @@ static void quirk_pcie_mch(struct pci_dev *pdev) DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_E7520_MCH, quirk_pcie_mch); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_E7320_MCH, quirk_pcie_mch); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_E7525_MCH, quirk_pcie_mch); -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_HUAWEI, 0x1610, quirk_pcie_mch); +DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_HUAWEI, 0x1610, PCI_CLASS_BRIDGE_PCI, 8, quirk_pcie_mch); /* * It's possible for the MSI to get corrupted if shpc and acpi