Message ID | 20240410193712.31108-1-ju.o@free.fr |
---|---|
State | Accepted |
Headers | show |
Series | [v3,1/1] package/rdma-core: bump to version v51.0 | expand |
On 10/04/2024 21:37, Julien Olivain wrote: > For change log since v49.0, see: > https://github.com/linux-rdma/rdma-core/releases/tag/v50.0 > https://github.com/linux-rdma/rdma-core/releases/tag/v51.0 > > This commit drops the package patch, which is included v50.0. > > Signed-off-by: Julien Olivain <ju.o@free.fr> > --- > Changes v2 -> v3: > - Squashed patches into a single one, > reworded the commit log accordingly. I was just about to squash them myself :-) Applied to master, thanks. Regards, Arnout > --- > ...-util-udma_barrier.h-fix-mips4-build.patch | 56 ------------------- > package/rdma-core/rdma-core.hash | 2 +- > package/rdma-core/rdma-core.mk | 2 +- > 3 files changed, 2 insertions(+), 58 deletions(-) > delete mode 100644 package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch > > diff --git a/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch b/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch > deleted file mode 100644 > index 6dfb476faaa..00000000000 > --- a/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch > +++ /dev/null > @@ -1,56 +0,0 @@ > -From 1b1ca539f6e1f0b774e989f1022477686e4fc77f Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> > -Date: Sun, 21 Jan 2024 18:55:34 +0100 > -Subject: [PATCH] util/udma_barrier.h: fix mips4 build > - > -The 'sync' instruction for MIPS was defined in MIPS-II as taking no > -operands. MIPS32 extended the define of 'sync' as taking an optional > -unsigned 5 bit immediate. > - > -As a result, replace "sync 0" by "sync" to fix the following build > -failure on mips4 raised since version 43.0 and > -https://github.com/linux-rdma/rdma-core/commit/b7c428344ea96d446f6ffe31c620a238a7f25c9e: > - > -/tmp/ccrBy9fV.s: Assembler messages: > -/tmp/ccrBy9fV.s:994: Error: invalid operands `sync 0' > - > -Fixes: > - - http://autobuild.buildroot.org/results/2ab22a3ec4287fc15ff6a90d8715b4897b32a933 > - > -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > -Upstream: https://github.com/linux-rdma/rdma-core/commit/f3f0c06014c6de845032e6fe9f152674919b3ec6 > ---- > - util/udma_barrier.h | 6 +++--- > - 1 file changed, 3 insertions(+), 3 deletions(-) > - > -diff --git a/util/udma_barrier.h b/util/udma_barrier.h > -index 0a1f8a45b..3793d2f18 100644 > ---- a/util/udma_barrier.h > -+++ b/util/udma_barrier.h > -@@ -101,7 +101,7 @@ > - #elif defined(__riscv) > - #define udma_to_device_barrier() asm volatile("fence ow,ow" ::: "memory") > - #elif defined(__mips__) > --#define udma_to_device_barrier() asm volatile("sync 0" ::: "memory") > -+#define udma_to_device_barrier() asm volatile("sync" ::: "memory") > - #else > - #error No architecture specific memory barrier defines found! > - #endif > -@@ -139,7 +139,7 @@ > - #elif defined(__riscv) > - #define udma_from_device_barrier() asm volatile("fence ir,ir" ::: "memory") > - #elif defined(__mips__) > --#define udma_from_device_barrier() asm volatile("sync 0" ::: "memory") > -+#define udma_from_device_barrier() asm volatile("sync" ::: "memory") > - #else > - #error No architecture specific memory barrier defines found! > - #endif > -@@ -212,7 +212,7 @@ > - #include "s390_mmio_insn.h" > - #define mmio_flush_writes() s390_pciwb() > - #elif defined(__mips__) > --#define mmio_flush_writes() asm volatile("sync 0" ::: "memory") > -+#define mmio_flush_writes() asm volatile("sync" ::: "memory") > - #else > - #error No architecture specific memory barrier defines found! > - #endif > diff --git a/package/rdma-core/rdma-core.hash b/package/rdma-core/rdma-core.hash > index fc1d319123d..f8b01e882dc 100644 > --- a/package/rdma-core/rdma-core.hash > +++ b/package/rdma-core/rdma-core.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 1ea2c2678d48be0b179871e9ae8c58ceab11a0c5b69315a332ff51dd607180b7 rdma-core-49.0.tar.gz > +sha256 a4065b0454249839dc75b61c6ee428e917d9cddf964ff7a33d479f00d1264ba0 rdma-core-51.0.tar.gz > sha256 99e0df1d009a21d0dfb031600c550fd8f4efc0c6b2a4ef8b34a995aa6f79c9f4 COPYING.BSD_MIT > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL2 > sha256 c46a557f25b8ef9bec76526c4e593fc13e6cba27e7ba30d73b6497a689cf06f6 COPYING.md > diff --git a/package/rdma-core/rdma-core.mk b/package/rdma-core/rdma-core.mk > index 5f8989b3bd4..834d9ea3efe 100644 > --- a/package/rdma-core/rdma-core.mk > +++ b/package/rdma-core/rdma-core.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -RDMA_CORE_VERSION = 49.0 > +RDMA_CORE_VERSION = 51.0 > RDMA_CORE_SITE = $(call github,linux-rdma,rdma-core,v$(RDMA_CORE_VERSION)) > RDMA_CORE_LICENSE = GPL-2.0 or BSD-2-Clause > RDMA_CORE_LICENSE_FILES = COPYING.GPL2 COPYING.BSD_MIT COPYING.md
diff --git a/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch b/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch deleted file mode 100644 index 6dfb476faaa..00000000000 --- a/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 1b1ca539f6e1f0b774e989f1022477686e4fc77f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> -Date: Sun, 21 Jan 2024 18:55:34 +0100 -Subject: [PATCH] util/udma_barrier.h: fix mips4 build - -The 'sync' instruction for MIPS was defined in MIPS-II as taking no -operands. MIPS32 extended the define of 'sync' as taking an optional -unsigned 5 bit immediate. - -As a result, replace "sync 0" by "sync" to fix the following build -failure on mips4 raised since version 43.0 and -https://github.com/linux-rdma/rdma-core/commit/b7c428344ea96d446f6ffe31c620a238a7f25c9e: - -/tmp/ccrBy9fV.s: Assembler messages: -/tmp/ccrBy9fV.s:994: Error: invalid operands `sync 0' - -Fixes: - - http://autobuild.buildroot.org/results/2ab22a3ec4287fc15ff6a90d8715b4897b32a933 - -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> -Upstream: https://github.com/linux-rdma/rdma-core/commit/f3f0c06014c6de845032e6fe9f152674919b3ec6 ---- - util/udma_barrier.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/util/udma_barrier.h b/util/udma_barrier.h -index 0a1f8a45b..3793d2f18 100644 ---- a/util/udma_barrier.h -+++ b/util/udma_barrier.h -@@ -101,7 +101,7 @@ - #elif defined(__riscv) - #define udma_to_device_barrier() asm volatile("fence ow,ow" ::: "memory") - #elif defined(__mips__) --#define udma_to_device_barrier() asm volatile("sync 0" ::: "memory") -+#define udma_to_device_barrier() asm volatile("sync" ::: "memory") - #else - #error No architecture specific memory barrier defines found! - #endif -@@ -139,7 +139,7 @@ - #elif defined(__riscv) - #define udma_from_device_barrier() asm volatile("fence ir,ir" ::: "memory") - #elif defined(__mips__) --#define udma_from_device_barrier() asm volatile("sync 0" ::: "memory") -+#define udma_from_device_barrier() asm volatile("sync" ::: "memory") - #else - #error No architecture specific memory barrier defines found! - #endif -@@ -212,7 +212,7 @@ - #include "s390_mmio_insn.h" - #define mmio_flush_writes() s390_pciwb() - #elif defined(__mips__) --#define mmio_flush_writes() asm volatile("sync 0" ::: "memory") -+#define mmio_flush_writes() asm volatile("sync" ::: "memory") - #else - #error No architecture specific memory barrier defines found! - #endif diff --git a/package/rdma-core/rdma-core.hash b/package/rdma-core/rdma-core.hash index fc1d319123d..f8b01e882dc 100644 --- a/package/rdma-core/rdma-core.hash +++ b/package/rdma-core/rdma-core.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 1ea2c2678d48be0b179871e9ae8c58ceab11a0c5b69315a332ff51dd607180b7 rdma-core-49.0.tar.gz +sha256 a4065b0454249839dc75b61c6ee428e917d9cddf964ff7a33d479f00d1264ba0 rdma-core-51.0.tar.gz sha256 99e0df1d009a21d0dfb031600c550fd8f4efc0c6b2a4ef8b34a995aa6f79c9f4 COPYING.BSD_MIT sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL2 sha256 c46a557f25b8ef9bec76526c4e593fc13e6cba27e7ba30d73b6497a689cf06f6 COPYING.md diff --git a/package/rdma-core/rdma-core.mk b/package/rdma-core/rdma-core.mk index 5f8989b3bd4..834d9ea3efe 100644 --- a/package/rdma-core/rdma-core.mk +++ b/package/rdma-core/rdma-core.mk @@ -4,7 +4,7 @@ # ################################################################################ -RDMA_CORE_VERSION = 49.0 +RDMA_CORE_VERSION = 51.0 RDMA_CORE_SITE = $(call github,linux-rdma,rdma-core,v$(RDMA_CORE_VERSION)) RDMA_CORE_LICENSE = GPL-2.0 or BSD-2-Clause RDMA_CORE_LICENSE_FILES = COPYING.GPL2 COPYING.BSD_MIT COPYING.md
For change log since v49.0, see: https://github.com/linux-rdma/rdma-core/releases/tag/v50.0 https://github.com/linux-rdma/rdma-core/releases/tag/v51.0 This commit drops the package patch, which is included v50.0. Signed-off-by: Julien Olivain <ju.o@free.fr> --- Changes v2 -> v3: - Squashed patches into a single one, reworded the commit log accordingly. --- ...-util-udma_barrier.h-fix-mips4-build.patch | 56 ------------------- package/rdma-core/rdma-core.hash | 2 +- package/rdma-core/rdma-core.mk | 2 +- 3 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch