Drop powerpc-ps3-fix-lv1-hcall-assembly-for-elfv2-calling.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.6/powerpc-ps3-fix-lv1-hcall-assembly-for-elfv2-calling.patch b/queue-6.6/powerpc-ps3-fix-lv1-hcall-assembly-for-elfv2-calling.patch
deleted file mode 100644 (file)
index f7dfc49..0000000
--- a/queue-6.6/powerpc-ps3-fix-lv1-hcall-assembly-for-elfv2-calling.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8dfadabe020d453089fb769aab8112fe4c8bb3ac Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 27 Dec 2023 17:24:03 +1000
-Subject: powerpc/ps3: Fix lv1 hcall assembly for ELFv2 calling convention
-
-From: Nicholas Piggin <npiggin@gmail.com>
-
-[ Upstream commit 6735fef14c1f089ae43fd6d43add818b7ff682a8 ]
-
-Stack-passed parameters begin at a different offset in the caller's
-stack in the ELFv2 ABI.
-
-Reported-by: Geoff Levand <geoff@infradead.org>
-Fixes: 8c5fa3b5c4df ("powerpc/64: Make ELFv2 the default for big-endian builds")
-Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
-Tested-by: Geoff Levand <geoff@infradead.org>
-Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-Link: https://msgid.link/20231227072405.63751-2-npiggin@gmail.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/powerpc/include/asm/ppc_asm.h  |  6 ++++--
- arch/powerpc/platforms/ps3/hvcall.S | 18 +++++++++---------
- 2 files changed, 13 insertions(+), 11 deletions(-)
-
-diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h
-index e7792aa135105..041ee25955205 100644
---- a/arch/powerpc/include/asm/ppc_asm.h
-+++ b/arch/powerpc/include/asm/ppc_asm.h
-@@ -201,11 +201,13 @@
- 
- #ifdef CONFIG_PPC64_ELF_ABI_V2
- #define STK_GOT               24
--#define __STK_PARAM(i)        (32 + ((i)-3)*8)
-+#define STK_PARAM_AREA        32
- #else
- #define STK_GOT               40
--#define __STK_PARAM(i)        (48 + ((i)-3)*8)
-+#define STK_PARAM_AREA        48
- #endif
-+
-+#define __STK_PARAM(i)        (STK_PARAM_AREA + ((i)-3)*8)
- #define STK_PARAM(i)  __STK_PARAM(__REG_##i)
- 
- #ifdef CONFIG_PPC64_ELF_ABI_V2
-diff --git a/arch/powerpc/platforms/ps3/hvcall.S b/arch/powerpc/platforms/ps3/hvcall.S
-index 509e30ad01bb4..59ea569debf47 100644
---- a/arch/powerpc/platforms/ps3/hvcall.S
-+++ b/arch/powerpc/platforms/ps3/hvcall.S
-@@ -714,7 +714,7 @@ _GLOBAL(_##API_NAME)                               \
-       std     r4, 0(r11);                     \
-       ld      r11, -16(r1);                   \
-       std     r5, 0(r11);                     \
--      ld      r11, 48+8*8(r1);                \
-+      ld      r11, STK_PARAM_AREA+8*8(r1);    \
-       std     r6, 0(r11);                     \
-                                               \
-       ld      r0, 16(r1);                     \
-@@ -746,22 +746,22 @@ _GLOBAL(_##API_NAME)                             \
-       mflr    r0;                             \
-       std     r0, 16(r1);                     \
-                                               \
--      std     r10, 48+8*7(r1);                \
-+      std     r10, STK_PARAM_AREA+8*7(r1);    \
-                                               \
-       li      r11, API_NUMBER;                \
-       lv1call;                                \
-                                               \
--      ld      r11, 48+8*7(r1);                \
-+      ld      r11, STK_PARAM_AREA+8*7(r1);    \
-       std     r4, 0(r11);                     \
--      ld      r11, 48+8*8(r1);                \
-+      ld      r11, STK_PARAM_AREA+8*8(r1);    \
-       std     r5, 0(r11);                     \
--      ld      r11, 48+8*9(r1);                \
-+      ld      r11, STK_PARAM_AREA+8*9(r1);    \
-       std     r6, 0(r11);                     \
--      ld      r11, 48+8*10(r1);               \
-+      ld      r11, STK_PARAM_AREA+8*10(r1);   \
-       std     r7, 0(r11);                     \
--      ld      r11, 48+8*11(r1);               \
-+      ld      r11, STK_PARAM_AREA+8*11(r1);   \
-       std     r8, 0(r11);                     \
--      ld      r11, 48+8*12(r1);               \
-+      ld      r11, STK_PARAM_AREA+8*12(r1);   \
-       std     r9, 0(r11);                     \
-                                               \
-       ld      r0, 16(r1);                     \
-@@ -777,7 +777,7 @@ _GLOBAL(_##API_NAME)                               \
-       li      r11, API_NUMBER;                \
-       lv1call;                                \
-                                               \
--      ld      r11, 48+8*8(r1);                \
-+      ld      r11, STK_PARAM_AREA+8*8(r1);    \
-       std     r4, 0(r11);                     \
-                                               \
-       ld      r0, 16(r1);                     \
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 7fdb61a28e9b973891ff5f24684f4481fd6538c8..48cda6b2b6b593f10f07004717b43550aff0294a 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -422,7 +422,6 @@ drm-amd-display-add-replay-null-check-in-edp_set_rep.patch
 drm-panel-boe-tv101wum-nl6-make-use-of-prepare_prev_.patch
 drm-mediatek-dsi-fix-dsi-rgb666-formats-and-definiti.patch
 pci-mark-3ware-9650se-root-port-extended-tags-as-bro.patch
-powerpc-ps3-fix-lv1-hcall-assembly-for-elfv2-calling.patch
 pinctrl-renesas-allow-the-compiler-to-optimize-away-.patch
 clk-hisilicon-hi3519-release-the-correct-number-of-g.patch
 clk-hisilicon-hi3559a-fix-an-erroneous-devm_kfree.patch

diff --git a/queue-6.7/powerpc-ps3-fix-lv1-hcall-assembly-for-elfv2-calling.patch b/queue-6.7/powerpc-ps3-fix-lv1-hcall-assembly-for-elfv2-calling.patch
deleted file mode 100644 (file)
index bba6895..0000000
--- a/queue-6.7/powerpc-ps3-fix-lv1-hcall-assembly-for-elfv2-calling.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 8c375802bfd048ea0116cc19528ce63155026614 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 27 Dec 2023 17:24:03 +1000
-Subject: powerpc/ps3: Fix lv1 hcall assembly for ELFv2 calling convention
-
-From: Nicholas Piggin <npiggin@gmail.com>
-
-[ Upstream commit 6735fef14c1f089ae43fd6d43add818b7ff682a8 ]
-
-Stack-passed parameters begin at a different offset in the caller's
-stack in the ELFv2 ABI.
-
-Reported-by: Geoff Levand <geoff@infradead.org>
-Fixes: 8c5fa3b5c4df ("powerpc/64: Make ELFv2 the default for big-endian builds")
-Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
-Tested-by: Geoff Levand <geoff@infradead.org>
-Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-Link: https://msgid.link/20231227072405.63751-2-npiggin@gmail.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/powerpc/include/asm/ppc_asm.h  |  6 ++++--
- arch/powerpc/platforms/ps3/hvcall.S | 18 +++++++++---------
- 2 files changed, 13 insertions(+), 11 deletions(-)
-
-diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h
-index e7792aa135105..041ee25955205 100644
---- a/arch/powerpc/include/asm/ppc_asm.h
-+++ b/arch/powerpc/include/asm/ppc_asm.h
-@@ -201,11 +201,13 @@
- 
- #ifdef CONFIG_PPC64_ELF_ABI_V2
- #define STK_GOT               24
--#define __STK_PARAM(i)        (32 + ((i)-3)*8)
-+#define STK_PARAM_AREA        32
- #else
- #define STK_GOT               40
--#define __STK_PARAM(i)        (48 + ((i)-3)*8)
-+#define STK_PARAM_AREA        48
- #endif
-+
-+#define __STK_PARAM(i)        (STK_PARAM_AREA + ((i)-3)*8)
- #define STK_PARAM(i)  __STK_PARAM(__REG_##i)
- 
- #ifdef CONFIG_PPC64_ELF_ABI_V2
-diff --git a/arch/powerpc/platforms/ps3/hvcall.S b/arch/powerpc/platforms/ps3/hvcall.S
-index 509e30ad01bb4..59ea569debf47 100644
---- a/arch/powerpc/platforms/ps3/hvcall.S
-+++ b/arch/powerpc/platforms/ps3/hvcall.S
-@@ -714,7 +714,7 @@ _GLOBAL(_##API_NAME)                               \
-       std     r4, 0(r11);                     \
-       ld      r11, -16(r1);                   \
-       std     r5, 0(r11);                     \
--      ld      r11, 48+8*8(r1);                \
-+      ld      r11, STK_PARAM_AREA+8*8(r1);    \
-       std     r6, 0(r11);                     \
-                                               \
-       ld      r0, 16(r1);                     \
-@@ -746,22 +746,22 @@ _GLOBAL(_##API_NAME)                             \
-       mflr    r0;                             \
-       std     r0, 16(r1);                     \
-                                               \
--      std     r10, 48+8*7(r1);                \
-+      std     r10, STK_PARAM_AREA+8*7(r1);    \
-                                               \
-       li      r11, API_NUMBER;                \
-       lv1call;                                \
-                                               \
--      ld      r11, 48+8*7(r1);                \
-+      ld      r11, STK_PARAM_AREA+8*7(r1);    \
-       std     r4, 0(r11);                     \
--      ld      r11, 48+8*8(r1);                \
-+      ld      r11, STK_PARAM_AREA+8*8(r1);    \
-       std     r5, 0(r11);                     \
--      ld      r11, 48+8*9(r1);                \
-+      ld      r11, STK_PARAM_AREA+8*9(r1);    \
-       std     r6, 0(r11);                     \
--      ld      r11, 48+8*10(r1);               \
-+      ld      r11, STK_PARAM_AREA+8*10(r1);   \
-       std     r7, 0(r11);                     \
--      ld      r11, 48+8*11(r1);               \
-+      ld      r11, STK_PARAM_AREA+8*11(r1);   \
-       std     r8, 0(r11);                     \
--      ld      r11, 48+8*12(r1);               \
-+      ld      r11, STK_PARAM_AREA+8*12(r1);   \
-       std     r9, 0(r11);                     \
-                                               \
-       ld      r0, 16(r1);                     \
-@@ -777,7 +777,7 @@ _GLOBAL(_##API_NAME)                               \
-       li      r11, API_NUMBER;                \
-       lv1call;                                \
-                                               \
--      ld      r11, 48+8*8(r1);                \
-+      ld      r11, STK_PARAM_AREA+8*8(r1);    \
-       std     r4, 0(r11);                     \
-                                               \
-       ld      r0, 16(r1);                     \
--- 
-2.43.0
-

diff --git a/queue-6.7/series b/queue-6.7/series
index 0878134eddd90adf7ef7679fa6c5ecfbe1fa304c..5711dae33ef7e28569bc7e0495d079c5d3782be5 100644 (file)
--- a/queue-6.7/series
+++ b/queue-6.7/series
@@ -473,7 +473,6 @@ drm-msm-dpu-use-devres-managed-allocation-for-hw-blo.patch
 drm-msm-dpu-finalise-global-state-object.patch
 drm-mediatek-dsi-fix-dsi-rgb666-formats-and-definiti.patch
 pci-mark-3ware-9650se-root-port-extended-tags-as-bro.patch
-powerpc-ps3-fix-lv1-hcall-assembly-for-elfv2-calling.patch
 drm-bridge-adv7511-fix-crash-on-irq-during-probe.patch
 pinctrl-renesas-allow-the-compiler-to-optimize-away-.patch
 clk-hisilicon-hi3519-release-the-correct-number-of-g.patch

diff --git a/queue-6.8/powerpc-ps3-fix-lv1-hcall-assembly-for-elfv2-calling.patch b/queue-6.8/powerpc-ps3-fix-lv1-hcall-assembly-for-elfv2-calling.patch
deleted file mode 100644 (file)
index e38b928..0000000
--- a/queue-6.8/powerpc-ps3-fix-lv1-hcall-assembly-for-elfv2-calling.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 298cf5a37d20e6632e85d62aa4fda9346e923805 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 27 Dec 2023 17:24:03 +1000
-Subject: powerpc/ps3: Fix lv1 hcall assembly for ELFv2 calling convention
-
-From: Nicholas Piggin <npiggin@gmail.com>
-
-[ Upstream commit 6735fef14c1f089ae43fd6d43add818b7ff682a8 ]
-
-Stack-passed parameters begin at a different offset in the caller's
-stack in the ELFv2 ABI.
-
-Reported-by: Geoff Levand <geoff@infradead.org>
-Fixes: 8c5fa3b5c4df ("powerpc/64: Make ELFv2 the default for big-endian builds")
-Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
-Tested-by: Geoff Levand <geoff@infradead.org>
-Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-Link: https://msgid.link/20231227072405.63751-2-npiggin@gmail.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/powerpc/include/asm/ppc_asm.h  |  6 ++++--
- arch/powerpc/platforms/ps3/hvcall.S | 18 +++++++++---------
- 2 files changed, 13 insertions(+), 11 deletions(-)
-
-diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h
-index e7792aa135105..041ee25955205 100644
---- a/arch/powerpc/include/asm/ppc_asm.h
-+++ b/arch/powerpc/include/asm/ppc_asm.h
-@@ -201,11 +201,13 @@
- 
- #ifdef CONFIG_PPC64_ELF_ABI_V2
- #define STK_GOT               24
--#define __STK_PARAM(i)        (32 + ((i)-3)*8)
-+#define STK_PARAM_AREA        32
- #else
- #define STK_GOT               40
--#define __STK_PARAM(i)        (48 + ((i)-3)*8)
-+#define STK_PARAM_AREA        48
- #endif
-+
-+#define __STK_PARAM(i)        (STK_PARAM_AREA + ((i)-3)*8)
- #define STK_PARAM(i)  __STK_PARAM(__REG_##i)
- 
- #ifdef CONFIG_PPC64_ELF_ABI_V2
-diff --git a/arch/powerpc/platforms/ps3/hvcall.S b/arch/powerpc/platforms/ps3/hvcall.S
-index 509e30ad01bb4..59ea569debf47 100644
---- a/arch/powerpc/platforms/ps3/hvcall.S
-+++ b/arch/powerpc/platforms/ps3/hvcall.S
-@@ -714,7 +714,7 @@ _GLOBAL(_##API_NAME)                               \
-       std     r4, 0(r11);                     \
-       ld      r11, -16(r1);                   \
-       std     r5, 0(r11);                     \
--      ld      r11, 48+8*8(r1);                \
-+      ld      r11, STK_PARAM_AREA+8*8(r1);    \
-       std     r6, 0(r11);                     \
-                                               \
-       ld      r0, 16(r1);                     \
-@@ -746,22 +746,22 @@ _GLOBAL(_##API_NAME)                             \
-       mflr    r0;                             \
-       std     r0, 16(r1);                     \
-                                               \
--      std     r10, 48+8*7(r1);                \
-+      std     r10, STK_PARAM_AREA+8*7(r1);    \
-                                               \
-       li      r11, API_NUMBER;                \
-       lv1call;                                \
-                                               \
--      ld      r11, 48+8*7(r1);                \
-+      ld      r11, STK_PARAM_AREA+8*7(r1);    \
-       std     r4, 0(r11);                     \
--      ld      r11, 48+8*8(r1);                \
-+      ld      r11, STK_PARAM_AREA+8*8(r1);    \
-       std     r5, 0(r11);                     \
--      ld      r11, 48+8*9(r1);                \
-+      ld      r11, STK_PARAM_AREA+8*9(r1);    \
-       std     r6, 0(r11);                     \
--      ld      r11, 48+8*10(r1);               \
-+      ld      r11, STK_PARAM_AREA+8*10(r1);   \
-       std     r7, 0(r11);                     \
--      ld      r11, 48+8*11(r1);               \
-+      ld      r11, STK_PARAM_AREA+8*11(r1);   \
-       std     r8, 0(r11);                     \
--      ld      r11, 48+8*12(r1);               \
-+      ld      r11, STK_PARAM_AREA+8*12(r1);   \
-       std     r9, 0(r11);                     \
-                                               \
-       ld      r0, 16(r1);                     \
-@@ -777,7 +777,7 @@ _GLOBAL(_##API_NAME)                               \
-       li      r11, API_NUMBER;                \
-       lv1call;                                \
-                                               \
--      ld      r11, 48+8*8(r1);                \
-+      ld      r11, STK_PARAM_AREA+8*8(r1);    \
-       std     r4, 0(r11);                     \
-                                               \
-       ld      r0, 16(r1);                     \
--- 
-2.43.0
-

diff --git a/queue-6.8/series b/queue-6.8/series
index 870d938137fe26efa0458f1e5a73504bba5fe50d..0580e759a9b07de85275b26755bfbeb81bda2d6b 100644 (file)
--- a/queue-6.8/series
+++ b/queue-6.8/series
@@ -439,7 +439,6 @@ drm-panel-boe-tv101wum-nl6-make-use-of-prepare_prev_.patch
 drm-msm-dpu-finalise-global-state-object.patch
 drm-mediatek-dsi-fix-dsi-rgb666-formats-and-definiti.patch
 pci-mark-3ware-9650se-root-port-extended-tags-as-bro.patch
-powerpc-ps3-fix-lv1-hcall-assembly-for-elfv2-calling.patch
 drm-bridge-adv7511-fix-crash-on-irq-during-probe.patch
 pinctrl-renesas-allow-the-compiler-to-optimize-away-.patch
 clk-hisilicon-hi3519-release-the-correct-number-of-g.patch