From 3c108a74653471b743f84a3ba756ddbc74f52e3f Mon Sep 17 00:00:00 2001 From: Andrew Mustea Date: Fri, 8 Jul 2022 07:34:34 -0700 Subject: [PATCH] core: plat-bcm: remove virtual address lookup from main_init_gic() - Commit 60801696667d ("plat: arm: refactor GIC initialization") refactored GIC initialization to have gic_init_base_addr() take in a physical address instead of a virtual one, meaning that a virtual address lookup is no longer necessary within a platform's gic_init(). - BCM's main_init_gic() would still perform a virtual memory lookup and hand over its virtual address instead of the expected physical one. This caused the lookup in gic_init_base_addr() to fail and panic. - This new commit removes the virtual memory lookup from BCM's main_gic_init() and instead hands gic_init_base_addr() a physical address. Signed-off-by: Andrew Mustea Acked-by: Jens Wiklander --- core/arch/arm/plat-bcm/main.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/core/arch/arm/plat-bcm/main.c b/core/arch/arm/plat-bcm/main.c index d25a164e059..ead5b25ddb7 100644 --- a/core/arch/arm/plat-bcm/main.c +++ b/core/arch/arm/plat-bcm/main.c @@ -81,14 +81,6 @@ void itr_core_handler(void) void main_init_gic(void) { - vaddr_t gicd_base; - - gicd_base = core_mmu_get_va(GICD_BASE, MEM_AREA_IO_SEC, 1); - - if (!gicd_base) - panic(); - - gic_init_base_addr(&gic_data, 0, gicd_base); + gic_init_base_addr(&gic_data, 0, GICD_BASE); itr_init(&gic_data.chip); - }