From 1a03dbb6698340bd86d769f3869baf5741a87c96 Mon Sep 17 00:00:00 2001 From: Xin Tian Date: Thu, 20 Mar 2025 16:17:32 +0800 Subject: [PATCH] libxscale: Match dev by vid and did Match dev by vid and did. Signed-off-by: Xin Tian --- 0097-libxscale-Match-dev-by-vid-and-did.patch | 85 +++++++++++++++++++ rdma-core.spec | 9 +- 2 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 0097-libxscale-Match-dev-by-vid-and-did.patch diff --git a/0097-libxscale-Match-dev-by-vid-and-did.patch b/0097-libxscale-Match-dev-by-vid-and-did.patch new file mode 100644 index 0000000..4e561c7 --- /dev/null +++ b/0097-libxscale-Match-dev-by-vid-and-did.patch @@ -0,0 +1,85 @@ +From c51e33b6a7b21ea3cc1230838d95d5428396be3b Mon Sep 17 00:00:00 2001 +From: Xin Tian +Date: Thu, 20 Mar 2025 15:33:54 +0800 +Subject: [PATCH] libxscale: Match dev by vid and did + +Match dev by vid and did. + +Signed-off-by: Xin Tian +--- + providers/xscale/xscale.c | 20 +++++++++++++++----- + providers/xscale/xscale.h | 18 ++++++++++++++++++ + 2 files changed, 33 insertions(+), 5 deletions(-) + +diff --git a/providers/xscale/xscale.c b/providers/xscale/xscale.c +index e6792b9..e24cfd2 100644 +--- a/providers/xscale/xscale.c ++++ b/providers/xscale/xscale.c +@@ -23,10 +23,6 @@ + #include "wqe.h" + #include "xsc_hsi.h" + +-#ifndef PCI_VENDOR_ID_MELLANOX +-#define PCI_VENDOR_ID_MELLANOX 0x15b3 +-#endif +- + #ifndef CPU_OR + #define CPU_OR(x, y, z) do {} while (0) + #endif +@@ -35,9 +31,23 @@ + #define CPU_EQUAL(x, y) 1 + #endif + +-#define HCA(v, d) VERBS_PCI_MATCH(PCI_VENDOR_ID_##v, d, NULL) + static const struct verbs_match_ent hca_table[] = { + VERBS_MODALIAS_MATCH("*xscale*", NULL), ++ VERBS_PCI_MATCH(XSC_PCI_VENDOR_ID, XSC_MC_PF_DEV_ID, NULL), ++ VERBS_PCI_MATCH(XSC_PCI_VENDOR_ID, XSC_MC_VF_DEV_ID, NULL), ++ VERBS_PCI_MATCH(XSC_PCI_VENDOR_ID, XSC_MC_PF_DEV_ID_DIAMOND, NULL), ++ VERBS_PCI_MATCH(XSC_PCI_VENDOR_ID, XSC_MC_PF_DEV_ID_DIAMOND_NEXT, NULL), ++ ++ VERBS_PCI_MATCH(XSC_PCI_VENDOR_ID, XSC_MF_HOST_PF_DEV_ID, NULL), ++ VERBS_PCI_MATCH(XSC_PCI_VENDOR_ID, XSC_MF_HOST_VF_DEV_ID, NULL), ++ VERBS_PCI_MATCH(XSC_PCI_VENDOR_ID, XSC_MF_SOC_PF_DEV_ID, NULL), ++ ++ VERBS_PCI_MATCH(XSC_PCI_VENDOR_ID, XSC_MS_PF_DEV_ID, NULL), ++ VERBS_PCI_MATCH(XSC_PCI_VENDOR_ID, XSC_MS_VF_DEV_ID, NULL), ++ ++ VERBS_PCI_MATCH(XSC_PCI_VENDOR_ID, XSC_MV_HOST_PF_DEV_ID, NULL), ++ VERBS_PCI_MATCH(XSC_PCI_VENDOR_ID, XSC_MV_HOST_VF_DEV_ID, NULL), ++ VERBS_PCI_MATCH(XSC_PCI_VENDOR_ID, XSC_MV_SOC_PF_DEV_ID, NULL), + {} + }; + +diff --git a/providers/xscale/xscale.h b/providers/xscale/xscale.h +index 0aee472..c6cc9f7 100644 +--- a/providers/xscale/xscale.h ++++ b/providers/xscale/xscale.h +@@ -171,6 +171,24 @@ struct xsc_spinlock { + int need_lock; + }; + ++#define XSC_PCI_VENDOR_ID 0x1f67 ++ ++#define XSC_MC_PF_DEV_ID 0x1011 ++#define XSC_MC_VF_DEV_ID 0x1012 ++#define XSC_MC_PF_DEV_ID_DIAMOND 0x1021 ++#define XSC_MC_PF_DEV_ID_DIAMOND_NEXT 0x1023 ++ ++#define XSC_MF_HOST_PF_DEV_ID 0x1051 ++#define XSC_MF_HOST_VF_DEV_ID 0x1052 ++#define XSC_MF_SOC_PF_DEV_ID 0x1053 ++ ++#define XSC_MS_PF_DEV_ID 0x1111 ++#define XSC_MS_VF_DEV_ID 0x1112 ++ ++#define XSC_MV_HOST_PF_DEV_ID 0x1151 ++#define XSC_MV_HOST_VF_DEV_ID 0x1152 ++#define XSC_MV_SOC_PF_DEV_ID 0x1153 ++ + /* PAGE_SHIFT determines the page size */ + + #define PAGE_SHIFT 12 +-- +2.25.1 + diff --git a/rdma-core.spec b/rdma-core.spec index 0a82bf4..ea16a1c 100644 --- a/rdma-core.spec +++ b/rdma-core.spec @@ -1,6 +1,6 @@ Name: rdma-core Version: 41.0 -Release: 33 +Release: 34 Summary: RDMA core userspace libraries and daemons License: GPLv2 or BSD Url: https://github.com/linux-rdma/rdma-core @@ -102,6 +102,7 @@ patch93: 0093-libxscale-Add-Yunsilicon-User-Space-RDMA-Driver.patch patch94: 0094-libhns-Fix-the-max_inline_data-value.patch patch95: 0095-libhns-Adapt-UD-inline-data-size-for-UCX.patch patch96: 0096-libhns-Fix-wrong-order-of-spin_unlock-in-modify_qp.patch +patch97: 0097-libxscale-Match-dev-by-vid-and-did.patch BuildRequires: binutils cmake >= 2.8.11 gcc libudev-devel pkgconfig pkgconfig(libnl-3.0) BuildRequires: pkgconfig(libnl-route-3.0) valgrind-devel systemd systemd-devel @@ -352,6 +353,12 @@ fi %{_mandir}/* %changelog +* Thu Mar 20 2025 Xin Tian - 41.0-34 +- Type: bugfix +- ID: NA +- SUG: NA +- DESC: [libxscale] Match dev by vid and did + * Wed Mar 12 2025 Xinghai Cen - 41.0-33 - Type: bugfix - ID: NA -- Gitee