Tegra: enable 'signed-comparison' compilation warning/errors

This patch enables the 'sign-compare' flag, to enable warning/errors
for comparisons between signed/unsigned variables. The warning has
been enabled for all the Tegra platforms, to start with.

Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>

diff --git a/common/runtime_svc.c b/common/runtime_svc.c
index 7b38847be9f9bf0ccce3bf9cfce11cdc9b4999a8..0ea4cd093d90b7a25fe9e485c9db66511b8bb663 100644 (file)
--- a/common/runtime_svc.c
+++ b/common/runtime_svc.c
@@ -36,15 +36,16 @@ uintptr_t handle_runtime_svc(uint32_t smc_fid,
                             unsigned int flags)
 {
        u_register_t x1, x2, x3, x4;
-       int index, idx;
+       int index;
+       unsigned int idx;
        const rt_svc_desc_t *rt_svc_descs;
 
        assert(handle);
        idx = get_unique_oen_from_smc_fid(smc_fid);
-       assert(idx >= 0 && idx < MAX_RT_SVCS);
+       assert(idx < MAX_RT_SVCS);
 
        index = rt_svc_descs_indices[idx];
-       if (index < 0 || index >= RT_SVC_DECS_NUM)
+       if (index < 0 || index >= (int)RT_SVC_DECS_NUM)
                SMC_RET1(handle, SMC_UNK);
 
        rt_svc_descs = (rt_svc_desc_t *) RT_SVC_DESCS_START;
@@ -89,7 +90,8 @@ static int32_t validate_rt_svc_desc(const rt_svc_desc_t *desc)
  ******************************************************************************/
 void runtime_svc_init(void)
 {
-       int rc = 0, index, start_idx, end_idx;
+       int rc = 0;
+       unsigned int index, start_idx, end_idx;
 
        /* Assert the number of descriptors detected are less than maximum indices */
        assert((RT_SVC_DESCS_END >= RT_SVC_DESCS_START) &&

diff --git a/lib/cpus/errata_report.c b/lib/cpus/errata_report.c
index 4d9757e09f65c686938a00f1ddf3c00ebc3a9e07..1e1fc7869e620a28472d2c561587cc701e15aad4 100644 (file)
--- a/lib/cpus/errata_report.c
+++ b/lib/cpus/errata_report.c
@@ -60,7 +60,7 @@ int errata_needs_reporting(spinlock_t *lock, uint32_t *reported)
  * Applied: INFO
  * Not applied: VERBOSE
  */
-void errata_print_msg(int status, const char *cpu, const char *id)
+void errata_print_msg(unsigned int status, const char *cpu, const char *id)
 {
        /* Errata status strings */
        static const char *const errata_status_str[] = {

diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c
index 763de0460858ec5cdaf31d4703569a7cddda3d72..f31b3238618330de2eb457a9f3b61f1f806107de 100644 (file)
--- a/lib/psci/psci_common.c
+++ b/lib/psci/psci_common.c
@@ -332,7 +332,7 @@ void psci_get_parent_pwr_domain_nodes(unsigned int cpu_idx,
                                      unsigned int node_index[])
 {
        unsigned int parent_node = psci_cpu_pd_nodes[cpu_idx].parent_node;
-       int i;
+       unsigned int i;
 
        for (i = PSCI_CPU_PWR_LVL + 1; i <= end_lvl; i++) {
                *node_index++ = parent_node;
@@ -901,7 +901,7 @@ void psci_print_power_domain_map(void)
  *****************************************************************************/
 int psci_secondaries_brought_up(void)
 {
-       int idx, n_valid = 0;
+       unsigned int idx, n_valid = 0;
 
        for (idx = 0; idx < ARRAY_SIZE(psci_cpu_pd_nodes); idx++) {
                if (psci_cpu_pd_nodes[idx].mpidr != PSCI_INVALID_MPIDR)

diff --git a/lib/psci/psci_main.c b/lib/psci/psci_main.c
index 2a6644b68837a55fa963eea8b2607bb96e1eed6d..257479aa937389018e9d46f7d5ddc52da53604c3 100644 (file)
--- a/lib/psci/psci_main.c
+++ b/lib/psci/psci_main.c
@@ -209,7 +209,7 @@ int psci_cpu_off(void)
 int psci_affinity_info(u_register_t target_affinity,
                       unsigned int lowest_affinity_level)
 {
-       unsigned int target_idx;
+       int target_idx;
 
        /* We dont support level higher than PSCI_CPU_PWR_LVL */
        if (lowest_affinity_level > PSCI_CPU_PWR_LVL)

diff --git a/lib/psci/psci_off.c b/lib/psci/psci_off.c
index 8be44c31e219b308cb35363cf5445ae9342a4aed..e7fb6532203adfc705fcd99e29469f16d1de7a3b 100644 (file)
--- a/lib/psci/psci_off.c
+++ b/lib/psci/psci_off.c
@@ -19,7 +19,7 @@
  ******************************************************************************/
 static void psci_set_power_off_state(psci_power_state_t *state_info)
 {
-       int lvl;
+       unsigned int lvl;
 
        for (lvl = PSCI_CPU_PWR_LVL; lvl <= PLAT_MAX_PWR_LVL; lvl++)
                state_info->pwr_domain_state[lvl] = PLAT_MAX_OFF_STATE;

diff --git a/lib/xlat_tables_v2/xlat_tables_internal.c b/lib/xlat_tables_v2/xlat_tables_internal.c
index 2d556e65df8d926a067f9c05a703f00786ff305a..e1a252be53da795a5ff90b597ce985f6b797f9f4 100644 (file)
--- a/lib/xlat_tables_v2/xlat_tables_internal.c
+++ b/lib/xlat_tables_v2/xlat_tables_internal.c
@@ -37,7 +37,7 @@
  */
 static int xlat_table_get_index(xlat_ctx_t *ctx, const uint64_t *table)
 {
-       for (int i = 0; i < ctx->tables_num; i++)
+       for (unsigned int i = 0; i < ctx->tables_num; i++)
                if (ctx->tables[i] == table)
                        return i;
 
@@ -53,7 +53,7 @@ static int xlat_table_get_index(xlat_ctx_t *ctx, const uint64_t *table)
 /* Returns a pointer to an empty translation table. */
 static uint64_t *xlat_table_get_empty(xlat_ctx_t *ctx)
 {
-       for (int i = 0; i < ctx->tables_num; i++)
+       for (unsigned int i = 0; i < ctx->tables_num; i++)
                if (ctx->tables_mapped_regions[i] == 0)
                        return ctx->tables[i];
 
@@ -203,7 +203,7 @@ static void xlat_tables_unmap_region(xlat_ctx_t *ctx, mmap_region_t *mm,
                                     const uintptr_t table_base_va,
                                     uint64_t *const table_base,
                                     const int table_entries,
-                                    const int level)
+                                    const unsigned int level)
 {
        assert(level >= ctx->base_level && level <= XLAT_TABLE_LEVEL_MAX);
 
@@ -468,7 +468,7 @@ static uintptr_t xlat_tables_map_region(xlat_ctx_t *ctx, mmap_region_t *mm,
                                   const uintptr_t table_base_va,
                                   uint64_t *const table_base,
                                   const int table_entries,
-                                  const int level)
+                                  const unsigned int level)
 {
        assert(level >= ctx->base_level && level <= XLAT_TABLE_LEVEL_MAX);
 
@@ -1053,14 +1053,14 @@ void init_xlation_table(xlat_ctx_t *ctx)
 
        /* All tables must be zeroed before mapping any region. */
 
-       for (int i = 0; i < ctx->base_table_entries; i++)
+       for (unsigned int i = 0; i < ctx->base_table_entries; i++)
                ctx->base_table[i] = INVALID_DESC;
 
-       for (int j = 0; j < ctx->tables_num; j++) {
+       for (unsigned int j = 0; j < ctx->tables_num; j++) {
 #if PLAT_XLAT_TABLES_DYNAMIC
                ctx->tables_mapped_regions[j] = 0;
 #endif
-               for (int i = 0; i < XLAT_TABLE_ENTRIES; i++)
+               for (unsigned int i = 0; i < XLAT_TABLE_ENTRIES; i++)
                        ctx->tables[j][i] = INVALID_DESC;
        }
 

diff --git a/lib/xlat_tables_v2/xlat_tables_private.h b/lib/xlat_tables_v2/xlat_tables_private.h
index 7b3e555ec9add54ff2e4bf7a2269bc597d0da7d8..83e0b6eac104e90bf8989f98057053061dfd9aa4 100644 (file)
--- a/lib/xlat_tables_v2/xlat_tables_private.h
+++ b/lib/xlat_tables_v2/xlat_tables_private.h
@@ -52,7 +52,7 @@ typedef struct {
         * null entry.
         */
        mmap_region_t *mmap;
-       int mmap_num;
+       unsigned int mmap_num;
 
        /*
         * Array of finer-grain translation tables.
@@ -60,7 +60,7 @@ typedef struct {
         * contain both level-2 and level-3 entries.
         */
        uint64_t (*tables)[XLAT_TABLE_ENTRIES];
-       int tables_num;
+       unsigned int tables_num;
        /*
         * Keep track of how many regions are mapped in each table. The base
         * table can't be unmapped so it isn't needed to keep track of it.
@@ -69,14 +69,14 @@ typedef struct {
        int *tables_mapped_regions;
 #endif /* PLAT_XLAT_TABLES_DYNAMIC */
 
-       int next_table;
+       unsigned int next_table;
 
        /*
         * Base translation table. It doesn't need to have the same amount of
         * entries as the ones used for other levels.
         */
        uint64_t *base_table;
-       int base_table_entries;
+       unsigned int base_table_entries;
 
        /*
         * Max Physical and Virtual addresses currently in use by the
@@ -87,10 +87,10 @@ typedef struct {
        uintptr_t max_va;
 
        /* Level of the base translation table. */
-       int base_level;
+       unsigned int base_level;
 
        /* Set to 1 when the translation tables are initialized. */
-       int initialized;
+       unsigned int initialized;
 
        /*
         * Bit mask that has to be ORed to the rest of a translation table

diff --git a/plat/nvidia/tegra/common/tegra_pm.c b/plat/nvidia/tegra/common/tegra_pm.c
index 94450191c1957f40bcd520e1840113b414dbb499..6f841ef0941c575e9210a86a5d3de319cd5a82d3 100644 (file)
--- a/plat/nvidia/tegra/common/tegra_pm.c
+++ b/plat/nvidia/tegra/common/tegra_pm.c
@@ -107,7 +107,7 @@ plat_local_state_t tegra_soc_get_target_pwr_state(unsigned int lvl,
 void tegra_get_sys_suspend_power_state(psci_power_state_t *req_state)
 {
        /* all affinities use system suspend state id */
-       for (int i = MPIDR_AFFLVL0; i <= PLAT_MAX_PWR_LVL; i++)
+       for (uint32_t i = MPIDR_AFFLVL0; i <= PLAT_MAX_PWR_LVL; i++)
                req_state->pwr_domain_state[i] = PSTATE_ID_SOC_POWERDN;
 }
 

diff --git a/plat/nvidia/tegra/platform.mk b/plat/nvidia/tegra/platform.mk
index f5af40818446112327c4e6e9d5b8278796dcc665..eaf10914a047075daaaec8eb9da525b238b2968d 100644 (file)
--- a/plat/nvidia/tegra/platform.mk
+++ b/plat/nvidia/tegra/platform.mk
@@ -34,3 +34,6 @@ include ${SOC_DIR}/platform_${TARGET_SOC}.mk
 
 # modify BUILD_PLAT to point to SoC specific build directory
 BUILD_PLAT     :=      ${BUILD_BASE}/${PLAT}/${TARGET_SOC}/${BUILD_TYPE}
+
+# enable signed comparison checks
+CFLAGS         += -Wsign-compare

diff --git a/plat/nvidia/tegra/soc/t132/plat_psci_handlers.c b/plat/nvidia/tegra/soc/t132/plat_psci_handlers.c
index 56ce91bec2a7abbab3b6e1a5064ce4dcab1b3853..9b7dc8537ff41dc7810bf4d0a44f9a0068cebfe1 100644 (file)
--- a/plat/nvidia/tegra/soc/t132/plat_psci_handlers.c
+++ b/plat/nvidia/tegra/soc/t132/plat_psci_handlers.c
@@ -49,7 +49,7 @@ int32_t tegra_soc_validate_power_state(unsigned int power_state,
        }
 
        /* Set lower power states to PLAT_MAX_OFF_STATE */
-       for (int i = MPIDR_AFFLVL0; i < PLAT_MAX_PWR_LVL; i++)
+       for (uint32_t i = MPIDR_AFFLVL0; i < PLAT_MAX_PWR_LVL; i++)
                req_state->pwr_domain_state[i] = PLAT_MAX_OFF_STATE;
 
        /* Set the SYSTEM_SUSPEND state-id */

diff --git a/plat/nvidia/tegra/soc/t186/drivers/mce/ari.c b/plat/nvidia/tegra/soc/t186/drivers/mce/ari.c
index 4765ba000f68aa40ce7bdef9f19d629150e8891e..05b30fc9140f894129ba05f3fddb1f137c420ced 100644 (file)
--- a/plat/nvidia/tegra/soc/t186/drivers/mce/ari.c
+++ b/plat/nvidia/tegra/soc/t186/drivers/mce/ari.c
@@ -291,7 +291,7 @@ int ari_is_sc7_allowed(uint32_t ari_base, uint32_t state, uint32_t wake_time)
 
 int ari_online_core(uint32_t ari_base, uint32_t core)
 {
-       int cpu = read_mpidr() & MPIDR_CPU_MASK;
+       uint32_t cpu = read_mpidr() & MPIDR_CPU_MASK;
        int cluster = (read_mpidr() & MPIDR_CLUSTER_MASK) >>
                        MPIDR_AFFINITY_BITS;
        int impl = (read_midr() >> MIDR_IMPL_SHIFT) & MIDR_IMPL_MASK;
@@ -300,7 +300,7 @@ int ari_online_core(uint32_t ari_base, uint32_t core)
        cpu |= (cluster << 2);
 
        /* sanity check target core id */
-       if ((core >= MCE_CORE_ID_MAX) || (cpu == core)) {
+       if ((core >= (uint32_t)MCE_CORE_ID_MAX) || (cpu == core)) {
                ERROR("%s: unsupported core id (%d)\n", __func__, core);
                return EINVAL;
        }

diff --git a/plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c b/plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c
index 0be1af1a99a26e513c9505f6310564532b55c445..8c6f67c0126b62fae7a3dc7b1721790807a9b112 100644 (file)
--- a/plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c
+++ b/plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c
@@ -168,11 +168,11 @@ int nvg_is_sc7_allowed(uint32_t ari_base, uint32_t state, uint32_t wake_time)
 
 int nvg_online_core(uint32_t ari_base, uint32_t core)
 {
-       int cpu = read_mpidr() & MPIDR_CPU_MASK;
+       uint32_t cpu = read_mpidr() & MPIDR_CPU_MASK;
        int impl = (read_midr() >> MIDR_IMPL_SHIFT) & MIDR_IMPL_MASK;
 
        /* sanity check code id */
-       if ((core >= MCE_CORE_ID_MAX) || (cpu == core)) {
+       if ((core >= (uint32_t)MCE_CORE_ID_MAX) || (cpu == core)) {
                ERROR("%s: unsupported core id (%d)\n", __func__, core);
                return EINVAL;
        }

diff --git a/plat/nvidia/tegra/soc/t186/plat_psci_handlers.c b/plat/nvidia/tegra/soc/t186/plat_psci_handlers.c
index 44b99dc46d9f1e8a1b2210d60e6bd32385750c2d..095614e42330db9870dfdd46c162f3d3fdfdcbc0 100644 (file)
--- a/plat/nvidia/tegra/soc/t186/plat_psci_handlers.c
+++ b/plat/nvidia/tegra/soc/t186/plat_psci_handlers.c
@@ -256,8 +256,8 @@ int tegra_soc_pwr_domain_power_down_wfi(const psci_power_state_t *target_state)
 
 int tegra_soc_pwr_domain_on(u_register_t mpidr)
 {
-       int target_cpu = mpidr & MPIDR_CPU_MASK;
-       int target_cluster = (mpidr & MPIDR_CLUSTER_MASK) >>
+       uint32_t target_cpu = mpidr & MPIDR_CPU_MASK;
+       uint32_t target_cluster = (mpidr & MPIDR_CLUSTER_MASK) >>
                        MPIDR_AFFINITY_BITS;
 
        if (target_cluster > MPIDR_AFFLVL1) {

diff --git a/plat/nvidia/tegra/soc/t210/plat_psci_handlers.c b/plat/nvidia/tegra/soc/t210/plat_psci_handlers.c
index bcaade649d619a804d736830588d6d8e8bda06b7..3dff6539dc4b834234d992cb141a3eb4e34f821e 100644 (file)
--- a/plat/nvidia/tegra/soc/t210/plat_psci_handlers.c
+++ b/plat/nvidia/tegra/soc/t210/plat_psci_handlers.c
@@ -60,7 +60,7 @@ int32_t tegra_soc_validate_power_state(unsigned int power_state,
                /*
                 * System powerdown request only for afflvl 2
                 */
-               for (int i = MPIDR_AFFLVL0; i < PLAT_MAX_PWR_LVL; i++)
+               for (uint32_t i = MPIDR_AFFLVL0; i < PLAT_MAX_PWR_LVL; i++)
                        req_state->pwr_domain_state[i] = PLAT_MAX_OFF_STATE;
 
                req_state->pwr_domain_state[PLAT_MAX_PWR_LVL] =

diff --git a/services/spd/tlkd/tlkd_main.c b/services/spd/tlkd/tlkd_main.c
index 274886834fb5e3a26e0d2d2f9eda40f28f49500d..948be5df6b43b59d46813e5cfcb839ab5e2f1be2 100644 (file)
--- a/services/spd/tlkd/tlkd_main.c
+++ b/services/spd/tlkd/tlkd_main.c
@@ -37,7 +37,7 @@ tlk_context_t tlk_ctx;
 /*******************************************************************************
  * CPU number on which TLK booted up
  ******************************************************************************/
-static int boot_cpu;
+static uint32_t boot_cpu;
 
 /* TLK UID: RFC-4122 compliant UUID (version-5, sha-1) */
 DEFINE_SVC_UUID(tlk_uuid,