diff options
-rw-r--r-- | drivers/arm/gic/v3/gicv3_helpers.c | 12 | ||||
-rw-r--r-- | drivers/arm/gic/v3/gicv3_main.c | 16 | ||||
-rw-r--r-- | drivers/arm/gic/v3/gicv3_private.h | 12 |
3 files changed, 20 insertions, 20 deletions
diff --git a/drivers/arm/gic/v3/gicv3_helpers.c b/drivers/arm/gic/v3/gicv3_helpers.c index 9fe6f17e..2d99b633 100644 --- a/drivers/arm/gic/v3/gicv3_helpers.c +++ b/drivers/arm/gic/v3/gicv3_helpers.c @@ -336,7 +336,7 @@ void gicv3_rdistif_base_addrs_probe(uintptr_t *rdistif_base_addrs, /******************************************************************************* * Helper function to configure the default attributes of SPIs. ******************************************************************************/ -void gicv3_spis_configure_defaults(uintptr_t gicd_base) +void gicv3_spis_config_defaults(uintptr_t gicd_base) { unsigned int index, num_ints; @@ -369,7 +369,7 @@ void gicv3_spis_configure_defaults(uintptr_t gicd_base) /******************************************************************************* * Helper function to configure secure G0 and G1S SPIs. ******************************************************************************/ -void gicv3_secure_spis_configure(uintptr_t gicd_base, +void gicv3_secure_spis_config(uintptr_t gicd_base, unsigned int num_ints, const unsigned int *sec_intr_list, unsigned int int_grp) @@ -417,7 +417,7 @@ void gicv3_secure_spis_configure(uintptr_t gicd_base, /******************************************************************************* * Helper function to configure properties of secure SPIs ******************************************************************************/ -unsigned int gicv3_secure_spis_configure_props(uintptr_t gicd_base, +unsigned int gicv3_secure_spis_config_props(uintptr_t gicd_base, const interrupt_prop_t *interrupt_props, unsigned int interrupt_props_num) { @@ -472,7 +472,7 @@ unsigned int gicv3_secure_spis_configure_props(uintptr_t gicd_base, /******************************************************************************* * Helper function to configure the default attributes of SPIs. ******************************************************************************/ -void gicv3_ppi_sgi_configure_defaults(uintptr_t gicr_base) +void gicv3_ppi_sgi_config_defaults(uintptr_t gicr_base) { unsigned int index; @@ -501,7 +501,7 @@ void gicv3_ppi_sgi_configure_defaults(uintptr_t gicr_base) /******************************************************************************* * Helper function to configure secure G0 and G1S SPIs. ******************************************************************************/ -void gicv3_secure_ppi_sgi_configure(uintptr_t gicr_base, +void gicv3_secure_ppi_sgi_config(uintptr_t gicr_base, unsigned int num_ints, const unsigned int *sec_intr_list, unsigned int int_grp) @@ -540,7 +540,7 @@ void gicv3_secure_ppi_sgi_configure(uintptr_t gicr_base, /******************************************************************************* * Helper function to configure properties of secure G0 and G1S PPIs and SGIs. ******************************************************************************/ -unsigned int gicv3_secure_ppi_sgi_configure_props(uintptr_t gicr_base, +unsigned int gicv3_secure_ppi_sgi_config_props(uintptr_t gicr_base, const interrupt_prop_t *interrupt_props, unsigned int interrupt_props_num) { diff --git a/drivers/arm/gic/v3/gicv3_main.c b/drivers/arm/gic/v3/gicv3_main.c index 91a5a932..efc5a8fa 100644 --- a/drivers/arm/gic/v3/gicv3_main.c +++ b/drivers/arm/gic/v3/gicv3_main.c @@ -190,12 +190,12 @@ void gicv3_distif_init(void) CTLR_ARE_S_BIT | CTLR_ARE_NS_BIT, RWP_TRUE); /* Set the default attribute of all SPIs */ - gicv3_spis_configure_defaults(gicv3_driver_data->gicd_base); + gicv3_spis_config_defaults(gicv3_driver_data->gicd_base); #if !ERROR_DEPRECATED if (gicv3_driver_data->interrupt_props != NULL) { #endif - bitmap = gicv3_secure_spis_configure_props( + bitmap = gicv3_secure_spis_config_props( gicv3_driver_data->gicd_base, gicv3_driver_data->interrupt_props, gicv3_driver_data->interrupt_props_num); @@ -213,7 +213,7 @@ void gicv3_distif_init(void) /* Configure the G1S SPIs */ if (gicv3_driver_data->g1s_interrupt_array) { - gicv3_secure_spis_configure(gicv3_driver_data->gicd_base, + gicv3_secure_spis_config(gicv3_driver_data->gicd_base, gicv3_driver_data->g1s_interrupt_num, gicv3_driver_data->g1s_interrupt_array, INTR_GROUP1S); @@ -222,7 +222,7 @@ void gicv3_distif_init(void) /* Configure the G0 SPIs */ if (gicv3_driver_data->g0_interrupt_array) { - gicv3_secure_spis_configure(gicv3_driver_data->gicd_base, + gicv3_secure_spis_config(gicv3_driver_data->gicd_base, gicv3_driver_data->g0_interrupt_num, gicv3_driver_data->g0_interrupt_array, INTR_GROUP0); @@ -263,12 +263,12 @@ void gicv3_rdistif_init(unsigned int proc_num) gicr_base = gicv3_driver_data->rdistif_base_addrs[proc_num]; /* Set the default attribute of all SGIs and PPIs */ - gicv3_ppi_sgi_configure_defaults(gicr_base); + gicv3_ppi_sgi_config_defaults(gicr_base); #if !ERROR_DEPRECATED if (gicv3_driver_data->interrupt_props != NULL) { #endif - bitmap = gicv3_secure_ppi_sgi_configure_props(gicr_base, + bitmap = gicv3_secure_ppi_sgi_config_props(gicr_base, gicv3_driver_data->interrupt_props, gicv3_driver_data->interrupt_props_num); #if !ERROR_DEPRECATED @@ -285,7 +285,7 @@ void gicv3_rdistif_init(unsigned int proc_num) /* Configure the G1S SGIs/PPIs */ if (gicv3_driver_data->g1s_interrupt_array) { - gicv3_secure_ppi_sgi_configure(gicr_base, + gicv3_secure_ppi_sgi_config(gicr_base, gicv3_driver_data->g1s_interrupt_num, gicv3_driver_data->g1s_interrupt_array, INTR_GROUP1S); @@ -294,7 +294,7 @@ void gicv3_rdistif_init(unsigned int proc_num) /* Configure the G0 SGIs/PPIs */ if (gicv3_driver_data->g0_interrupt_array) { - gicv3_secure_ppi_sgi_configure(gicr_base, + gicv3_secure_ppi_sgi_config(gicr_base, gicv3_driver_data->g0_interrupt_num, gicv3_driver_data->g0_interrupt_array, INTR_GROUP0); diff --git a/drivers/arm/gic/v3/gicv3_private.h b/drivers/arm/gic/v3/gicv3_private.h index c4474a4c..db485d24 100644 --- a/drivers/arm/gic/v3/gicv3_private.h +++ b/drivers/arm/gic/v3/gicv3_private.h @@ -85,22 +85,22 @@ void gicr_set_icfgr1(uintptr_t base, unsigned int id, unsigned int cfg); /******************************************************************************* * Private GICv3 helper function prototypes ******************************************************************************/ -void gicv3_spis_configure_defaults(uintptr_t gicd_base); -void gicv3_ppi_sgi_configure_defaults(uintptr_t gicr_base); +void gicv3_spis_config_defaults(uintptr_t gicd_base); +void gicv3_ppi_sgi_config_defaults(uintptr_t gicr_base); #if !ERROR_DEPRECATED -void gicv3_secure_spis_configure(uintptr_t gicd_base, +void gicv3_secure_spis_config(uintptr_t gicd_base, unsigned int num_ints, const unsigned int *sec_intr_list, unsigned int int_grp); -void gicv3_secure_ppi_sgi_configure(uintptr_t gicr_base, +void gicv3_secure_ppi_sgi_config(uintptr_t gicr_base, unsigned int num_ints, const unsigned int *sec_intr_list, unsigned int int_grp); #endif -unsigned int gicv3_secure_ppi_sgi_configure_props(uintptr_t gicr_base, +unsigned int gicv3_secure_ppi_sgi_config_props(uintptr_t gicr_base, const interrupt_prop_t *interrupt_props, unsigned int interrupt_props_num); -unsigned int gicv3_secure_spis_configure_props(uintptr_t gicd_base, +unsigned int gicv3_secure_spis_config_props(uintptr_t gicd_base, const interrupt_prop_t *interrupt_props, unsigned int interrupt_props_num); void gicv3_rdistif_base_addrs_probe(uintptr_t *rdistif_base_addrs, |