From e270d437828119e387ae04923b532f0cd38ada4a Mon Sep 17 00:00:00 2001 From: WaterByWind Date: Wed, 27 Mar 2019 14:28:21 -0400 Subject: [PATCH 1/2] Replace SUN50I_A64_UNSTABLE_TIMER with SUN50I_ERRATUM_UNKNOWN1 Update SUN50I_A64_UNSTABLE_TIMER to match new upstream commit using SUN50I_ERRATUM_UNKNOWN1 --- config/kernel/linux-sunxi64-dev.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/kernel/linux-sunxi64-dev.config b/config/kernel/linux-sunxi64-dev.config index 860a6547e9..b248653b74 100644 --- a/config/kernel/linux-sunxi64-dev.config +++ b/config/kernel/linux-sunxi64-dev.config @@ -5010,7 +5010,7 @@ CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y CONFIG_FSL_ERRATUM_A008585=y # CONFIG_HISILICON_ERRATUM_161010101 is not set # CONFIG_ARM64_ERRATUM_858921 is not set -CONFIG_SUN50I_A64_UNSTABLE_TIMER=y +CONFIG_SUN50I_ERRATUM_UNKNOWN1=y # CONFIG_ARM_TIMER_SP804 is not set CONFIG_MAILBOX=y CONFIG_ARM_MHU=y From efff71ba4fe5273f92e0a9a500bac80a4a11efc4 Mon Sep 17 00:00:00 2001 From: WaterByWind Date: Thu, 28 Mar 2019 21:34:14 -0400 Subject: [PATCH 2/2] Update patch/kernel/sunxi-dev/0001-arm64-dts-allwinner-a64-Enable-A64-timer-workaround.patch Updated DT patch for allwinner unstable timer Replace previous patch for DT timer node with new patch from upstream commit. This matches the upstream change to the actual workaround in drivers/clocksource/arm_arch_timer.c via commit c950ca8c35eeb32224a63adc47e12f9e226da241 --- ...inner-a64-Enable-A64-timer-workaround.patch} | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) rename patch/kernel/sunxi-dev/{0082-arm64-dts-allwinner-a64-Enable-A64-timer-workaround.patch => 0001-arm64-dts-allwinner-a64-Enable-A64-timer-workaround.patch} (66%) diff --git a/patch/kernel/sunxi-dev/0082-arm64-dts-allwinner-a64-Enable-A64-timer-workaround.patch b/patch/kernel/sunxi-dev/0001-arm64-dts-allwinner-a64-Enable-A64-timer-workaround.patch similarity index 66% rename from patch/kernel/sunxi-dev/0082-arm64-dts-allwinner-a64-Enable-A64-timer-workaround.patch rename to patch/kernel/sunxi-dev/0001-arm64-dts-allwinner-a64-Enable-A64-timer-workaround.patch index f87b1419da..9a3d73933f 100644 --- a/patch/kernel/sunxi-dev/0082-arm64-dts-allwinner-a64-Enable-A64-timer-workaround.patch +++ b/patch/kernel/sunxi-dev/0001-arm64-dts-allwinner-a64-Enable-A64-timer-workaround.patch @@ -1,30 +1,31 @@ -From a740ecc40aa9df18fbfb12925c1b7600c043a3cd Mon Sep 17 00:00:00 2001 +From 55ec26d6a4241363fa94f15377ebd8f1116fbfd7 Mon Sep 17 00:00:00 2001 From: Samuel Holland -Date: Thu, 10 May 2018 21:27:51 -0500 -Subject: [PATCH 082/146] arm64: dts: allwinner: a64: Enable A64 timer - workaround +Date: Sat, 12 Jan 2019 20:17:19 -0600 +Subject: [PATCH] arm64: dts: allwinner: a64: Enable A64 timer workaround As instability in the architectural timer has been observed on multiple devices using this SoC, inluding the Pine64 and the Orange Pi Win, enable the workaround in the SoC's device tree. +Acked-by: Maxime Ripard Signed-off-by: Samuel Holland +Signed-off-by: Chen-Yu Tsai --- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi -index 62b880f68d6a..73f7e69755f8 100644 +index bf9b719481c4..8171c0a7f265 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi -@@ -281,6 +281,7 @@ +@@ -200,6 +200,7 @@ timer { compatible = "arm,armv8-timer"; -+ allwinner,sun50i-a64-unstable-timer; ++ allwinner,erratum-unknown1; interrupts = ,