refactor(arm)!: rename PLAT_MHU_VERSION flag

In order to support a platform without MHU in RSE, update the flag
PLAT_MHU_VERSION. It is renamed PLAT_MHU and can take the following
entries: NO_MHU, MHUv1, MHUv2, MHUv3...

Signed-off-by: Yann Gautier <yann.gautier@st.com>
Change-Id: Ia72e590088ce62ba8c9009f341b6135926947bee
This commit is contained in:
Yann Gautier 2024-09-24 14:52:08 +02:00
parent 613892cfef
commit a773955094
4 changed files with 10 additions and 10 deletions

View file

@ -1,5 +1,5 @@
# #
# Copyright (c) 2022-2024, Arm Limited. All rights reserved. # Copyright (c) 2022-2025, Arm Limited and Contributors. All rights reserved.
# #
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
@ -13,15 +13,15 @@ RSE_COMMS_SOURCES := $(addprefix drivers/arm/rse/, \
rse_comms_protocol_pointer_access.c \ rse_comms_protocol_pointer_access.c \
) )
# Default to MHUv2 if PLAT_MHU_VERSION undefined # Default to MHUv2 if PLAT_MHU undefined
PLAT_MHU_VERSION ?= 2 PLAT_MHU ?= MHUv2
ifeq (${PLAT_MHU_VERSION}, 3) ifeq (${PLAT_MHU}, MHUv3)
RSE_COMMS_SOURCES += $(addprefix drivers/arm/mhu/, \ RSE_COMMS_SOURCES += $(addprefix drivers/arm/mhu/, \
mhu_v3_x.c \ mhu_v3_x.c \
mhu_wrapper_v3_x.c \ mhu_wrapper_v3_x.c \
) )
else ifeq (${PLAT_MHU_VERSION}, 2) else ifeq (${PLAT_MHU}, MHUv2)
RSE_COMMS_SOURCES += $(addprefix drivers/arm/mhu/, \ RSE_COMMS_SOURCES += $(addprefix drivers/arm/mhu/, \
mhu_v2_x.c \ mhu_v2_x.c \
mhu_wrapper_v2_x.c \ mhu_wrapper_v2_x.c \

View file

@ -1,4 +1,4 @@
# Copyright (c) 2024, Arm Limited. All rights reserved. # Copyright (c) 2024-2025, Arm Limited and Contributors. All rights reserved.
# #
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
@ -33,7 +33,7 @@ GIC_ENABLE_V4_EXTN := 1
GICV3_SUPPORT_GIC600 := 1 GICV3_SUPPORT_GIC600 := 1
HW_ASSISTED_COHERENCY := 1 HW_ASSISTED_COHERENCY := 1
NEED_BL32 := yes NEED_BL32 := yes
PLAT_MHU_VERSION := 1 PLAT_MHU := MHUv1
RESET_TO_BL2 := 1 RESET_TO_BL2 := 1
SVE_VECTOR_LEN := 128 SVE_VECTOR_LEN := 128
USE_COHERENT_MEM := 0 USE_COHERENT_MEM := 0

View file

@ -51,7 +51,7 @@ GICV3_IMPL_GIC600_MULTICHIP := 1
endif endif
# RD-V3 uses MHUv3 # RD-V3 uses MHUv3
PLAT_MHU_VERSION := 3 PLAT_MHU := MHUv3
include plat/arm/board/neoverse_rd/common/nrd-common.mk include plat/arm/board/neoverse_rd/common/nrd-common.mk
include drivers/arm/rse/rse_comms.mk include drivers/arm/rse/rse_comms.mk

View file

@ -112,9 +112,9 @@ PRESERVE_DSU_PMU_REGS := 1
# Specify MHU type based on platform # Specify MHU type based on platform
ifneq ($(filter ${TARGET_PLATFORM}, 2),) ifneq ($(filter ${TARGET_PLATFORM}, 2),)
PLAT_MHU_VERSION := 2 PLAT_MHU := MHUv2
else else
PLAT_MHU_VERSION := 3 PLAT_MHU := MHUv3
endif endif
# Include GICv3 driver files # Include GICv3 driver files