From 34d87507c12307d92b38bf8df40a7256a43bff9a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 29 2020 06:57:30 +0000 Subject: import rdma-core-22.4-5.el7 --- diff --git a/SOURCES/0001-bnxt_re-lib-Add-remaining-pci-ids-for-gen-P5-devices.patch b/SOURCES/0001-bnxt_re-lib-Add-remaining-pci-ids-for-gen-P5-devices.patch new file mode 100644 index 0000000..128ca68 --- /dev/null +++ b/SOURCES/0001-bnxt_re-lib-Add-remaining-pci-ids-for-gen-P5-devices.patch @@ -0,0 +1,37 @@ +From bb3c76ae13473a3002d57bc29d154542ce172419 Mon Sep 17 00:00:00 2001 +From: Naresh Kumar PBS +Date: Tue, 26 Nov 2019 04:05:21 -0500 +Subject: [PATCH 1/2] bnxt_re/lib: Add remaining pci ids for gen P5 devices + +Making a change to add pci ids for VF and NPAR devices. + +Signed-off-by: Naresh Kumar PBS +Signed-off-by: Devesh Sharma +--- + providers/bnxt_re/main.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/providers/bnxt_re/main.c b/providers/bnxt_re/main.c +index b1194db78c18..e290a07bc502 100644 +--- a/providers/bnxt_re/main.c ++++ b/providers/bnxt_re/main.c +@@ -76,9 +76,15 @@ static const struct verbs_match_ent cna_table[] = { + CNA(BROADCOM, 0x16F0), /* BCM58730 */ + CNA(BROADCOM, 0x16F1), /* BCM57452 */ + CNA(BROADCOM, 0x1750), /* BCM57500 */ ++ CNA(BROADCOM, 0x1751), /* BCM57504 */ ++ CNA(BROADCOM, 0x1752), /* BCM57502 */ ++ CNA(BROADCOM, 0x1803), /* BCM57508 NPAR */ ++ CNA(BROADCOM, 0x1804), /* BCM57504 NPAR */ ++ CNA(BROADCOM, 0x1805), /* BCM57502 NPAR */ ++ CNA(BROADCOM, 0x1807), /* BCM5750x VF */ + CNA(BROADCOM, 0xD800), /* BCM880xx VF */ + CNA(BROADCOM, 0xD802), /* BCM58802 */ +- CNA(BROADCOM, 0xD804), /* BCM8804 SR */ ++ CNA(BROADCOM, 0xD804), /* BCM8804 SR */ + {} + }; + +-- +2.25.2 + diff --git a/SOURCES/0001-libibverbs-Fix-ABI_placeholder1-and-ABI_placeholder2.patch b/SOURCES/0001-libibverbs-Fix-ABI_placeholder1-and-ABI_placeholder2.patch index c8377f7..6695550 100644 --- a/SOURCES/0001-libibverbs-Fix-ABI_placeholder1-and-ABI_placeholder2.patch +++ b/SOURCES/0001-libibverbs-Fix-ABI_placeholder1-and-ABI_placeholder2.patch @@ -1,11 +1,9 @@ -From af898ec56092e273faa3abc7fe6d02c506e2f441 Mon Sep 17 00:00:00 2001 +From a71bdf9008efb5c28290e2ca7c58bc7d019f7194 Mon Sep 17 00:00:00 2001 From: Honggang Li Date: Thu, 4 Jun 2020 14:33:38 +0800 Subject: [PATCH] libibverbs: Fix ABI_placeholder1 and ABI_placeholder2 assignment -[ Upstream commit 88789b7ba618d55491026c74a9a31699805e5934 ] - The assignment of ABI_placeholder1 and ABI_placeholder2 must be after the provider populated context_ex->ibv_create_flow and context_ex->ibv_destroy_flow. @@ -18,13 +16,14 @@ with libibverbs released after 1111cf9895bb and call ibv_create_flow. Fixes: 1111cf9895bb ("verbs: Always allocate a verbs_context") Signed-off-by: Honggang Li -Signed-off-by: Nicolas Morey-Chaisemartin +(cherry picked from commit 88789b7ba618d55491026c74a9a31699805e5934) +Signed-off-by: Honggang Li --- libibverbs/device.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/libibverbs/device.c b/libibverbs/device.c -index d71051343b0b..04fc087d431d 100644 +index 273768023078..6f2a32fe0586 100644 --- a/libibverbs/device.c +++ b/libibverbs/device.c @@ -240,23 +240,6 @@ int verbs_init_context(struct verbs_context *context_ex, diff --git a/SOURCES/0002-bnxt_re-lib-Recognize-additional-5750x-device-ID-s.patch b/SOURCES/0002-bnxt_re-lib-Recognize-additional-5750x-device-ID-s.patch new file mode 100644 index 0000000..f22257c --- /dev/null +++ b/SOURCES/0002-bnxt_re-lib-Recognize-additional-5750x-device-ID-s.patch @@ -0,0 +1,60 @@ +From 2d7c483d8a855e01e7bf2d945ab8720a10262bab Mon Sep 17 00:00:00 2001 +From: Luke Starrett +Date: Tue, 26 Nov 2019 04:11:28 -0500 +Subject: [PATCH 2/2] bnxt_re/lib: Recognize additional 5750x device ID's + +BCM5750x family includes 57504 and 57502. Until recently the chip_num +register always conveyed 0x1750 (57508). Recent devices properly +reflect the SKU in the chip_num register. Update Phase5 checks to +reflect this. + +Signed-off-by: Luke Starrett +Signed-off-by: Devesh Sharma +--- + providers/bnxt_re/main.c | 6 ++++-- + providers/bnxt_re/main.h | 5 ++++- + 2 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/providers/bnxt_re/main.c b/providers/bnxt_re/main.c +index e290a07bc502..803eff79e73a 100644 +--- a/providers/bnxt_re/main.c ++++ b/providers/bnxt_re/main.c +@@ -75,7 +75,7 @@ static const struct verbs_match_ent cna_table[] = { + CNA(BROADCOM, 0x16EF), /* BCM57416 NPAR */ + CNA(BROADCOM, 0x16F0), /* BCM58730 */ + CNA(BROADCOM, 0x16F1), /* BCM57452 */ +- CNA(BROADCOM, 0x1750), /* BCM57500 */ ++ CNA(BROADCOM, 0x1750), /* BCM57508 */ + CNA(BROADCOM, 0x1751), /* BCM57504 */ + CNA(BROADCOM, 0x1752), /* BCM57502 */ + CNA(BROADCOM, 0x1803), /* BCM57508 NPAR */ +@@ -118,7 +118,9 @@ static const struct verbs_context_ops bnxt_re_cntx_ops = { + + bool bnxt_re_is_chip_gen_p5(struct bnxt_re_chip_ctx *cctx) + { +- return cctx->chip_num == CHIP_NUM_57500; ++ return (cctx->chip_num == CHIP_NUM_57508 || ++ cctx->chip_num == CHIP_NUM_57504 || ++ cctx->chip_num == CHIP_NUM_57502); + } + + /* Context Init functions */ +diff --git a/providers/bnxt_re/main.h b/providers/bnxt_re/main.h +index be5734960475..368297e68b7a 100644 +--- a/providers/bnxt_re/main.h ++++ b/providers/bnxt_re/main.h +@@ -56,7 +56,10 @@ + + #define BNXT_RE_UD_QP_HW_STALL 0x400000 + +-#define CHIP_NUM_57500 0x1750 ++#define CHIP_NUM_57508 0x1750 ++#define CHIP_NUM_57504 0x1751 ++#define CHIP_NUM_57502 0x1752 ++ + struct bnxt_re_chip_ctx { + __u16 chip_num; + __u8 chip_rev; +-- +2.25.2 + diff --git a/SPECS/rdma-core.spec b/SPECS/rdma-core.spec index b870c3b..909dcdc 100644 --- a/SPECS/rdma-core.spec +++ b/SPECS/rdma-core.spec @@ -1,11 +1,8 @@ Name: rdma-core Version: 22.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: RDMA core userspace libraries and daemons -%ifnarch %{arm} -%define dma_coherent 1 -%endif # Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license # providers/ipathverbs/ Dual licensed using a BSD license with an extra patent clause # providers/rxe/ Incorporates code from ipathverbs and contains the patent clause @@ -34,7 +31,11 @@ Patch103: 0003-man-Fix-return-value-for-ibv_reg_dm_mr.patch Patch104: 0004-Update-kernel-headers.patch Patch105: 0005-mlx5-Support-scatter-to-CQE-over-DCT-QP.patch Patch106: 0001-ibacm-Do-not-open-non-InfiniBand-device.patch -Patch107: 0001-libibverbs-Fix-ABI_placeholder1-and-ABI_placeholder2.patch +# Patches backported from stable-v27 +Patch107: 0001-bnxt_re-lib-Add-remaining-pci-ids-for-gen-P5-devices.patch +Patch108: 0002-bnxt_re-lib-Recognize-additional-5750x-device-ID-s.patch + +Patch109: 0001-libibverbs-Fix-ABI_placeholder1-and-ABI_placeholder2.patch # Do not build static libs by default. %define with_static %{?_with_static: 1} %{?!_with_static: 0} @@ -68,6 +69,8 @@ Obsoletes: libibcm < %{version}-%{release} # the ndd utility moved from infiniband-diags to rdma-core Conflicts: infiniband-diags <= 1.6.5 Requires: pciutils +# 32-bit arm is missing required arch-specific memory barriers, +ExcludeArch: %{arm} # Since we recommend developers use Ninja, so should packagers, for consistency. %define CMAKE_FLAGS %{nil} @@ -118,12 +121,10 @@ Provides: libhfi1-static = %{version}-%{release} Obsoletes: libhfi1-static < %{version}-%{release} Provides: libipathverbs-static = %{version}-%{release} Obsoletes: libipathverbs-static < %{version}-%{release} -%if 0%{?dma_coherent} Provides: libmlx4-static = %{version}-%{release} Obsoletes: libmlx4-static < %{version}-%{release} Provides: libmlx5-static = %{version}-%{release} Obsoletes: libmlx5-static < %{version}-%{release} -%endif Provides: libnes-static = %{version}-%{release} Obsoletes: libnes-static < %{version}-%{release} Provides: libocrdma-static = %{version}-%{release} @@ -153,14 +154,12 @@ Provides: libi40iw = %{version}-%{release} Obsoletes: libi40iw < %{version}-%{release} Provides: libipathverbs = %{version}-%{release} Obsoletes: libipathverbs < %{version}-%{release} -%if 0%{?dma_coherent} Provides: libmlx4 = %{version}-%{release} Obsoletes: libmlx4 < %{version}-%{release} %ifnarch s390 Provides: libmlx5 = %{version}-%{release} Obsoletes: libmlx5 < %{version}-%{release} %endif -%endif Provides: libmthca = %{version}-%{release} Obsoletes: libmthca < %{version}-%{release} Provides: libnes = %{version}-%{release} @@ -298,6 +297,8 @@ discover and use SCSI devices via the SCSI RDMA Protocol over InfiniBand. %patch105 -p1 %patch106 -p1 %patch107 -p1 +%patch108 -p1 +%patch109 -p1 %build @@ -348,22 +349,16 @@ mkdir -p %{buildroot}%{dracutlibdir}/modules.d/05rdma mkdir -p %{buildroot}%{sysmodprobedir} install -D -m0644 redhat/rdma.conf %{buildroot}/%{_sysconfdir}/rdma/rdma.conf install -D -m0644 redhat/rdma.sriov-vfs %{buildroot}/%{_sysconfdir}/rdma/sriov-vfs -%if 0%{?dma_coherent} install -D -m0644 redhat/rdma.mlx4.conf %{buildroot}/%{_sysconfdir}/rdma/mlx4.conf -%endif install -D -m0755 redhat/rdma.ifup-ib %{buildroot}/%{_sysconfdir}/sysconfig/network-scripts/ifup-ib install -D -m0755 redhat/rdma.ifdown-ib %{buildroot}/%{_sysconfdir}/sysconfig/network-scripts/ifdown-ib install -D -m0644 redhat/rdma.service %{buildroot}%{_unitdir}/rdma.service install -D -m0755 redhat/rdma.modules-setup.sh %{buildroot}%{dracutlibdir}/modules.d/05rdma/module-setup.sh install -D -m0644 redhat/rdma.udev-rules %{buildroot}%{_udevrulesdir}/98-rdma.rules -%if 0%{?dma_coherent} install -D -m0644 redhat/rdma.mlx4.sys.modprobe %{buildroot}%{sysmodprobedir}/libmlx4.conf -%endif install -D -m0755 redhat/rdma.kernel-init %{buildroot}%{_libexecdir}/rdma-init-kernel install -D -m0755 redhat/rdma.sriov-init %{buildroot}%{_libexecdir}/rdma-set-sriov-vf -%if 0%{?dma_coherent} install -D -m0755 redhat/rdma.mlx4-setup.sh %{buildroot}%{_libexecdir}/mlx4-setup.sh -%endif # ibacm bin/ib_acme -D . -O @@ -412,11 +407,9 @@ rm -rf %{buildroot}/%{_initrddir}/ %doc %{_docdir}/%{name}-%{version}/udev.md %config(noreplace) %{_sysconfdir}/rdma/* %config(noreplace) %{_sysconfdir}/udev/rules.d/* -%if 0%{?dma_coherent} %ifnarch s390 %config(noreplace) %{_sysconfdir}/modprobe.d/mlx4.conf %endif -%endif %config(noreplace) %{_sysconfdir}/modprobe.d/truescale.conf %{_sysconfdir}/sysconfig/network-scripts/* %{_unitdir}/rdma-hw.target @@ -425,14 +418,10 @@ rm -rf %{buildroot}/%{_initrddir}/ %dir %{dracutlibdir}/modules.d/05rdma %{dracutlibdir}/modules.d/05rdma/module-setup.sh %{_udevrulesdir}/* -%if 0%{?dma_coherent} %{sysmodprobedir}/libmlx4.conf -%endif %{_libexecdir}/rdma-init-kernel %{_libexecdir}/rdma-set-sriov-vf -%if 0%{?dma_coherent} %{_libexecdir}/mlx4-setup.sh -%endif %{_libexecdir}/truescale-serdes.cmds %{_sbindir}/rdma-ndd %{_unitdir}/rdma-ndd.service @@ -454,13 +443,11 @@ rm -rf %{buildroot}/%{_initrddir}/ %{_mandir}/man3/rdma* %{_mandir}/man3/umad* %{_mandir}/man3/*_to_ibv_rate.* -%if 0%{?dma_coherent} %ifnarch s390 %{_mandir}/man3/mlx4dv* %{_mandir}/man3/mlx5dv* %{_mandir}/man7/mlx5dv* %endif -%endif %{_mandir}/man7/rdma_cm.* %files -n libibverbs @@ -468,24 +455,20 @@ rm -rf %{buildroot}/%{_initrddir}/ %dir %{_libdir}/libibverbs %{_libdir}/libibverbs*.so.* %{_libdir}/libibverbs/*.so -%if 0%{?dma_coherent} %ifnarch s390 %{_libdir}/libmlx4.so.* %{_libdir}/libmlx5.so.* %endif -%endif %config(noreplace) %{_sysconfdir}/libibverbs.d/*.driver %doc %{_docdir}/%{name}-%{version}/libibverbs.md %doc %{_docdir}/%{name}-%{version}/rxe.md %doc %{_docdir}/%{name}-%{version}/tag_matching.md %{_bindir}/rxe_cfg %{_mandir}/man7/rxe* -%if 0%{?dma_coherent} %ifnarch s390 %{_mandir}/man7/mlx4dv* %{_mandir}/man7/mlx5dv* %endif -%endif %{_mandir}/man8/rxe* %files -n libibverbs-utils @@ -567,9 +550,13 @@ rm -rf %{buildroot}/%{_initrddir}/ %doc %{_docdir}/%{name}-%{version}/ibsrpdm.md %changelog -* Wed Jun 10 2020 Honggang Li - 22.4-4.el7_8 +* Sat Jun 06 2020 Honggang Li - 22.4-5 - libibverbs: Fix ABI_placeholder1 and ABI_placeholder2 assignment -- Resolves: rhbz#1845848 +- Resolves: rhbz#1843221 + +* Tue Apr 28 2020 Honggang Li - 22.4-4 +- libbnxt_re support for some new device ids and generation id +- Resolves: rhbz#1828482 * Mon Mar 30 2020 Honggang Li - 22.4-3 - Restore three patches