From: Greg Kroah-Hartman Date: Wed, 13 Jul 2016 22:47:33 +0000 (+0900) Subject: 4.4-stable patches X-Git-Tag: v4.6.5~21 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff29988cabd5abf3264c709dd6404c24bd79437c;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: arcv2-check-for-ll-sc-livelock-only-if-llsc-is-enabled.patch arcv2-llsc-software-backoff-is-not-needed-starting-hs2.1c.patch --- diff --git a/queue-4.4/arcv2-check-for-ll-sc-livelock-only-if-llsc-is-enabled.patch b/queue-4.4/arcv2-check-for-ll-sc-livelock-only-if-llsc-is-enabled.patch new file mode 100644 index 00000000000..97d544f7915 --- /dev/null +++ b/queue-4.4/arcv2-check-for-ll-sc-livelock-only-if-llsc-is-enabled.patch @@ -0,0 +1,26 @@ +From 4d0cb15fccd1db9dac0c964b2ccf10874e69f5b8 Mon Sep 17 00:00:00 2001 +From: Vineet Gupta +Date: Fri, 29 Jan 2016 16:47:44 +0530 +Subject: ARCv2: Check for LL-SC livelock only if LLSC is enabled + +From: Vineet Gupta + +commit 4d0cb15fccd1db9dac0c964b2ccf10874e69f5b8 upstream. + +Signed-off-by: Vineet Gupta +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arc/kernel/setup.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arc/kernel/setup.c ++++ b/arch/arc/kernel/setup.c +@@ -334,6 +334,7 @@ static void arc_chk_core_config(void) + panic("FPU non-existent, disable CONFIG_ARC_FPU_SAVE_RESTORE\n"); + + if (is_isa_arcv2() && IS_ENABLED(CONFIG_SMP) && cpu->isa.atomic && ++ IS_ENABLED(CONFIG_ARC_HAS_LLSC) && + !IS_ENABLED(CONFIG_ARC_STAR_9000923308)) + panic("llock/scond livelock workaround missing\n"); + } diff --git a/queue-4.4/arcv2-llsc-software-backoff-is-not-needed-starting-hs2.1c.patch b/queue-4.4/arcv2-llsc-software-backoff-is-not-needed-starting-hs2.1c.patch new file mode 100644 index 00000000000..44d6478e2dd --- /dev/null +++ b/queue-4.4/arcv2-llsc-software-backoff-is-not-needed-starting-hs2.1c.patch @@ -0,0 +1,42 @@ +From b31ac42697bef4a3aa5d0aa42375a55657f57174 Mon Sep 17 00:00:00 2001 +From: Vineet Gupta +Date: Tue, 15 Mar 2016 11:36:43 +0530 +Subject: ARCv2: LLSC: software backoff is NOT needed starting HS2.1c + +From: Vineet Gupta + +commit b31ac42697bef4a3aa5d0aa42375a55657f57174 upstream. + +Signed-off-by: Vineet Gupta +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arc/Kconfig | 2 +- + arch/arc/kernel/setup.c | 5 ----- + 2 files changed, 1 insertion(+), 6 deletions(-) + +--- a/arch/arc/Kconfig ++++ b/arch/arc/Kconfig +@@ -387,7 +387,7 @@ config ARC_HAS_LLSC + + config ARC_STAR_9000923308 + bool "Workaround for llock/scond livelock" +- default y ++ default n + depends on ISA_ARCV2 && SMP && ARC_HAS_LLSC + + config ARC_HAS_SWAPE +--- a/arch/arc/kernel/setup.c ++++ b/arch/arc/kernel/setup.c +@@ -332,11 +332,6 @@ static void arc_chk_core_config(void) + pr_warn("CONFIG_ARC_FPU_SAVE_RESTORE needed for working apps\n"); + else if (!cpu->extn.fpu_dp && fpu_enabled) + panic("FPU non-existent, disable CONFIG_ARC_FPU_SAVE_RESTORE\n"); +- +- if (is_isa_arcv2() && IS_ENABLED(CONFIG_SMP) && cpu->isa.atomic && +- IS_ENABLED(CONFIG_ARC_HAS_LLSC) && +- !IS_ENABLED(CONFIG_ARC_STAR_9000923308)) +- panic("llock/scond livelock workaround missing\n"); + } + + /* diff --git a/queue-4.4/series b/queue-4.4/series index eda4d4a3676..7ac627d7f66 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -45,3 +45,5 @@ packet-use-symmetric-hash-for-packet_fanout_hash.patch net_sched-fix-mirrored-packets-checksum.patch cdc_ncm-workaround-for-em7455-silent-data-interface.patch ipv6-fix-mem-leak-in-rt6i_pcpu.patch +arcv2-check-for-ll-sc-livelock-only-if-llsc-is-enabled.patch +arcv2-llsc-software-backoff-is-not-needed-starting-hs2.1c.patch