enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1328 from WaterByWind/master

Browse Source 
Update defconfig, DT to include upstream unstable timer mitigation
This commit is contained in:
Martin Ayotte 2019-03-29 09:37:28 -04:00 committed by GitHub
commit 7fcd84da10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/kernel/linux-sunxi64-dev.config
View File

@ -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

17
patch/kernel/sunxi-dev/0082-arm64-dts-allwinner-a64-Enable-A64-timer-workaround.patch → patch/kernel/sunxi-dev/0001-arm64-dts-allwinner-a64-Enable-A64-timer-workaround.patch
View File

@ -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 <samuel@sholland.org>
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 <maxime.ripard@bootlin.com>
Signed-off-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
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 = <GIC_PPI 13
(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
<GIC_PPI 14
--
2.17.1
2.19.2