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

Commit f0ee43d6 authored by Mengyuan Lou's avatar Mengyuan Lou Committed by Greg Kroah-Hartman
Browse files

PCI: Add ACS quirk for Wangxun NICs 

[ Upstream commit a2b9b123ccac913e9f9b80337d687a2fe786a634 ]

Wangxun has verified there is no peer-to-peer between functions for the
below selection of SFxxx, RP1000 and RP2000 NICS.  They may be
multi-function devices, but the hardware does not advertise ACS capability.

Add an ACS quirk for these devices so the functions can be in independent
IOMMU groups.

Link: https://lore.kernel.org/r/20230207102419.44326-1-mengyuanlou@net-swift.com


Signed-off-by: default avatarMengyuan Lou <mengyuanlou@net-swift.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f6d3aee1

drivers/pci/quirks.c

+22 −0
Original line number Diff line number Diff line
@@ -4843,6 +4843,26 @@ static int pci_quirk_brcm_acs(struct pci_dev *dev, u16 acs_flags) 
		PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF);

}



/*

 * Wangxun 10G/1G NICs have no ACS capability, and on multi-function

 * devices, peer-to-peer transactions are not be used between the functions.

 * So add an ACS quirk for below devices to isolate functions.

 * SFxxx 1G NICs(em).

 * RP1000/RP2000 10G NICs(sp).

 */

static int  pci_quirk_wangxun_nic_acs(struct pci_dev *dev, u16 acs_flags)

{

	switch (dev->device) {

	case 0x0100 ... 0x010F:

	case 0x1001:

	case 0x2001:

		return pci_acs_ctrl_enabled(acs_flags,

			PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF);

	}



	return false;

}



static const struct pci_dev_acs_enabled {

	u16 vendor;

	u16 device;
@@ -4988,6 +5008,8 @@ static const struct pci_dev_acs_enabled { 
	{ PCI_VENDOR_ID_NXP, 0x8d9b, pci_quirk_nxp_rp_acs },

	/* Zhaoxin Root/Downstream Ports */

	{ PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs },

	/* Wangxun nics */

	{ PCI_VENDOR_ID_WANGXUN, PCI_ANY_ID, pci_quirk_wangxun_nic_acs },

	{ 0 }

};

include/linux/pci_ids.h

+2 −0
Original line number Diff line number Diff line
@@ -3024,6 +3024,8 @@ 
#define PCI_DEVICE_ID_INTEL_VMD_9A0B	0x9a0b

#define PCI_DEVICE_ID_INTEL_S21152BB	0xb152



#define PCI_VENDOR_ID_WANGXUN		0x8088



#define PCI_VENDOR_ID_SCALEMP		0x8686

#define PCI_DEVICE_ID_SCALEMP_VSMP_CTL	0x1010