From 0f7bca77460c2bbce938cbfb722f3c1712d4998f Mon Sep 17 00:00:00 2001 From: Vandhiadevan Karunamoorthy Date: Thu, 25 Jun 2020 10:18:18 +0530 Subject: [PATCH 1/2] ipq5018: Fix for data abort in secure boot This update fix the the data abort happening while collecting crash dump in secure boot. Signed-off-by: Vandhiadevan Karunamoorthy Change-Id: I59bfd0032d3d580345fab721f750e50c9367e2b9 --- board/qca/arm/ipq5018/ipq5018.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/qca/arm/ipq5018/ipq5018.c b/board/qca/arm/ipq5018/ipq5018.c index 76e24d5fec..e7fe245e0c 100644 --- a/board/qca/arm/ipq5018/ipq5018.c +++ b/board/qca/arm/ipq5018/ipq5018.c @@ -89,7 +89,7 @@ struct dumpinfo_t dumpinfo_n[] = { int dump_entries_n = ARRAY_SIZE(dumpinfo_n); struct dumpinfo_t dumpinfo_s[] = { - { "EBICS_S0.BIN", 0x40000000, 0xA600000, 0 }, + { "EBICS_S0.BIN", 0x40000000, 0xAC00000, 0 }, { "EBICS_S1.BIN", CONFIG_TZ_END_ADDR, 0x10000000, 0 }, { "IMEM.BIN", 0x08600000, 0x00001000, 0 }, { "NSSUTCM.BIN", 0x08600658, 0x00030000, 0, 1, 0x2000 }, From ffbf1122c07b8ea058ddff81eb62e8a42a9e94d5 Mon Sep 17 00:00:00 2001 From: Vandhiadevan Karunamoorthy Date: Thu, 25 Jun 2020 10:24:48 +0530 Subject: [PATCH 2/2] ipq5018: Fix secure_authenticate scm call This changes update the SCM_CMD_SEC_AUTH command. Signed-off-by: Vandhiadevan Karunamoorthy Change-Id: I6952999bd91062a3e5b3992b2dc166e847d27a58 --- board/qca/arm/ipq5018/ipq5018.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/qca/arm/ipq5018/ipq5018.h b/board/qca/arm/ipq5018/ipq5018.h index 1013e350e1..e8512ccde6 100644 --- a/board/qca/arm/ipq5018/ipq5018.h +++ b/board/qca/arm/ipq5018/ipq5018.h @@ -418,7 +418,7 @@ #define CLOCK_UPDATE_TIMEOUT_US 1000 #define KERNEL_AUTH_CMD 0x13 -#define SCM_CMD_SEC_AUTH 0x1F +#define SCM_CMD_SEC_AUTH 0x15 #define ARM_PSCI_TZ_FN_BASE 0x84000000 #define ARM_PSCI_TZ_FN(n) (ARM_PSCI_TZ_FN_BASE + (n))