Unverified Commit 443c6146 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!332 [5.10]Make Multiple functions On Netswift PCIE NIC belong to different IOMMU group 

Merge Pull Request from: @duanqiangwen 
 
This PR is to workaround if multiple functions on a Beijing Wangxun PCl device belong to the same lOMMU group,
    they can be directly assigned to only one VM as well, letting multiple functions
    belong to different IOMMU group.

Issue：https://gitee.com/openeuler/kernel/issues/I66W4Y

Hardware List:
Netswift All Nic, PCI vendor ID 0x8088

Net-Swift Official Website:
https://www.net-swift.com 
 
Link:https://gitee.com/openeuler/kernel/pulls/332

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 6d789c0c ed2b7e53

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

+0 −5
Original line number Diff line number Diff line
@@ -65,11 +65,6 @@ 
#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

+0 −5
Original line number Diff line number Diff line
@@ -89,11 +89,6 @@ 
#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

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

+2 −0
Original line number Diff line number Diff line
@@ -3145,4 +3145,6 @@ 


#define PCI_VENDOR_ID_NCUBE		0x10ff



#define PCI_VENDOR_ID_TRUSTNETIC        0x8088



#endif /* _LINUX_PCI_IDS_H */