fconf: Fix misra issues

MISRA C-2012 Rule 20.7:
Macro parameter expands into an expression without being wrapped by parentheses.

MISRA C-2012 Rule 12.1:
Missing explicit parentheses on sub-expression.

MISRA C-2012 Rule 18.4:
Essential type of the left hand operand is not the same as that of the right
operand.

Include does not provide any needed symbols.

Change-Id: Ie1c6451cfbc8f519146c28b2cf15c50b1f36adc8
Signed-off-by: Louis Mayencourt <louis.mayencourt@arm.com>

diff --git a/include/lib/fconf/fconf.h b/include/lib/fconf/fconf.h
index f58ff5710382923832f7fd0bbc87c44073229682..0401e5c066dc9e0cdb288825b693b53597cd917f 100644 (file)
--- a/include/lib/fconf/fconf.h
+++ b/include/lib/fconf/fconf.h
@@ -14,9 +14,9 @@
 
 #define FCONF_REGISTER_POPULATOR(name, callback)                               \
        __attribute__((used, section(".fconf_populator")))                      \
-       const struct fconf_populator name##__populator = {                      \
-               .info = #name,                                                  \
-               .populate = callback                                            \
+       const struct fconf_populator (name##__populator) = {                    \
+               .info = (#name),                                                \
+               .populate = (callback)                                          \
        };
 
 /*

diff --git a/include/lib/object_pool.h b/include/lib/object_pool.h
index 0f85331a87cebfaf4b1104d55b924fe4df97ed4d..66e8c4780c9474540b3533bad74464b5d642e8e5 100644 (file)
--- a/include/lib/object_pool.h
+++ b/include/lib/object_pool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -56,13 +56,13 @@ struct object_pool {
  */
 static inline void *pool_alloc_n(struct object_pool *pool, size_t count)
 {
-       if (pool->used + count > pool->capacity) {
+       if ((pool->used + count) > pool->capacity) {
                ERROR("Cannot allocate %zu objects out of pool (%zu objects left).\n",
                      count, pool->capacity - pool->used);
                panic();
        }
 
-       void *obj = (char *)(pool->objects) + pool->obj_size * pool->used;
+       void *obj = (char *)(pool->objects) + (pool->obj_size * pool->used);
        pool->used += count;
        return obj;
 }

diff --git a/plat/arm/common/arm_dyn_cfg.c b/plat/arm/common/arm_dyn_cfg.c
index 443d40fe8ce2dd18e4cf6e010dd7e11187cf3039..df75307334a59abd56772dac854ed88c6d08dff3 100644 (file)
--- a/plat/arm/common/arm_dyn_cfg.c
+++ b/plat/arm/common/arm_dyn_cfg.c
@@ -21,7 +21,6 @@
 #include <lib/fconf/fconf_tbbr_getter.h>
 #include <plat/arm/common/arm_dyn_cfg_helpers.h>
 #include <plat/arm/common/plat_arm.h>
-#include <plat/common/platform.h>
 
 #if TRUSTED_BOARD_BOOT
 

diff --git a/plat/arm/common/arm_fconf_io_storage.c b/plat/arm/common/arm_fconf_io_storage.c
index 341622a0bb421f7deb2c6e2ddbf0ea88e5c3f0f1..6fcfbd6fbcc32bbbe6ec160aab8dc30d79262cd7 100644 (file)
--- a/plat/arm/common/arm_fconf_io_storage.c
+++ b/plat/arm/common/arm_fconf_io_storage.c
@@ -12,7 +12,6 @@
 #include <drivers/io/io_memmap.h>
 #include <drivers/io/io_storage.h>
 #include <lib/utils.h>
-#include <tools_share/firmware_image_package.h>
 
 #include <plat/arm/common/arm_fconf_getter.h>
 #include <plat/arm/common/arm_fconf_io_storage.h>

diff --git a/plat/arm/common/fconf/arm_fconf_io.c b/plat/arm/common/fconf/arm_fconf_io.c
index 3c0586fd015df8ad3025f60f132cb606db4bef81..cfcddc2b2e17480e46217188e9c93b9ca28cff41 100644 (file)
--- a/plat/arm/common/fconf/arm_fconf_io.c
+++ b/plat/arm/common/fconf/arm_fconf_io.c
@@ -59,9 +59,9 @@ struct plat_io_policy policies[MAX_NUMBER_IDS] = {
 #ifdef IMAGE_BL2
 
 #if TRUSTED_BOARD_BOOT
-#define FCONF_ARM_IO_UUID_NUMBER       19
+#define FCONF_ARM_IO_UUID_NUMBER       U(19)
 #else
-#define FCONF_ARM_IO_UUID_NUMBER       10
+#define FCONF_ARM_IO_UUID_NUMBER       U(10)
 #endif
 
 static io_uuid_spec_t fconf_arm_uuids[FCONF_ARM_IO_UUID_NUMBER];