From 69f2ace106075699870ab2b404a420f18492a4cd Mon Sep 17 00:00:00 2001 From: Usama Arif Date: Tue, 30 Mar 2021 16:39:19 +0100 Subject: [PATCH 1/2] tc0: update GICR base address The number of ITS have changed from 4 to 1, resulting in GICR base address change. Signed-off-by: Usama Arif Change-Id: I28101f0d1faf9f3c58591b642033c3fd49a275e7 --- fdts/tc0.dts | 4 ++-- plat/arm/board/tc0/include/platform_def.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fdts/tc0.dts b/fdts/tc0.dts index 2d7611cf2..382860d9d 100644 --- a/fdts/tc0.dts +++ b/fdts/tc0.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, Arm Limited. All rights reserved. + * Copyright (c) 2020-2021, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -236,7 +236,7 @@ ranges; interrupt-controller; reg = <0x0 0x30000000 0 0x10000>, /* GICD */ - <0x0 0x30140000 0 0x200000>; /* GICR */ + <0x0 0x30080000 0 0x200000>; /* GICR */ interrupts = <0x1 0x9 0x4>; }; diff --git a/plat/arm/board/tc0/include/platform_def.h b/plat/arm/board/tc0/include/platform_def.h index 30b5ab716..b169d7720 100644 --- a/plat/arm/board/tc0/include/platform_def.h +++ b/plat/arm/board/tc0/include/platform_def.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, Arm Limited. All rights reserved. + * Copyright (c) 2020-2021, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -220,7 +220,7 @@ /* GIC related constants */ #define PLAT_ARM_GICD_BASE UL(0x30000000) #define PLAT_ARM_GICC_BASE UL(0x2C000000) -#define PLAT_ARM_GICR_BASE UL(0x30140000) +#define PLAT_ARM_GICR_BASE UL(0x30080000) /* * PLAT_CSS_MAX_SCP_BL2_SIZE is calculated using the current From b67e9880fcc768b1ddc60cdb3cd8f71c8dc15b7a Mon Sep 17 00:00:00 2001 From: Nicola Mazzucato Date: Thu, 8 Apr 2021 14:17:25 +0100 Subject: [PATCH 2/2] drivers/arm/css/scmi: Update power domain protocol version to 2.0 The SCMI power domain protocol in firmware has been updated to v2.0, thus update the corresponding version in TF-A too. Signed-off-by: Nicola Mazzucato Change-Id: If3920ff71136dce94b2780e29a47f24aa09876c0 --- include/drivers/arm/css/scmi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/drivers/arm/css/scmi.h b/include/drivers/arm/css/scmi.h index e8a2863a9..adce7a62c 100644 --- a/include/drivers/arm/css/scmi.h +++ b/include/drivers/arm/css/scmi.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2020, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2017-2021, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -16,7 +16,7 @@ /* Supported SCMI Protocol Versions */ #define SCMI_AP_CORE_PROTO_VER MAKE_SCMI_VERSION(1, 0) -#define SCMI_PWR_DMN_PROTO_VER MAKE_SCMI_VERSION(1, 0) +#define SCMI_PWR_DMN_PROTO_VER MAKE_SCMI_VERSION(2, 0) #define SCMI_SYS_PWR_PROTO_VER MAKE_SCMI_VERSION(1, 0) #define GET_SCMI_MAJOR_VER(ver) (((ver) >> 16) & 0xffff)