aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/crtsavres-fixups-for-5.4.patch27
-rw-r--r--arch/powerpc/powerpc-Add-unwind-information-for-SPE-registers-of-.patch73
-rw-r--r--arch/powerpc/powerpc-Disable-attribute-alias-warnings-from-gcc8.patch32
-rw-r--r--arch/powerpc/powerpc-add-crtsavres.o-to-archprepare-for-kbuild.patch38
-rw-r--r--arch/powerpc/powerpc-debug.cfg1
-rw-r--r--arch/powerpc/powerpc-debug.scc3
-rw-r--r--arch/powerpc/powerpc-kexec-fix-for-powerpc64.patch30
-rw-r--r--arch/powerpc/powerpc-ptrace-Disable-array-bounds-warning-with-gcc.patch29
-rw-r--r--arch/powerpc/powerpc.scc6
9 files changed, 4 insertions, 235 deletions
diff --git a/arch/powerpc/crtsavres-fixups-for-5.4.patch b/arch/powerpc/crtsavres-fixups-for-5.4.patch
deleted file mode 100644
index e3f09715..00000000
--- a/arch/powerpc/crtsavres-fixups-for-5.4.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f103dbd2b479057481bef2bc21060e05304be15e Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@gmail.com>
-Date: Tue, 15 Oct 2019 22:55:17 -0400
-Subject: [PATCH] crtsavres: fixups for 5.4+
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
----
- arch/powerpc/Makefile | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
-index c76c406faa59..7471b0160e84 100644
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -416,6 +416,9 @@ endif
- archclean:
- $(Q)$(MAKE) $(clean)=$(boot)
-
-+arch/powerpc/lib/crtsavres.o: arch/powerpc/lib/crtsavres.S
-+ $(Q)$(MAKE) $(build)=arch/powerpc/lib arch/powerpc/lib/crtsavres.o
-+
- archprepare: checkbin arch/powerpc/lib/crtsavres.o
-
- archheaders:
---
-2.19.1
-
diff --git a/arch/powerpc/powerpc-Add-unwind-information-for-SPE-registers-of-.patch b/arch/powerpc/powerpc-Add-unwind-information-for-SPE-registers-of-.patch
deleted file mode 100644
index a6b43fd4..00000000
--- a/arch/powerpc/powerpc-Add-unwind-information-for-SPE-registers-of-.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 87398e3c68b21d06817c44ca39449ef382d2ce31 Mon Sep 17 00:00:00 2001
-From: Liming Wang <liming.wang@windriver.com>
-Date: Fri, 19 Dec 2008 11:16:39 +0800
-Subject: [PATCH 1/3] powerpc: Add unwind information for SPE registers of E500 core
-
-SPE registers use the high part bit0~bit31 of E500 GPR0~GPR31.
-The unwind information in "eh_frame" section is used during exception
-handling and describes register information in the signal frame. But
-current unwind information doesn't cover SPE registers, which have
-been saved in the signal frame. This patch adds this unwind information
-to "eh_frame" section.
-
-SPE registers use register number 1200+N to identify register 'N', but
-they start from 113 in unwind column, which is computed from gcc
-source code, macro DWARF_REG_TO_UNWIND_COLUMN:
-
- #define FIRST_PSEUDO_REGISTER 114
- #define DWARF_REG_TO_UNWIND_COLUMN(r) \
- ((r) > 1200 ? ((r) - 1200 + FIRST_PSEUDO_REGISTER - 1) : (r))
-
-Signed-off-by: Liming Wang <liming.wang@windriver.com>
----
- arch/powerpc/kernel/vdso32/sigtramp.S | 34 +++++++++++++++++++++++++++++++++
- 1 files changed, 34 insertions(+), 0 deletions(-)
-
-diff --git a/arch/powerpc/kernel/vdso32/sigtramp.S b/arch/powerpc/kernel/vdso32/sigtramp.S
-index 68d49dd..789a343 100644
---- a/arch/powerpc/kernel/vdso32/sigtramp.S
-+++ b/arch/powerpc/kernel/vdso32/sigtramp.S
-@@ -251,6 +251,40 @@ V_FUNCTION_END(__kernel_sigtramp_rt32)
- vsave_msr1 (31); \
- vsave_msr2 (33, 32*16+12); \
- vsave (32, 32*16)
-+#elif defined(CONFIG_SPE)
-+#define EH_FRAME_VMX \
-+ rsave (113, VREGS); \
-+ rsave (114, VREGS + 1*4); \
-+ rsave (115, VREGS + 2*4); \
-+ rsave (116, VREGS + 3*4); \
-+ rsave (117, VREGS + 4*4); \
-+ rsave (118, VREGS + 5*4); \
-+ rsave (119, VREGS + 6*4); \
-+ rsave (120, VREGS + 7*4); \
-+ rsave (121, VREGS + 8*4); \
-+ rsave (122, VREGS + 9*4); \
-+ rsave (123, VREGS + 10*4); \
-+ rsave (124, VREGS + 11*4); \
-+ rsave (125, VREGS + 12*4); \
-+ rsave (126, VREGS + 13*4); \
-+ rsave (127, VREGS + 14*4); \
-+ rsave (128, VREGS + 15*4); \
-+ rsave (129, VREGS + 16*4); \
-+ rsave (130, VREGS + 17*4); \
-+ rsave (131, VREGS + 18*4); \
-+ rsave (132, VREGS + 19*4); \
-+ rsave (133, VREGS + 20*4); \
-+ rsave (134, VREGS + 21*4); \
-+ rsave (135, VREGS + 22*4); \
-+ rsave (136, VREGS + 23*4); \
-+ rsave (137, VREGS + 24*4); \
-+ rsave (138, VREGS + 25*4); \
-+ rsave (139, VREGS + 26*4); \
-+ rsave (140, VREGS + 27*4); \
-+ rsave (141, VREGS + 28*4); \
-+ rsave (142, VREGS + 29*4); \
-+ rsave (143, VREGS + 30*4); \
-+ rsave (144, VREGS + 31*4);
- #else
- #define EH_FRAME_VMX
- #endif
---
-1.6.5.2
-
diff --git a/arch/powerpc/powerpc-Disable-attribute-alias-warnings-from-gcc8.patch b/arch/powerpc/powerpc-Disable-attribute-alias-warnings-from-gcc8.patch
deleted file mode 100644
index 2e93b857..00000000
--- a/arch/powerpc/powerpc-Disable-attribute-alias-warnings-from-gcc8.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 59e401ffeda487d9b3bd092199ec9a98faf5abfe Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 4 May 2018 09:46:42 -0700
-Subject: [PATCH 1/2] powerpc: Disable attribute-alias warnings from gcc8
-
-Fixes
-alias between functions of incompatible types warnings
-which are new with gcc8
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
----
- arch/powerpc/kernel/Makefile | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
-index 1b6bc7fba996..7fab5ab9edc2 100644
---- a/arch/powerpc/kernel/Makefile
-+++ b/arch/powerpc/kernel/Makefile
-@@ -3,7 +3,8 @@
- # Makefile for the linux kernel.
- #
-
--CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"'
-+CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' $(call cc-disable-warning, attribute-alias)
-+CFLAGS_syscalls.o += $(call cc-disable-warning, attribute-alias)
-
- subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror
-
---
-2.5.0
-
diff --git a/arch/powerpc/powerpc-add-crtsavres.o-to-archprepare-for-kbuild.patch b/arch/powerpc/powerpc-add-crtsavres.o-to-archprepare-for-kbuild.patch
deleted file mode 100644
index 27119879..00000000
--- a/arch/powerpc/powerpc-add-crtsavres.o-to-archprepare-for-kbuild.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f13fd6af4120b8b42d77377c9989457cda41899f Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@windriver.com>
-Date: Sun, 15 Feb 2009 16:57:14 -0500
-Subject: [PATCH 3/3] powerpc: add crtsavres.o to archprepare for kbuild
-
-upstream commit da3de6df33f5f42ff9dc40093fbc884f524c9a49 adds
-a dependency to all kernel modules to crtsavres. This
-ensures that out-of-line register saves/restores work when
-CONFIG_CC_OPTIMIZE_FOR_SIZE is enabled.
-
-What it didn't do was ensure that it was built when
-modules_prepare was run and hence out of tree powerpc kernel
-modules can't properly link.
-
-The fix is to add crtsavres.o to the archprepare rule in
-the arch/powerpc/Makefile
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
----
- arch/powerpc/Makefile | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
-index c3811ab..ad16ff3 100644
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -218,7 +218,7 @@ endif
- archclean:
- $(Q)$(MAKE) $(clean)=$(boot)
-
--archprepare: checkbin
-+archprepare: checkbin arch/powerpc/lib/crtsavres.o
-
- # Use the file '.tmp_gas_check' for binutils tests, as gas won't output
- # to stdout and these checks are run even on install targets.
---
-1.6.5.2
-
diff --git a/arch/powerpc/powerpc-debug.cfg b/arch/powerpc/powerpc-debug.cfg
new file mode 100644
index 00000000..6ea12a12
--- /dev/null
+++ b/arch/powerpc/powerpc-debug.cfg
@@ -0,0 +1 @@
+CONFIG_PPC_DISABLE_WERROR=y
diff --git a/arch/powerpc/powerpc-debug.scc b/arch/powerpc/powerpc-debug.scc
new file mode 100644
index 00000000..aedb597c
--- /dev/null
+++ b/arch/powerpc/powerpc-debug.scc
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: MIT
+
+kconf non-hardware powerpc-debug.cfg
diff --git a/arch/powerpc/powerpc-kexec-fix-for-powerpc64.patch b/arch/powerpc/powerpc-kexec-fix-for-powerpc64.patch
deleted file mode 100644
index d979885a..00000000
--- a/arch/powerpc/powerpc-kexec-fix-for-powerpc64.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 85388aad8ca15fcc28f5d0989265217351bada19 Mon Sep 17 00:00:00 2001
-From: Benjamin Walsh <benjamin.walsh@windriver.com>
-Date: Mon, 9 Feb 2009 14:25:47 -0500
-Subject: [PATCH] powerpc: kexec fix for powerpc64
-
-slbia instruction invalidates the SLB, but there was a hang on the first
-instruction that caused an SLB miss exception. Doing a full sync after
-the slbia causes the SLB to be in a consistent state for the handling of
-the SLB exception.
-
-Signed-off by: Benjamin Walsh <benjamin.walsh@windriver.com>
----
- arch/powerpc/mm/book3s64/slb.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/powerpc/mm/book3s64/slb.c b/arch/powerpc/mm/book3s64/slb.c
-index 515730e499fe..7a8b335003b6 100644
---- a/arch/powerpc/mm/book3s64/slb.c
-+++ b/arch/powerpc/mm/book3s64/slb.c
-@@ -331,6 +331,7 @@ void slb_initialize(void)
- asm volatile("isync":::"memory");
- asm volatile("slbmte %0,%0"::"r" (0) : "memory");
- asm volatile("isync; slbia; isync":::"memory");
-+ mb();
- create_shadowed_slbe(PAGE_OFFSET, mmu_kernel_ssize, lflags, LINEAR_INDEX);
- create_shadowed_slbe(VMALLOC_START, mmu_kernel_ssize, vflags, VMALLOC_INDEX);
-
---
-2.1.0
-
diff --git a/arch/powerpc/powerpc-ptrace-Disable-array-bounds-warning-with-gcc.patch b/arch/powerpc/powerpc-ptrace-Disable-array-bounds-warning-with-gcc.patch
deleted file mode 100644
index 6033c020..00000000
--- a/arch/powerpc/powerpc-ptrace-Disable-array-bounds-warning-with-gcc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8632f470f02c70d9501ae21f57740ea23c14773f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 4 May 2018 09:50:05 -0700
-Subject: [PATCH 2/2] powerpc/ptrace: Disable array-bounds warning with gcc8
-
-This masks the new gcc8 warning
-include/linux/regset.h:270:4: error: 'memcpy' offset [-527, -529] is out of the bounds [0, 16] of object 'vrsave' with type 'union <anonymous>'
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
----
- arch/powerpc/kernel/Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
-index 7fab5ab9edc2..601118b43545 100644
---- a/arch/powerpc/kernel/Makefile
-+++ b/arch/powerpc/kernel/Makefile
-@@ -4,6 +4,7 @@
- #
-
- CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' $(call cc-disable-warning, attribute-alias)
-+CFLAGS_ptrace.o += $(call cc-disable-warning, array-bounds)
- CFLAGS_syscalls.o += $(call cc-disable-warning, attribute-alias)
-
- subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror
---
-2.5.0
-
diff --git a/arch/powerpc/powerpc.scc b/arch/powerpc/powerpc.scc
index d3f7e2fb..548d2d44 100644
--- a/arch/powerpc/powerpc.scc
+++ b/arch/powerpc/powerpc.scc
@@ -1,7 +1 @@
# SPDX-License-Identifier: MIT
-patch powerpc-Add-unwind-information-for-SPE-registers-of-.patch
-patch powerpc-kexec-fix-for-powerpc64.patch
-patch powerpc-add-crtsavres.o-to-archprepare-for-kbuild.patch
-patch powerpc-Disable-attribute-alias-warnings-from-gcc8.patch
-patch powerpc-ptrace-Disable-array-bounds-warning-with-gcc.patch
-patch crtsavres-fixups-for-5.4.patch