Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d76d2fe0 authored by Noa Osherovich's avatar Noa Osherovich Committed by Bjorn Helgaas
Browse files

PCI: Convert Mellanox broken INTx quirks to be for listed devices only 



Change Mellanox's broken_intx_masking() quirk from an "all Mellanox
devices" to a quirk for listed devices only.

[bhelgaas: remove #defines, reorder to keep other quirks together]
Signed-off-by: default avatarNoa Osherovich <noaos@mellanox.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Reviewed-by: default avatarGavin Shan <gwshan@linux.vnet.ibm.com>
parent b88214ce

drivers/pci/quirks.c

+37 −3
Original line number Diff line number Diff line
@@ -3137,8 +3137,9 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x22b5, quirk_remove_d3_delay); 
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x22b7, quirk_remove_d3_delay);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x2298, quirk_remove_d3_delay);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x229c, quirk_remove_d3_delay);



/*

 * Some devices may pass our check in pci_intx_mask_supported if

 * Some devices may pass our check in pci_intx_mask_supported() if

 * PCI_COMMAND_INTX_DISABLE works though they actually do not properly

 * support this feature.

 */
@@ -3150,6 +3151,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CHELSIO, 0x0030, 
			quirk_broken_intx_masking);

DECLARE_PCI_FIXUP_FINAL(0x1814, 0x0601, /* Ralink RT2800 802.11n PCI */

			quirk_broken_intx_masking);



/*

 * Realtek RTL8169 PCI Gigabit Ethernet Controller (rev 10)

 * Subsystem: Realtek RTL8169/8110 Family PCI Gigabit Ethernet NIC
@@ -3158,8 +3160,6 @@ DECLARE_PCI_FIXUP_FINAL(0x1814, 0x0601, /* Ralink RT2800 802.11n PCI */ 
 */

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_REALTEK, 0x8169,

			quirk_broken_intx_masking);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX, PCI_ANY_ID,

			quirk_broken_intx_masking);



/*

 * Intel i40e (XL710/X710) 10/20/40GbE NICs all have broken INTx masking,
@@ -3194,6 +3194,40 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x37d1, 
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x37d2,

			quirk_broken_intx_masking);



static u16 mellanox_broken_intx_devs[] = {

	PCI_DEVICE_ID_MELLANOX_HERMON_SDR,

	PCI_DEVICE_ID_MELLANOX_HERMON_DDR,

	PCI_DEVICE_ID_MELLANOX_HERMON_QDR,

	PCI_DEVICE_ID_MELLANOX_HERMON_DDR_GEN2,

	PCI_DEVICE_ID_MELLANOX_HERMON_QDR_GEN2,

	PCI_DEVICE_ID_MELLANOX_HERMON_EN,

	PCI_DEVICE_ID_MELLANOX_HERMON_EN_GEN2,

	PCI_DEVICE_ID_MELLANOX_CONNECTX_EN,

	PCI_DEVICE_ID_MELLANOX_CONNECTX_EN_T_GEN2,

	PCI_DEVICE_ID_MELLANOX_CONNECTX_EN_GEN2,

	PCI_DEVICE_ID_MELLANOX_CONNECTX_EN_5_GEN2,

	PCI_DEVICE_ID_MELLANOX_CONNECTX2,

	PCI_DEVICE_ID_MELLANOX_CONNECTX3,

	PCI_DEVICE_ID_MELLANOX_CONNECTX3_PRO,

	PCI_DEVICE_ID_MELLANOX_CONNECTIB,

	PCI_DEVICE_ID_MELLANOX_CONNECTX4,

	PCI_DEVICE_ID_MELLANOX_CONNECTX4_LX,

};



static void mellanox_check_broken_intx_masking(struct pci_dev *pdev)

{

	int i;



	for (i = 0; i < ARRAY_SIZE(mellanox_broken_intx_devs); i++) {

		if (pdev->device == mellanox_broken_intx_devs[i]) {

			pdev->broken_intx_masking = 1;

			return;

		}

	}

}

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX, PCI_ANY_ID,

			mellanox_check_broken_intx_masking);



static void quirk_no_bus_reset(struct pci_dev *dev)

{

	dev->dev_flags |= PCI_DEV_FLAGS_NO_BUS_RESET;