summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Chen <chenjh@rock-chips.com>2021-11-03 04:34:50 +0300
committerJianhong Chen <chenjh@rock-chips.com>2021-11-03 05:04:49 +0300
commit5e1b21ba53ede39404909b0cb91b4a91a2350151 (patch)
treec67fd5279d0af04e2d2cdcd863ab039f7fbc1d9a
parent5385f6ef28f264b74e085a93a8dc9510eefb13f2 (diff)
downloadu-boot-5e1b21ba53ede39404909b0cb91b4a91a2350151.tar.xz
arm: crt0_64.S: disable arm64 SError for usbplug
On rk356x platform usbplug mode, we found it occurs SError when rockusb download. Issue dump: ..... Serial: raw, 0xfe660000 dwmmc@fe2b0000: 1, dwmmc@fe2c0000: 2, sdhci@fe310000: 0 Bootdev: mmc 0 RKUSB: LUN 0, dev 0, hwpart 0, sector 0x0, count 0x3a3e000 \"Error" handler, esr 0xbe000011 * Reason: Exception from SError interrupt * PC = 0000000000013c68 * LR = 0000000000010f7c ..... fixes: (617c1bec46 arm: v7/v8: Enable SError/Asynchronous external abort for TPL/SPL/U-Boot) Signed-off-by: Joseph Chen <chenjh@rock-chips.com> Change-Id: I6270bd0a8afdd998ac09242f21598cc8acd200ca
-rw-r--r--arch/arm/lib/crt0_64.S4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/lib/crt0_64.S b/arch/arm/lib/crt0_64.S
index 79275dabbe..05df8491f5 100644
--- a/arch/arm/lib/crt0_64.S
+++ b/arch/arm/lib/crt0_64.S
@@ -79,7 +79,9 @@ ENTRY(_main)
3: mrs x0, sctlr_el3
orr x0, x0, x1
msr sctlr_el3, x0
- msr daifclr, #4 /* SCR_EL3.EA=1 was already set in start.S */
+#ifndef CONFIG_SUPPORT_USBPLUG
+ msr daifclr, #4 /* Enable SError. SCR_EL3.EA=1 was already set in start.S */
+#endif
b 0f
2: mrs x0, sctlr_el2
orr x0, x0, x1