Commit 7c309e69 authored Jul 27, 2023 by DuanqiangWen

Revert "openeuler: pci: workaround multiple functions can be assigned to only one VM"

hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I66W4Y


CVE: NA

--------------------------------

This reverts commit 5ca65171.

revert this patch and then backport upstream patch
a2b9b123 PCI: Add ACS quirk for Wangxun NICs.

Signed-off-by: DuanqiangWen <duanqiangwen@net-swift.com>

parent 79d3ff84

drivers/net/ethernet/netswift/ngbe/ngbe_type.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,11 @@
		#endif

		/********** ngbe_register.h **********/
		/* Vendor ID */
		#ifndef PCI_VENDOR_ID_TRUSTNETIC
		#define PCI_VENDOR_ID_TRUSTNETIC 0x8088
		#endif

		/* Device IDs */
		/* copper */
		#define NGBE_DEV_ID_EM_TEST 0x0000

drivers/net/ethernet/netswift/txgbe/txgbe_type.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -89,6 +89,11 @@
		#endif

		/********** txgbe_register.h **********/
		/* Vendor ID */
		#ifndef PCI_VENDOR_ID_TRUSTNETIC
		#define PCI_VENDOR_ID_TRUSTNETIC 0x8088
		#endif

		/* Device IDs */
		#define TXGBE_DEV_ID_SP1000 0x1001
		#define TXGBE_DEV_ID_WX1820 0x2001

drivers/pci/quirks.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -4979,7 +4979,6 @@ static const struct pci_dev_acs_enabled {
		/* because rootcomplex Vendor id is 0x17cd on phytium cpu */
		{ 0x17cd, PCI_ANY_ID, pci_quirk_xgene_acs },
		#endif
		{ PCI_VENDOR_ID_TRUSTNETIC, PCI_ANY_ID, pci_quirk_mf_endpoint_acs },
		{ 0 }
		};

include/linux/pci_ids.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -3139,6 +3139,4 @@

		#define PCI_VENDOR_ID_NCUBE 0x10ff

		#define PCI_VENDOR_ID_TRUSTNETIC 0x8088

		#endif /* _LINUX_PCI_IDS_H */