From: Greg Kroah-Hartman Date: Mon, 30 Dec 2019 17:36:40 +0000 (+0100) Subject: drop mips-syscall-emit-loongson3-sync-workarounds-within-.patch from 4.19 and 5.4 X-Git-Tag: v4.14.161~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57848a2b11dfd47367fe6d77bc441bf9159521ac;p=thirdparty%2Fkernel%2Fstable-queue.git drop mips-syscall-emit-loongson3-sync-workarounds-within-.patch from 4.19 and 5.4 --- diff --git a/queue-4.19/mips-syscall-emit-loongson3-sync-workarounds-within-.patch b/queue-4.19/mips-syscall-emit-loongson3-sync-workarounds-within-.patch deleted file mode 100644 index 38280c3fb91..00000000000 --- a/queue-4.19/mips-syscall-emit-loongson3-sync-workarounds-within-.patch +++ /dev/null @@ -1,48 +0,0 @@ -From edc63f1ff5e828662df8a3321739532490464c55 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 1 Oct 2019 21:53:39 +0000 -Subject: MIPS: syscall: Emit Loongson3 sync workarounds within asm - -From: Paul Burton - -[ Upstream commit e84957e6ae043bb83ad6ae7e949a1ce97b6bbfef ] - -Generate the sync instructions required to workaround Loongson3 LL/SC -errata within inline asm blocks, which feels a little safer than doing -it from C where strictly speaking the compiler would be well within its -rights to insert a memory access between the separate asm statements we -previously had, containing sync & ll instructions respectively. - -Signed-off-by: Paul Burton -Cc: linux-mips@vger.kernel.org -Cc: Huacai Chen -Cc: Jiaxun Yang -Cc: linux-kernel@vger.kernel.org -Signed-off-by: Sasha Levin ---- - arch/mips/kernel/syscall.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c -index 69c17b549fd3..10990434bf94 100644 ---- a/arch/mips/kernel/syscall.c -+++ b/arch/mips/kernel/syscall.c -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -135,6 +136,7 @@ static inline int mips_atomic_set(unsigned long addr, unsigned long new) - " .set "MIPS_ISA_ARCH_LEVEL" \n" - " li %[err], 0 \n" - "1: \n" -+ " " __SYNC(full, loongson3_war) " \n" - user_ll("%[old]", "(%[addr])") - " move %[tmp], %[new] \n" - "2: \n" --- -2.20.1 - diff --git a/queue-4.19/series b/queue-4.19/series index a7965e172f0..a57e7bfa1a5 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -57,7 +57,6 @@ media-cec-funcs.h-add-status_req-checks.patch drm-bridge-dw-hdmi-refuse-ddc-ci-transfers-on-the-in.patch samples-pktgen-fix-proc_cmd-command-result-check-log.patch block-fix-writeback-throttling-w-1-compiler-warnings.patch -mips-syscall-emit-loongson3-sync-workarounds-within-.patch mwifiex-pcie-fix-memory-leak-in-mwifiex_pcie_init_ev.patch drm-drm_vblank-change-einval-by-the-correct-errno.patch media-cx88-fix-some-error-handling-path-in-cx8800_in.patch diff --git a/queue-5.4/mips-syscall-emit-loongson3-sync-workarounds-within-.patch b/queue-5.4/mips-syscall-emit-loongson3-sync-workarounds-within-.patch deleted file mode 100644 index b5b5cd90082..00000000000 --- a/queue-5.4/mips-syscall-emit-loongson3-sync-workarounds-within-.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 92ba4f3b55917057e54b466cce95b23f9b7d2f73 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 1 Oct 2019 21:53:39 +0000 -Subject: MIPS: syscall: Emit Loongson3 sync workarounds within asm - -From: Paul Burton - -[ Upstream commit e84957e6ae043bb83ad6ae7e949a1ce97b6bbfef ] - -Generate the sync instructions required to workaround Loongson3 LL/SC -errata within inline asm blocks, which feels a little safer than doing -it from C where strictly speaking the compiler would be well within its -rights to insert a memory access between the separate asm statements we -previously had, containing sync & ll instructions respectively. - -Signed-off-by: Paul Burton -Cc: linux-mips@vger.kernel.org -Cc: Huacai Chen -Cc: Jiaxun Yang -Cc: linux-kernel@vger.kernel.org -Signed-off-by: Sasha Levin ---- - arch/mips/kernel/syscall.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c -index 3f16f3823031..c333e5788664 100644 ---- a/arch/mips/kernel/syscall.c -+++ b/arch/mips/kernel/syscall.c -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -133,12 +134,12 @@ static inline int mips_atomic_set(unsigned long addr, unsigned long new) - [efault] "i" (-EFAULT) - : "memory"); - } else if (cpu_has_llsc) { -- loongson_llsc_mb(); - __asm__ __volatile__ ( - " .set push \n" - " .set "MIPS_ISA_ARCH_LEVEL" \n" - " li %[err], 0 \n" - "1: \n" -+ " " __SYNC(full, loongson3_war) " \n" - user_ll("%[old]", "(%[addr])") - " move %[tmp], %[new] \n" - "2: \n" --- -2.20.1 - diff --git a/queue-5.4/series b/queue-5.4/series index ffd360ba253..51f37971cd4 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -109,7 +109,6 @@ media-meson-ao-cec-move-cec_notifier_cec_adap_regist.patch drm-bridge-dw-hdmi-refuse-ddc-ci-transfers-on-the-in.patch samples-pktgen-fix-proc_cmd-command-result-check-log.patch block-fix-writeback-throttling-w-1-compiler-warnings.patch -mips-syscall-emit-loongson3-sync-workarounds-within-.patch drm-amdkfd-fix-mqd-size-calculation.patch mips-futex-emit-loongson3-sync-workarounds-within-as.patch mwifiex-pcie-fix-memory-leak-in-mwifiex_pcie_init_ev.patch