From 8bc20038afc4ac87a35b507bfdf1e5d2301bcfcf Mon Sep 17 00:00:00 2001 From: Koan-Sin Tan Date: Mon, 18 Apr 2016 15:17:57 +0800 Subject: [PATCH] Get rid of use of old GIC APIs Signed-off-by: Koan-Sin Tan --- plat/mediatek/mt8173/bl31_plat_setup.c | 6 ++-- plat/mediatek/mt8173/include/plat_macros.S | 3 +- plat/mediatek/mt8173/include/plat_private.h | 3 -- plat/mediatek/mt8173/include/platform_def.h | 17 +++++++++++ plat/mediatek/mt8173/plat_pm.c | 32 ++++++++++----------- plat/mediatek/mt8173/platform.mk | 12 ++++---- 6 files changed, 44 insertions(+), 29 deletions(-) diff --git a/plat/mediatek/mt8173/bl31_plat_setup.c b/plat/mediatek/mt8173/bl31_plat_setup.c index fa6e00df..92c3494e 100644 --- a/plat/mediatek/mt8173/bl31_plat_setup.c +++ b/plat/mediatek/mt8173/bl31_plat_setup.c @@ -27,7 +27,6 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include @@ -37,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -159,8 +159,8 @@ void bl31_platform_setup(void) generic_delay_timer_init(); /* Initialize the gic cpu and distributor interfaces */ - plat_mt_gic_init(); - arm_gic_setup(); + plat_arm_gic_driver_init(); + plat_arm_gic_init(); #if ENABLE_PLAT_COMPAT /* Topologies are best known to the platform. */ diff --git a/plat/mediatek/mt8173/include/plat_macros.S b/plat/mediatek/mt8173/include/plat_macros.S index 018a790a..f95fd5b4 100644 --- a/plat/mediatek/mt8173/include/plat_macros.S +++ b/plat/mediatek/mt8173/include/plat_macros.S @@ -29,7 +29,8 @@ */ #include -#include +#include +#include #include .section .rodata.gic_reg_name, "aS" diff --git a/plat/mediatek/mt8173/include/plat_private.h b/plat/mediatek/mt8173/include/plat_private.h index ae50e449..9488b88b 100644 --- a/plat/mediatek/mt8173/include/plat_private.h +++ b/plat/mediatek/mt8173/include/plat_private.h @@ -45,9 +45,6 @@ void plat_cci_init(void); void plat_cci_enable(void); void plat_cci_disable(void); -/* Declarations for plat_mt_gic.c */ -void plat_mt_gic_init(void); - /* Declarations for plat_topology.c */ int mt_setup_topology(void); diff --git a/plat/mediatek/mt8173/include/platform_def.h b/plat/mediatek/mt8173/include/platform_def.h index d06fa22a..4422e4f3 100644 --- a/plat/mediatek/mt8173/include/platform_def.h +++ b/plat/mediatek/mt8173/include/platform_def.h @@ -31,6 +31,8 @@ #ifndef __PLATFORM_DEF_H__ #define __PLATFORM_DEF_H__ +#include "mt8173_def.h" + /******************************************************************************* * Platform binary types for linking @@ -132,4 +134,19 @@ #define CACHE_WRITEBACK_SHIFT 6 #define CACHE_WRITEBACK_GRANULE (1 << CACHE_WRITEBACK_SHIFT) + +#define PLAT_ARM_GICD_BASE BASE_GICD_BASE +#define PLAT_ARM_GICC_BASE BASE_GICC_BASE + +#define PLAT_ARM_G1S_IRQS MT_IRQ_SEC_SGI_0, \ + MT_IRQ_SEC_SGI_1, \ + MT_IRQ_SEC_SGI_2, \ + MT_IRQ_SEC_SGI_3, \ + MT_IRQ_SEC_SGI_4, \ + MT_IRQ_SEC_SGI_5, \ + MT_IRQ_SEC_SGI_6, \ + MT_IRQ_SEC_SGI_7 + +#define PLAT_ARM_G0_IRQS + #endif /* __PLATFORM_DEF_H__ */ diff --git a/plat/mediatek/mt8173/plat_pm.c b/plat/mediatek/mt8173/plat_pm.c index 2a0ba827..d727967e 100644 --- a/plat/mediatek/mt8173/plat_pm.c +++ b/plat/mediatek/mt8173/plat_pm.c @@ -29,17 +29,18 @@ */ #include -#include #include #include #include #include #include #include +#include #include #include #include #include /* generic_timer_backup() */ +#include #include #include #include @@ -410,7 +411,7 @@ static void plat_affinst_off(unsigned int afflvl, unsigned int state) return; /* Prevent interrupts from spuriously waking up this cpu */ - arm_gic_cpuif_deactivate(); + gicv2_cpuif_disable(); spm_hotplug_off(mpidr); @@ -429,7 +430,7 @@ static void plat_power_domain_off(const psci_power_state_t *state) unsigned long mpidr = read_mpidr_el1(); /* Prevent interrupts from spuriously waking up this cpu */ - arm_gic_cpuif_deactivate(); + gicv2_cpuif_disable(); spm_hotplug_off(mpidr); @@ -497,7 +498,7 @@ static void plat_affinst_suspend(unsigned long sec_entrypoint, generic_timer_backup(); spm_system_suspend(); /* Prevent interrupts from spuriously waking up this cpu */ - arm_gic_cpuif_deactivate(); + gicv2_cpuif_disable(); } } #else @@ -537,7 +538,7 @@ static void plat_power_domain_suspend(const psci_power_state_t *state) generic_timer_backup(); spm_system_suspend(); /* Prevent interrupts from spuriously waking up this cpu */ - arm_gic_cpuif_deactivate(); + gicv2_cpuif_disable(); } } #endif @@ -566,8 +567,8 @@ static void plat_affinst_on_finish(unsigned int afflvl, unsigned int state) } /* Enable the gic cpu interface */ - arm_gic_cpuif_setup(); - arm_gic_pcpu_distif_setup(); + gicv2_cpuif_enable(); + gicv2_pcpu_distif_init(); trace_power_flow(mpidr, CPU_UP); } #else @@ -593,8 +594,8 @@ static void plat_power_domain_on_finish(const psci_power_state_t *state) return; /* Enable the gic cpu interface */ - arm_gic_cpuif_setup(); - arm_gic_pcpu_distif_setup(); + gicv2_cpuif_enable(); + gicv2_pcpu_distif_init(); trace_power_flow(mpidr, CPU_UP); } #endif @@ -615,8 +616,7 @@ static void plat_affinst_suspend_finish(unsigned int afflvl, unsigned int state) if (afflvl >= MPIDR_AFFLVL2) { /* Enable the gic cpu interface */ - arm_gic_setup(); - arm_gic_cpuif_setup(); + plat_arm_gic_init(); spm_system_suspend_finish(); enable_scu(mpidr); } @@ -633,7 +633,7 @@ static void plat_affinst_suspend_finish(unsigned int afflvl, unsigned int state) if (afflvl < MPIDR_AFFLVL2) spm_mcdi_finish_for_on_state(mpidr, afflvl); - arm_gic_pcpu_distif_setup(); + gicv2_pcpu_distif_init(); } #else static void plat_power_domain_suspend_finish(const psci_power_state_t *state) @@ -645,8 +645,7 @@ static void plat_power_domain_suspend_finish(const psci_power_state_t *state) if (MTK_SYSTEM_PWR_STATE(state) == MTK_LOCAL_STATE_OFF) { /* Enable the gic cpu interface */ - arm_gic_setup(); - arm_gic_cpuif_setup(); + plat_arm_gic_init(); spm_system_suspend_finish(); enable_scu(mpidr); } @@ -665,7 +664,7 @@ static void plat_power_domain_suspend_finish(const psci_power_state_t *state) spm_mcdi_finish_for_on_state(mpidr, MTK_PWR_LVL1); } - arm_gic_pcpu_distif_setup(); + gicv2_pcpu_distif_init(); } #endif @@ -798,8 +797,7 @@ void mtk_system_pwr_domain_resume(void) /* Assert system power domain is available on the platform */ assert(PLAT_MAX_PWR_LVL >= MTK_PWR_LVL2); - arm_gic_cpuif_setup(); - arm_gic_pcpu_distif_setup(); + plat_arm_gic_init(); } #endif diff --git a/plat/mediatek/mt8173/platform.mk b/plat/mediatek/mt8173/platform.mk index 54ca4759..e59125a5 100644 --- a/plat/mediatek/mt8173/platform.mk +++ b/plat/mediatek/mt8173/platform.mk @@ -33,6 +33,8 @@ MTK_PLAT_SOC := ${MTK_PLAT}/${PLAT} PLAT_INCLUDES := -I${MTK_PLAT}/common/ \ -I${MTK_PLAT}/common/drivers/uart/ \ + -Iinclude/plat/arm/common \ + -Iinclude/plat/arm/common/aarch64 \ -I${MTK_PLAT_SOC}/drivers/crypt/ \ -I${MTK_PLAT_SOC}/drivers/mtcmos/ \ -I${MTK_PLAT_SOC}/drivers/pmic/ \ @@ -44,12 +46,13 @@ PLAT_INCLUDES := -I${MTK_PLAT}/common/ \ PLAT_BL_COMMON_SOURCES := lib/xlat_tables/xlat_tables_common.c \ lib/xlat_tables/aarch64/xlat_tables.c \ plat/common/aarch64/plat_common.c \ - plat/common/plat_gic.c + plat/arm/common/arm_gicv2.c \ + plat/common/plat_gicv2.c BL31_SOURCES += drivers/arm/cci/cci.c \ - drivers/arm/gic/arm_gic.c \ - drivers/arm/gic/gic_v2.c \ - drivers/arm/gic/gic_v3.c \ + drivers/arm/gic/common/gic_common.c \ + drivers/arm/gic/v2/gicv2_main.c \ + drivers/arm/gic/v2/gicv2_helpers.c \ drivers/console/aarch64/console.S \ drivers/delay_timer/delay_timer.c \ drivers/delay_timer/generic_delay_timer.c \ @@ -73,7 +76,6 @@ BL31_SOURCES += drivers/arm/cci/cci.c \ ${MTK_PLAT_SOC}/drivers/spm/spm_mcdi.c \ ${MTK_PLAT_SOC}/drivers/spm/spm_suspend.c \ ${MTK_PLAT_SOC}/drivers/timer/mt_cpuxgpt.c \ - ${MTK_PLAT_SOC}/plat_mt_gic.c \ ${MTK_PLAT_SOC}/plat_pm.c \ ${MTK_PLAT_SOC}/plat_sip_calls.c \ ${MTK_PLAT_SOC}/plat_topology.c \ -- 2.30.2