From 028c6190d9f3d892a84b5b9cbfdbbab808a73acb Mon Sep 17 00:00:00 2001 From: Tony K Nadackal Date: Wed, 24 Nov 2021 16:09:26 +0000 Subject: [PATCH] feat(rdn2): add platform id value for rdn2 variant 3 The RD-N2-Cfg3 platform is a variant of the RD-N2 platform with the significant difference being the number of ITS blocks and the use of a different part number. Signed-off-by: Tony K Nadackal Change-Id: Id4c5faeae44f21da79cb59540558192d0b02b124 --- plat/arm/board/rdn2/include/platform_def.h | 4 +++- plat/arm/board/rdn2/platform.mk | 8 ++++---- plat/arm/css/sgi/include/sgi_variant.h | 3 ++- plat/arm/css/sgi/sgi_bl31_setup.c | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/plat/arm/board/rdn2/include/platform_def.h b/plat/arm/board/rdn2/include/platform_def.h index 347401626..8e63de580 100644 --- a/plat/arm/board/rdn2/include/platform_def.h +++ b/plat/arm/board/rdn2/include/platform_def.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2020-2023, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -92,6 +92,8 @@ #if (CSS_SGI_PLATFORM_VARIANT == 1) #define PLAT_ARM_GICR_BASE UL(0x30100000) +#elif (CSS_SGI_PLATFORM_VARIANT == 3) +#define PLAT_ARM_GICR_BASE UL(0x30300000) #else #define PLAT_ARM_GICR_BASE UL(0x301C0000) #endif diff --git a/plat/arm/board/rdn2/platform.mk b/plat/arm/board/rdn2/platform.mk index 7492fe5ce..b30e3fccd 100644 --- a/plat/arm/board/rdn2/platform.mk +++ b/plat/arm/board/rdn2/platform.mk @@ -1,13 +1,13 @@ -# Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved. +# Copyright (c) 2020-2023, Arm Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # -RD_N2_VARIANTS := 0 1 2 +RD_N2_VARIANTS := 0 1 2 3 ifneq ($(CSS_SGI_PLATFORM_VARIANT),\ $(filter $(CSS_SGI_PLATFORM_VARIANT),$(RD_N2_VARIANTS))) - $(error "CSS_SGI_PLATFORM_VARIANT for RD-N2 should be 0, 1 or 2, currently set \ - to ${CSS_SGI_PLATFORM_VARIANT}.") + $(error "CSS_SGI_PLATFORM_VARIANT for RD-N2 should be 0, 1, 2 or 3, currently \ + set to ${CSS_SGI_PLATFORM_VARIANT}.") endif $(eval $(call CREATE_SEQ,SEQ,4)) diff --git a/plat/arm/css/sgi/include/sgi_variant.h b/plat/arm/css/sgi/include/sgi_variant.h index 223ac3ecc..8f9529aa1 100644 --- a/plat/arm/css/sgi/include/sgi_variant.h +++ b/plat/arm/css/sgi/include/sgi_variant.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2022, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2018-2023, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -22,6 +22,7 @@ /* SID Version values for RD-N2 variants */ #define RD_N2_CFG1_SID_VER_PART_NUM 0x07B6 +#define RD_N2_CFG3_SID_VER_PART_NUM 0x07F1 /* SID Version values for RD-V2 */ #define RD_V2_SID_VER_PART_NUM 0x07F2 diff --git a/plat/arm/css/sgi/sgi_bl31_setup.c b/plat/arm/css/sgi/sgi_bl31_setup.c index 9adcb7c0b..df2ce387a 100644 --- a/plat/arm/css/sgi/sgi_bl31_setup.c +++ b/plat/arm/css/sgi/sgi_bl31_setup.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2022, Arm Limited and Contributors. All rights reserved. + * Copyright (c) 2018-2023, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -80,7 +80,8 @@ scmi_channel_plat_info_t *plat_css_get_scmi_info(unsigned int channel_id) sgi_plat_info.platform_id == RD_V1_SID_VER_PART_NUM || sgi_plat_info.platform_id == RD_N2_SID_VER_PART_NUM || sgi_plat_info.platform_id == RD_V2_SID_VER_PART_NUM || - sgi_plat_info.platform_id == RD_N2_CFG1_SID_VER_PART_NUM) { + sgi_plat_info.platform_id == RD_N2_CFG1_SID_VER_PART_NUM || + sgi_plat_info.platform_id == RD_N2_CFG3_SID_VER_PART_NUM) { if (channel_id >= ARRAY_SIZE(plat_rd_scmi_info)) panic(); return &plat_rd_scmi_info[channel_id]; -- 2.39.5