From 08efaa896d3a52b1a5b9ad4bd00916e50bee46c8 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sun, 6 Oct 2024 07:17:47 -0400 Subject: Revert "mariadb: fix runtime failure on riscv" This reverts commit e5c0a0be96eb549858a987b353263c877eae275e. pkg being updated Signed-off-by: Armin Kuster --- meta-oe/recipes-dbs/mysql/mariadb.inc | 1 - ...0001-RISC-V-use-RDTIME-instead-of-RDCYCLE.patch | 66 ---------------------- 2 files changed, 67 deletions(-) delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb/0001-RISC-V-use-RDTIME-instead-of-RDCYCLE.patch diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 124a49ff96..33da32fb28 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -25,7 +25,6 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ file://0001-Remove-the-compile_time_assert-lines.patch \ file://0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch \ - file://0001-RISC-V-use-RDTIME-instead-of-RDCYCLE.patch \ " SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" SRC_URI[sha256sum] = "5239a245ed90517e96396605cd01ccd8f73cd7442d1b3076b6ffe258110e5157" diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-RISC-V-use-RDTIME-instead-of-RDCYCLE.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-RISC-V-use-RDTIME-instead-of-RDCYCLE.patch deleted file mode 100644 index 25a2c399cc..0000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb/0001-RISC-V-use-RDTIME-instead-of-RDCYCLE.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 342f0dd9b4f9fc49dcb589cd98933ea330de55d8 Mon Sep 17 00:00:00 2001 -From: Aurelien Jarno -Date: Thu, 4 Jan 2024 11:30:34 +0100 -Subject: [PATCH] RISC-V: use RDTIME instead of RDCYCLE - -Starting with Linux 6.6 [1], RDCYCLE is a privileged instruction on -RISC-V and can't be used directly from userland. There is a sysctl -option to change that as a transition period, but it will eventually -disappear. - -Use RDTIME instead, which while less accurate has the advantage of being -synchronized between CPU (and thus monotonic) and of constant frequency. - -[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cc4c07c89aada16229084eeb93895c95b7eabaa3 - -Upstream-Status: Backport [https://github.com/MariaDB/server/commit/656f8867720efc1b4dd0969319f35a3e1a2a005e] -Signed-off-by: Changqing Li ---- - include/my_rdtsc.h | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/include/my_rdtsc.h b/include/my_rdtsc.h -index 8b9b0046bc0..21e44847d9a 100644 ---- a/include/my_rdtsc.h -+++ b/include/my_rdtsc.h -@@ -111,7 +111,7 @@ C_MODE_START - On AARCH64, we use the generic timer base register. We override clang - implementation for aarch64 as it access a PMU register which is not - guaranteed to be active. -- On RISC-V, we use the rdcycle instruction to read from mcycle register. -+ On RISC-V, we use the rdtime instruction to read from mtime register. - - Sadly, we have nothing for the Digital Alpha, MIPS, Motorola m68k, - HP PA-RISC or other non-mainstream (or obsolete) processors. -@@ -211,15 +211,15 @@ static inline ulonglong my_timer_cycles(void) - } - #elif defined(__riscv) - #define MY_TIMER_ROUTINE_CYCLES MY_TIMER_ROUTINE_RISCV -- /* Use RDCYCLE (and RDCYCLEH on riscv32) */ -+ /* Use RDTIME (and RDTIMEH on riscv32) */ - { - # if __riscv_xlen == 32 - ulong result_lo, result_hi0, result_hi1; - /* Implemented in assembly because Clang insisted on branching. */ - __asm __volatile__( -- "rdcycleh %0\n" -- "rdcycle %1\n" -- "rdcycleh %2\n" -+ "rdtimeh %0\n" -+ "rdtime %1\n" -+ "rdtimeh %2\n" - "sub %0, %0, %2\n" - "seqz %0, %0\n" - "sub %0, zero, %0\n" -@@ -228,7 +228,7 @@ static inline ulonglong my_timer_cycles(void) - return (static_cast(result_hi1) << 32) | result_lo; - # else - ulonglong result; -- __asm __volatile__("rdcycle %0" : "=r"(result)); -+ __asm __volatile__("rdtime %0" : "=r"(result)); - return result; - } - # endif --- -2.25.1 - -- cgit v1.2.3-54-g00ecf