Commit e486387c authored by DuanqiangWen's avatar DuanqiangWen
Browse files

PCI: Add ACS quirk for Wangxun NICs 

maillist inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I66W4Y

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=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.

Signed-off-by: default avatarDuanqiangWen <duanqiangwen@net-swift.com>
parent 7218ef43

drivers/pci/quirks.c

+22 −0
Original line number Diff line number Diff line
@@ -4824,6 +4824,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;
@@ -4973,6 +4993,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 },

#ifdef CONFIG_ARCH_PHYTIUM

	/* because PLX switch Vendor id is 0x10b5 on phytium cpu */

	{ 0x10b5, PCI_ANY_ID, pci_quirk_xgene_acs },

include/linux/pci_ids.h

+2 −0
Original line number Diff line number Diff line
@@ -3043,6 +3043,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