From: Greg Kroah-Hartman Date: Thu, 7 Jan 2021 13:04:43 +0000 (+0100) Subject: drop 2 s390 patches from 4.4 and 4.9 as they broke the build X-Git-Tag: v4.4.250~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7056d806e2c85d7da070a9bacc1e5b86bb1a364;p=thirdparty%2Fkernel%2Fstable-queue.git drop 2 s390 patches from 4.4 and 4.9 as they broke the build --- diff --git a/queue-4.4/s390-smp-perform-initial-cpu-reset-also-for-smt-sibl.patch b/queue-4.4/s390-smp-perform-initial-cpu-reset-also-for-smt-sibl.patch deleted file mode 100644 index 1327f993dbc..00000000000 --- a/queue-4.4/s390-smp-perform-initial-cpu-reset-also-for-smt-sibl.patch +++ /dev/null @@ -1,59 +0,0 @@ -From ed8b681de2733104b61dda3d7d8a69166d405ee6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 8 Dec 2020 07:35:21 +0100 -Subject: s390/smp: perform initial CPU reset also for SMT siblings - -From: Sven Schnelle - -[ Upstream commit b5e438ebd7e808d1d2435159ac4742e01a94b8da ] - -Not resetting the SMT siblings might leave them in unpredictable -state. One of the observed problems was that the CPU timer wasn't -reset and therefore large system time values where accounted during -CPU bringup. - -Cc: # 4.0 -Fixes: 10ad34bc76dfb ("s390: add SMT support") -Reviewed-by: Heiko Carstens -Signed-off-by: Sven Schnelle -Signed-off-by: Heiko Carstens -Signed-off-by: Sasha Levin ---- - arch/s390/kernel/smp.c | 18 +++--------------- - 1 file changed, 3 insertions(+), 15 deletions(-) - -diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c -index c941bd500765a..526927621369b 100644 ---- a/arch/s390/kernel/smp.c -+++ b/arch/s390/kernel/smp.c -@@ -843,24 +843,12 @@ static void smp_start_secondary(void *cpuvoid) - /* Upping and downing of CPUs */ - int __cpu_up(unsigned int cpu, struct task_struct *tidle) - { -- struct pcpu *pcpu; -- int base, i, rc; -+ struct pcpu *pcpu = pcpu_devices + cpu; -+ int rc; - -- pcpu = pcpu_devices + cpu; - if (pcpu->state != CPU_STATE_CONFIGURED) - return -EIO; -- base = smp_get_base_cpu(cpu); -- for (i = 0; i <= smp_cpu_mtid; i++) { -- if (base + i < nr_cpu_ids) -- if (cpu_online(base + i)) -- break; -- } -- /* -- * If this is the first CPU of the core to get online -- * do an initial CPU reset. -- */ -- if (i > smp_cpu_mtid && -- pcpu_sigp_retry(pcpu_devices + base, SIGP_INITIAL_CPU_RESET, 0) != -+ if (pcpu_sigp_retry(pcpu, SIGP_INITIAL_CPU_RESET, 0) != - SIGP_CC_ORDER_CODE_ACCEPTED) - return -EIO; - --- -2.27.0 - diff --git a/queue-4.4/s390-smp-use-smp_get_base_cpu-helper-function.patch b/queue-4.4/s390-smp-use-smp_get_base_cpu-helper-function.patch deleted file mode 100644 index 2f99202dbd9..00000000000 --- a/queue-4.4/s390-smp-use-smp_get_base_cpu-helper-function.patch +++ /dev/null @@ -1,41 +0,0 @@ -From dbcde903799671b0c171e0450733faaf11dc66ad Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 5 Dec 2016 21:18:58 +0100 -Subject: s390/smp: use smp_get_base_cpu() helper function - -From: Heiko Carstens - -[ Upstream commit 5423145f8c4e885c640d12adc35c421127ed015f ] - -Signed-off-by: Heiko Carstens -Signed-off-by: Martin Schwidefsky -Signed-off-by: Sasha Levin ---- - arch/s390/kernel/smp.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c -index f113fcd781d87..c941bd500765a 100644 ---- a/arch/s390/kernel/smp.c -+++ b/arch/s390/kernel/smp.c -@@ -849,7 +849,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle) - pcpu = pcpu_devices + cpu; - if (pcpu->state != CPU_STATE_CONFIGURED) - return -EIO; -- base = cpu - (cpu % (smp_cpu_mtid + 1)); -+ base = smp_get_base_cpu(cpu); - for (i = 0; i <= smp_cpu_mtid; i++) { - if (base + i < nr_cpu_ids) - if (cpu_online(base + i)) -@@ -1018,7 +1018,7 @@ static ssize_t cpu_configure_store(struct device *dev, - rc = -EBUSY; - /* disallow configuration changes of online cpus and cpu 0 */ - cpu = dev->id; -- cpu -= cpu % (smp_cpu_mtid + 1); -+ cpu = smp_get_base_cpu(cpu); - if (cpu == 0) - goto out; - for (i = 0; i <= smp_cpu_mtid; i++) --- -2.27.0 - diff --git a/queue-4.4/series b/queue-4.4/series index 88deca66e83..b0bfdeae8da 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -4,8 +4,6 @@ alsa-usb-audio-fix-sync-ep-altsetting-sanity-check.patch alsa-hda-realtek-support-dell-headset-mode-for-alc3271.patch alsa-hda-fix-a-wrong-fixup-for-alc289-on-dell-machines.patch alsa-hda-realtek-dell-headphone-has-noise-on-unmute-for-alc236.patch -s390-smp-use-smp_get_base_cpu-helper-function.patch -s390-smp-perform-initial-cpu-reset-also-for-smt-sibl.patch s390-dasd-fix-hanging-device-offline-processing.patch usb-serial-digi_acceleport-fix-write-wakeup-deadlock.patch uapi-move-constants-from-linux-kernel.h-to-linux-const.h.patch diff --git a/queue-4.9/s390-smp-perform-initial-cpu-reset-also-for-smt-sibl.patch b/queue-4.9/s390-smp-perform-initial-cpu-reset-also-for-smt-sibl.patch deleted file mode 100644 index 68f196a18b7..00000000000 --- a/queue-4.9/s390-smp-perform-initial-cpu-reset-also-for-smt-sibl.patch +++ /dev/null @@ -1,59 +0,0 @@ -From a4a0c23eb002561ef3e233df83939c93126d2cbf Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 8 Dec 2020 07:35:21 +0100 -Subject: s390/smp: perform initial CPU reset also for SMT siblings - -From: Sven Schnelle - -[ Upstream commit b5e438ebd7e808d1d2435159ac4742e01a94b8da ] - -Not resetting the SMT siblings might leave them in unpredictable -state. One of the observed problems was that the CPU timer wasn't -reset and therefore large system time values where accounted during -CPU bringup. - -Cc: # 4.0 -Fixes: 10ad34bc76dfb ("s390: add SMT support") -Reviewed-by: Heiko Carstens -Signed-off-by: Sven Schnelle -Signed-off-by: Heiko Carstens -Signed-off-by: Sasha Levin ---- - arch/s390/kernel/smp.c | 18 +++--------------- - 1 file changed, 3 insertions(+), 15 deletions(-) - -diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c -index 92db0c92eb829..71fcf6d693c11 100644 ---- a/arch/s390/kernel/smp.c -+++ b/arch/s390/kernel/smp.c -@@ -832,24 +832,12 @@ static void smp_start_secondary(void *cpuvoid) - /* Upping and downing of CPUs */ - int __cpu_up(unsigned int cpu, struct task_struct *tidle) - { -- struct pcpu *pcpu; -- int base, i, rc; -+ struct pcpu *pcpu = pcpu_devices + cpu; -+ int rc; - -- pcpu = pcpu_devices + cpu; - if (pcpu->state != CPU_STATE_CONFIGURED) - return -EIO; -- base = smp_get_base_cpu(cpu); -- for (i = 0; i <= smp_cpu_mtid; i++) { -- if (base + i < nr_cpu_ids) -- if (cpu_online(base + i)) -- break; -- } -- /* -- * If this is the first CPU of the core to get online -- * do an initial CPU reset. -- */ -- if (i > smp_cpu_mtid && -- pcpu_sigp_retry(pcpu_devices + base, SIGP_INITIAL_CPU_RESET, 0) != -+ if (pcpu_sigp_retry(pcpu, SIGP_INITIAL_CPU_RESET, 0) != - SIGP_CC_ORDER_CODE_ACCEPTED) - return -EIO; - --- -2.27.0 - diff --git a/queue-4.9/s390-smp-use-smp_get_base_cpu-helper-function.patch b/queue-4.9/s390-smp-use-smp_get_base_cpu-helper-function.patch deleted file mode 100644 index b5020148213..00000000000 --- a/queue-4.9/s390-smp-use-smp_get_base_cpu-helper-function.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6508b19fff5cb315371adaf904ffb9d47754f6ae Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 5 Dec 2016 21:18:58 +0100 -Subject: s390/smp: use smp_get_base_cpu() helper function - -From: Heiko Carstens - -[ Upstream commit 5423145f8c4e885c640d12adc35c421127ed015f ] - -Signed-off-by: Heiko Carstens -Signed-off-by: Martin Schwidefsky -Signed-off-by: Sasha Levin ---- - arch/s390/kernel/smp.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c -index cba8e56cd63db..92db0c92eb829 100644 ---- a/arch/s390/kernel/smp.c -+++ b/arch/s390/kernel/smp.c -@@ -838,7 +838,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle) - pcpu = pcpu_devices + cpu; - if (pcpu->state != CPU_STATE_CONFIGURED) - return -EIO; -- base = cpu - (cpu % (smp_cpu_mtid + 1)); -+ base = smp_get_base_cpu(cpu); - for (i = 0; i <= smp_cpu_mtid; i++) { - if (base + i < nr_cpu_ids) - if (cpu_online(base + i)) -@@ -1005,7 +1005,7 @@ static ssize_t cpu_configure_store(struct device *dev, - rc = -EBUSY; - /* disallow configuration changes of online cpus and cpu 0 */ - cpu = dev->id; -- cpu -= cpu % (smp_cpu_mtid + 1); -+ cpu = smp_get_base_cpu(cpu); - if (cpu == 0) - goto out; - for (i = 0; i <= smp_cpu_mtid; i++) --- -2.27.0 - diff --git a/queue-4.9/series b/queue-4.9/series index 63ffc99e706..5b86615fc27 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -6,8 +6,6 @@ alsa-hda-realtek-support-dell-headset-mode-for-alc3271.patch alsa-hda-fix-a-wrong-fixup-for-alc289-on-dell-machines.patch alsa-hda-realtek-dell-headphone-has-noise-on-unmute-for-alc236.patch vfio-pci-move-dummy_resources_list-init-in-vfio_pci_.patch -s390-smp-use-smp_get_base_cpu-helper-function.patch -s390-smp-perform-initial-cpu-reset-also-for-smt-sibl.patch s390-dasd-fix-hanging-device-offline-processing.patch usb-serial-digi_acceleport-fix-write-wakeup-deadlock.patch net-ipv6-keep-sk-status-consistent-after-datagram-connect-failure.patch