main/linux-lts: restore stackprotector on ppc64le, defang stackprotector check

4 files changed, 51 insertions, 10 deletions

diff --git a/main/linux-lts/0001-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch b/main/linux-lts/0001-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
index c95fc026a5..3153ba69b5 100644
--- a/main/linux-lts/0001-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
+++ b/main/linux-lts/0001-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
@@ -1,7 +1,7 @@
-From 3d91696e92a354b7e23402ad9f38329f8853dde7 Mon Sep 17 00:00:00 2001
+From 20edf591530b4cdb219a753c166afa315c3706b8 Mon Sep 17 00:00:00 2001
 From: Chris Wilson <chris@chris-wilson.co.uk>
 Date: Mon, 9 Dec 2019 02:32:15 +0000
-Subject: [PATCH] drm/i915/gt: Detect if we miss WaIdleLiteRestore
+Subject: [PATCH 1/2] drm/i915/gt: Detect if we miss WaIdleLiteRestore
 
 In order to avoid confusing the HW, we must never submit an empty ring
 during lite-restore, that is we should always advance the RING_TAIL
@@ -43,7 +43,7 @@ Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
  1 file changed, 20 insertions(+), 24 deletions(-)
 
 diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
-index 4949b5ad860f..3ceaa4d70c5b 100644
+index 06a506c29463..d2bb446cf97c 100644
 --- a/drivers/gpu/drm/i915/gt/intel_lrc.c
 +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
 @@ -471,12 +471,6 @@ lrc_descriptor(struct intel_context *ce, struct intel_engine_cs *engine)
@@ -72,7 +72,7 @@ index 4949b5ad860f..3ceaa4d70c5b 100644
  
  		/*
  		 * Push the request back into the queue for later resubmission.
-@@ -650,13 +642,29 @@ execlists_schedule_out(struct i915_request *rq)
+@@ -649,13 +641,29 @@ execlists_schedule_out(struct i915_request *rq)
  	i915_request_put(rq);
  }
  
@@ -106,7 +106,7 @@ index 4949b5ad860f..3ceaa4d70c5b 100644
  
  	/*
  	 * Make sure the context image is complete before we submit it to HW.
-@@ -675,9 +683,7 @@ static u64 execlists_update_context(const struct i915_request *rq)
+@@ -674,9 +682,7 @@ static u64 execlists_update_context(const struct i915_request *rq)
  	 */
  	mb();
  
@@ -116,7 +116,7 @@ index 4949b5ad860f..3ceaa4d70c5b 100644
  	return desc;
  }
  
-@@ -1150,16 +1156,6 @@ static void execlists_dequeue(struct intel_engine_cs *engine)
+@@ -1149,16 +1155,6 @@ static void execlists_dequeue(struct intel_engine_cs *engine)
  			if (!list_is_last(&last->sched.link,
  					  &engine->active.requests))
  				return;
@@ -134,5 +134,5 @@ index 4949b5ad860f..3ceaa4d70c5b 100644
  	}
  
 -- 
-2.25.0
+2.24.0
 
diff --git a/main/linux-lts/0002-powerpc-config-defang-gcc-check-for-stack-protector-.patch b/main/linux-lts/0002-powerpc-config-defang-gcc-check-for-stack-protector-.patch
new file mode 100644
index 0000000000..8c72faeffd
--- /dev/null
+++ b/main/linux-lts/0002-powerpc-config-defang-gcc-check-for-stack-protector-.patch
@@ -0,0 +1,35 @@
+From 4639a92dc56793b596f3a9ae0ec1a60d67a617f5 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Tue, 18 Feb 2020 21:10:22 +0000
+Subject: [PATCH 2/2] powerpc: config: defang gcc check for stack-protector
+ support
+
+When we rebase kernel configs in Alpine, it is common to do so from
+an environment where CARCH does not match CHOST.
+
+Accordingly, we assume that the gcc check will always pass, and
+simply remove it in preference for always enabling the
+HAVE_STACKPROTECTOR config option.
+
+Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
+---
+ arch/powerpc/Kconfig | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
+index 3e56c9c2f16e..f0b7d77aaef1 100644
+--- a/arch/powerpc/Kconfig
++++ b/arch/powerpc/Kconfig
+@@ -181,8 +181,7 @@ config PPC
+ 	select HAVE_ASM_MODVERSIONS
+ 	select HAVE_C_RECORDMCOUNT
+ 	select HAVE_CBPF_JIT			if !PPC64
+-	select HAVE_STACKPROTECTOR		if PPC64 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r13)
+-	select HAVE_STACKPROTECTOR		if PPC32 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r2)
++	select HAVE_STACKPROTECTOR
+ 	select HAVE_CONTEXT_TRACKING		if PPC64
+ 	select HAVE_COPY_THREAD_TLS
+ 	select HAVE_DEBUG_KMEMLEAK
+-- 
+2.24.0
+
diff --git a/main/linux-lts/APKBUILD b/main/linux-lts/APKBUILD
index f6171b440d..297cd3c707 100644
--- a/main/linux-lts/APKBUILD
+++ b/main/linux-lts/APKBUILD
@@ -7,7 +7,7 @@ case $pkgver in
 	*.*.*)	_kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=0
+pkgrel=1
 pkgdesc="Linux lts kernel"
 url="https://www.kernel.org"
 depends="mkinitfs"
@@ -19,6 +19,8 @@ _config=${config:-config-lts.${CARCH}}
 install=
 source="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz
 	0001-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
+	0002-powerpc-config-defang-gcc-check-for-stack-protector-.patch
+
 	config-lts.aarch64
 	config-lts.armv7
 	config-lts.x86
@@ -220,12 +222,13 @@ _dev() {
 }
 
 sha512sums="9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f  linux-5.4.tar.xz
-dc0acb47b68c60bede649524fd7429b888df2e1aa16a93f445700d1ffacada8b870a4a75d6aeb33d0e2f2c427efbc80e24a3670c5c539e0fca5b754e7f2a4df3  0001-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
+2d34be0a07a04db3d9c044cd188aa60b5acd15ebf04fe6e8dbfe6dca013a0790cd62ef5b02c960901e41aeb3d8f71c365b6903c496a0be6fc8b508cdc82d2c31  0001-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
+d19365fe94431008768c96a2c88955652f70b6df6677457ee55ee95246a64fdd2c6fed9b3bef37c29075178294a7fc91f148ead636382530ebfa822be4ad8c2f  0002-powerpc-config-defang-gcc-check-for-stack-protector-.patch
 5c48a256d1adc6b1fd21538fa876e4de7f8ca773c358295ce4497b9c11c5b875db705fb9e9af2e6c00d92b35eb68118999de33711f57850a3be674eb10c421c7  config-lts.aarch64
 c2e4f6d514d151062f79132fd62b9302fa5276ad7bf363a74d58c2308eca8e10ea3fa61b6bc7126c3fe915f8786a0d72309836e3cce3ac5ed3af1abe5deae913  config-lts.armv7
 6027c14aac769ddee8d81be17c84f7f647f929ea86c7428a52d3eef6efa54887f6bc80df465bd65d9c9c45efd97a286818197738c6b6cfa2f0f9cfbe3bfa2544  config-lts.x86
 03f205f2b4a7b5307f8a117e8f3241546c35948729b9b18043d295544f5f22e7475863f8c7d86f65786425fe7fd17b4dfbb74187c8b4cf9335ef56c1a16668b2  config-lts.x86_64
-ca38fbc60fcc60cd1ed13ff52e740b092864c2114142ea5b6739d824ddcf9326461c27a534d449c7e01d904bb4ee9be535bd8ba016a6c41284e4b7c82a5332ab  config-lts.ppc64le
+1045867a211bc2f5a108b5b934ae7a5018e709b5f87a7ebbc3de5c2548728d6034d74e15870fa701ccf4acb4878b430bcb6651f21a0e48a2a78d85eddc902ee1  config-lts.ppc64le
 aa915216ff7df23a96dcb3fdcbfd618d3ceb36a96f8d4157e2add36a7ace615dac68c023174b5f18cfc38715b7e0c2e2b333976827a7baa0df3563151a14254a  config-lts.s390x
 dfd051bb14cd57b96dc64ee8a14ca86edc871d361e4c23936cc7a86afc88e27a11c2223afe4cafb120476632918c46bf407aea2de4afe3891d418927b2271bbe  config-lts.mips64
 3f2c9787b5bc94ef84458a4a688071c3bf7cdab2f199a0c5809f99e3befefb9d804040b5d6ea9963c92e286162cc9a6cd1c98ac410e31a3cf1d93233eb3557f6  config-virt.aarch64
diff --git a/main/linux-lts/config-lts.ppc64le b/main/linux-lts/config-lts.ppc64le
index e1f2c72674..8f63420989 100644
--- a/main/linux-lts/config-lts.ppc64le
+++ b/main/linux-lts/config-lts.ppc64le
@@ -536,7 +536,10 @@ CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_STACKPROTECTOR=y
 CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y
 CONFIG_ARCH_HAS_SCALED_CPUTIME=y