Skip to content

GitLab

Commit 87d3aacc authored by Daniel Boulby's avatar Daniel Boulby
Browse files

Fix MISRA Rule 5.1 



Rule 5.1: External identifiers shall be distinct

Some of the identifier names in the GICv3 driver were so long that the
first 31 characters were identical. This patch shortens these names to
make sure they are different.

Fixed for:
    LOG_LEVEL=50 PLAT=fvp

Change-Id: Iecd551e3a015d144716b87b42c83dd3ab8c34d90
Signed-off-by: default avatarDaniel Boulby <daniel.boulby@arm.com>
parent 42be6fc5
Hide whitespace changes
Inline Side-by-side
drivers/arm/gic/v3/gicv3_helpers.c
View file @ 87d3aacc
...@@ -342,7 +342,7 @@ void gicv3_rdistif_base_addrs_probe(uintptr_t *rdistif_base_addrs, ...@@ -342,7 +342,7 @@ void gicv3_rdistif_base_addrs_probe(uintptr_t *rdistif_base_addrs,
/******************************************************************************* /*******************************************************************************
* Helper function to configure the default attributes of SPIs. * 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; unsigned int index, num_ints;
...@@ -375,7 +375,7 @@ void gicv3_spis_configure_defaults(uintptr_t gicd_base) ...@@ -375,7 +375,7 @@ void gicv3_spis_configure_defaults(uintptr_t gicd_base)
/******************************************************************************* /*******************************************************************************
* Helper function to configure secure G0 and G1S SPIs. * 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, unsigned int num_ints,
const unsigned int *sec_intr_list, const unsigned int *sec_intr_list,
unsigned int int_grp) unsigned int int_grp)
...@@ -423,7 +423,7 @@ void gicv3_secure_spis_configure(uintptr_t gicd_base, ...@@ -423,7 +423,7 @@ void gicv3_secure_spis_configure(uintptr_t gicd_base,
/******************************************************************************* /*******************************************************************************
* Helper function to configure properties of secure SPIs * 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, const interrupt_prop_t *interrupt_props,
unsigned int interrupt_props_num) unsigned int interrupt_props_num)
{ {
...@@ -478,7 +478,7 @@ unsigned int gicv3_secure_spis_configure_props(uintptr_t gicd_base, ...@@ -478,7 +478,7 @@ unsigned int gicv3_secure_spis_configure_props(uintptr_t gicd_base,
/******************************************************************************* /*******************************************************************************
* Helper function to configure the default attributes of SPIs. * 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; unsigned int index;
...@@ -507,7 +507,7 @@ void gicv3_ppi_sgi_configure_defaults(uintptr_t gicr_base) ...@@ -507,7 +507,7 @@ void gicv3_ppi_sgi_configure_defaults(uintptr_t gicr_base)
/******************************************************************************* /*******************************************************************************
* Helper function to configure secure G0 and G1S SPIs. * 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, unsigned int num_ints,
const unsigned int *sec_intr_list, const unsigned int *sec_intr_list,
unsigned int int_grp) unsigned int int_grp)
...@@ -546,7 +546,7 @@ void gicv3_secure_ppi_sgi_configure(uintptr_t gicr_base, ...@@ -546,7 +546,7 @@ void gicv3_secure_ppi_sgi_configure(uintptr_t gicr_base,
/******************************************************************************* /*******************************************************************************
* Helper function to configure properties of secure G0 and G1S PPIs and SGIs. * 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, const interrupt_prop_t *interrupt_props,
unsigned int interrupt_props_num) unsigned int interrupt_props_num)
{ {
......
drivers/arm/gic/v3/gicv3_main.c
View file @ 87d3aacc
...@@ -190,12 +190,12 @@ void gicv3_distif_init(void) ...@@ -190,12 +190,12 @@ void gicv3_distif_init(void)
CTLR_ARE_S_BIT | CTLR_ARE_NS_BIT, RWP_TRUE); CTLR_ARE_S_BIT | CTLR_ARE_NS_BIT, RWP_TRUE);
/* Set the default attribute of all SPIs */ /* 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 !ERROR_DEPRECATED
if (gicv3_driver_data->interrupt_props != NULL) { if (gicv3_driver_data->interrupt_props != NULL) {
#endif #endif
bitmap = gicv3_secure_spis_configure_props( bitmap = gicv3_secure_spis_config_props(
gicv3_driver_data->gicd_base, gicv3_driver_data->gicd_base,
gicv3_driver_data->interrupt_props, gicv3_driver_data->interrupt_props,
gicv3_driver_data->interrupt_props_num); gicv3_driver_data->interrupt_props_num);
...@@ -213,7 +213,7 @@ void gicv3_distif_init(void) ...@@ -213,7 +213,7 @@ void gicv3_distif_init(void)
/* Configure the G1S SPIs */ /* Configure the G1S SPIs */
if (gicv3_driver_data->g1s_interrupt_array) { 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_num,
gicv3_driver_data->g1s_interrupt_array, gicv3_driver_data->g1s_interrupt_array,
INTR_GROUP1S); INTR_GROUP1S);
...@@ -222,7 +222,7 @@ void gicv3_distif_init(void) ...@@ -222,7 +222,7 @@ void gicv3_distif_init(void)
/* Configure the G0 SPIs */ /* Configure the G0 SPIs */
if (gicv3_driver_data->g0_interrupt_array) { 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_num,
gicv3_driver_data->g0_interrupt_array, gicv3_driver_data->g0_interrupt_array,
INTR_GROUP0); INTR_GROUP0);
...@@ -263,12 +263,12 @@ void gicv3_rdistif_init(unsigned int proc_num) ...@@ -263,12 +263,12 @@ void gicv3_rdistif_init(unsigned int proc_num)
gicr_base = gicv3_driver_data->rdistif_base_addrs[proc_num]; gicr_base = gicv3_driver_data->rdistif_base_addrs[proc_num];
/* Set the default attribute of all SGIs and PPIs */ /* 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 !ERROR_DEPRECATED
if (gicv3_driver_data->interrupt_props != NULL) { if (gicv3_driver_data->interrupt_props != NULL) {
#endif #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,
gicv3_driver_data->interrupt_props_num); gicv3_driver_data->interrupt_props_num);
#if !ERROR_DEPRECATED #if !ERROR_DEPRECATED
...@@ -285,7 +285,7 @@ void gicv3_rdistif_init(unsigned int proc_num) ...@@ -285,7 +285,7 @@ void gicv3_rdistif_init(unsigned int proc_num)
/* Configure the G1S SGIs/PPIs */ /* Configure the G1S SGIs/PPIs */
if (gicv3_driver_data->g1s_interrupt_array) { 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_num,
gicv3_driver_data->g1s_interrupt_array, gicv3_driver_data->g1s_interrupt_array,
INTR_GROUP1S); INTR_GROUP1S);
...@@ -294,7 +294,7 @@ void gicv3_rdistif_init(unsigned int proc_num) ...@@ -294,7 +294,7 @@ void gicv3_rdistif_init(unsigned int proc_num)
/* Configure the G0 SGIs/PPIs */ /* Configure the G0 SGIs/PPIs */
if (gicv3_driver_data->g0_interrupt_array) { 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_num,
gicv3_driver_data->g0_interrupt_array, gicv3_driver_data->g0_interrupt_array,
INTR_GROUP0); INTR_GROUP0);
......
drivers/arm/gic/v3/gicv3_private.h
View file @ 87d3aacc
...@@ -85,22 +85,22 @@ void gicr_set_icfgr1(uintptr_t base, unsigned int id, unsigned int cfg); ...@@ -85,22 +85,22 @@ void gicr_set_icfgr1(uintptr_t base, unsigned int id, unsigned int cfg);
/******************************************************************************* /*******************************************************************************
* Private GICv3 helper function prototypes * Private GICv3 helper function prototypes
******************************************************************************/ ******************************************************************************/
void gicv3_spis_configure_defaults(uintptr_t gicd_base); void gicv3_spis_config_defaults(uintptr_t gicd_base);
void gicv3_ppi_sgi_configure_defaults(uintptr_t gicr_base); void gicv3_ppi_sgi_config_defaults(uintptr_t gicr_base);
#if !ERROR_DEPRECATED #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, unsigned int num_ints,
const unsigned int *sec_intr_list, const unsigned int *sec_intr_list,
unsigned int int_grp); 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, unsigned int num_ints,
const unsigned int *sec_intr_list, const unsigned int *sec_intr_list,
unsigned int int_grp); unsigned int int_grp);
#endif #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, const interrupt_prop_t *interrupt_props,
unsigned int interrupt_props_num); 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, const interrupt_prop_t *interrupt_props,
unsigned int interrupt_props_num); unsigned int interrupt_props_num);
void gicv3_rdistif_base_addrs_probe(uintptr_t *rdistif_base_addrs, void gicv3_rdistif_base_addrs_probe(uintptr_t *rdistif_base_addrs,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment