mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-05-07 04:58:57 +00:00
Code Issues Projects Releases Wiki Activity

arm/scp-firmware: Fix secondary cpus boot issue

Browse Source 
The below assertion is observed in linux kernel booting secondary cpus.
fix is available in scp-firmware's master.

ASSERT: drivers/arm/css/scmi/scmi_pwr_dmn_proto.c:48
BACKTRACE: START: assert
0: EL3: 0x400557c
1: EL3: 0x40031b8
2: EL3: 0x400abec
3: EL3: 0x4006898
4: EL3: 0x4008c70
5: EL3: 0x4008a48
6: EL3: 0x4009d60
7: EL3: 0x400af74
8: EL3: 0x40053e8
BACKTRACE: END: assert

Change-Id: I79ec7007aadbe9947368cb471da159cbb965e04c
Signed-off-by: Damodar Santhapuri <damodar.santhapuri@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Damodar Santhapuri
2021-07-07 15:34:33 +05:30
committed by Jon Mason
parent 1cb359f767
commit b05378f479
2 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm/recipes-bsp/scp-firmware/files/0001-smt-Make-status-and-length-volatile-for-mod_smt_memo.patch
+47
View File
@@ -0,0 +1,47 @@
From d13b4f81287ef957365c3fe68c3d8e17427cb364 Mon Sep 17 00:00:00 2001
From: Nicola Mazzucato <nicola.mazzucato@arm.com>
Date: Wed, 12 May 2021 15:20:58 +0100
Subject: [PATCH] smt: Make status and length volatile for mod_smt_memory
There is an intermittent error on TF-A side when reading the mailbox.
The error is due to the mailbox message length not matching the expectation:
ASSERT: drivers/arm/css/scmi/scmi_pwr_dmn_proto.c:48
This is due to a race between SCP writing the data and TF-A reading them.
Effectively, the compiler seems to perform some minor optimisations with the
local mod_smt_memory resulting in the expected writing sequence to be altered.
This is seen in smt_respond().
To remove such optimisations, force the length and status to be volatile.
With this patch the sequence of writing into smt is restored and the error
in TF-A disappears.
Change-Id: I0127b9aa3cd1b54643ffdb2ca5ddce9fc9569bea
Signed-off-by: Nicola Mazzucato <nicola.mazzucato@arm.com>
Signed-off-by: Damodar Santhapuri <damodar.santhapuri@arm.com>
Upstream-Status: Backport
---
module/smt/include/internal/smt.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/module/smt/include/internal/smt.h b/module/smt/include/internal/smt.h
index 1a615a36..d9f3f423 100644
--- a/module/smt/include/internal/smt.h
+++ b/module/smt/include/internal/smt.h
@@ -12,10 +12,10 @@
struct mod_smt_memory {
uint32_t reserved0;
- uint32_t status;
+ volatile uint32_t status;
uint64_t reserved1;
uint32_t flags;
- uint32_t length; /* message_header + payload */
+ volatile uint32_t length; /* message_header + payload */
uint32_t message_header;
uint32_t payload[];
};
--
2.17.1
meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.8.0.bb
+4 -1
View File
@@ -6,7 +6,10 @@ LICENSE = "BSD-3-Clause & Apache-2.0"
LIC_FILES_CHKSUM = "file://license.md;beginline=5;md5=9db9e3d2fb8d9300a6c3d15101b19731 \ LIC_FILES_CHKSUM = "file://license.md;beginline=5;md5=9db9e3d2fb8d9300a6c3d15101b19731 \
file://contrib/cmsis/git/LICENSE.txt;md5=e3fc50a88d0a364313df4b21ef20c29e" file://contrib/cmsis/git/LICENSE.txt;md5=e3fc50a88d0a364313df4b21ef20c29e"
SRC_URI = "gitsm://github.com/ARM-software/SCP-firmware.git;protocol=https" SRC_URI = "\
gitsm://github.com/ARM-software/SCP-firmware.git;protocol=https \
file://0001-smt-Make-status-and-length-volatile-for-mod_smt_memo.patch \
"
SRCREV = "043de77f220a0b4b0ec3aa367bd515a9e9df2a29" SRCREV = "043de77f220a0b4b0ec3aa367bd515a9e9df2a29"
PROVIDES += "virtual/control-processor-firmware" PROVIDES += "virtual/control-processor-firmware"