From dd18bd87893402b3372b469f95442a747d776ecd Mon Sep 17 00:00:00 2001
From: Ziad Elhanafy <ziad.elhanafy@arm.com>
Date: Wed, 17 Jul 2024 13:20:36 +0100
Subject: [PATCH] core: gic: accept GIC version 4 if CFG_ARM_GICV3 is enabled

GIC v4 is backwards compatible with GIC v3, Accept GIC
version 4 if CFG_ARM_GICV3 is enabled.

Signed-off-by: Ziad Elhanafy <ziad.elhanafy@arm.com>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
Acked-by: Etienne Carriere <etienne.carriere@foss.st.com>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
---
 core/drivers/gic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/drivers/gic.c b/core/drivers/gic.c
index a1d9766cb5b..0913da6ec89 100644
--- a/core/drivers/gic.c
+++ b/core/drivers/gic.c
@@ -508,7 +508,7 @@ static void gic_init_base_addr(paddr_t gicc_base_pa, paddr_t gicd_base_pa,
 	vers &= GICD_PIDR2_ARCHREV_MASK;
 
 	if (IS_ENABLED(CFG_ARM_GICV3)) {
-		assert(vers == 3);
+		assert(vers == 4 || vers == 3);
 	} else {
 		assert(vers == 2 || vers == 1);
 		gicc_base = core_mmu_get_va(gicc_base_pa, MEM_AREA_IO_SEC,