Commit ed81f3eb authored by Sandrine Bailleux's avatar Sandrine Bailleux
Browse files

Introduce utils.h header file

This patch introduces a new header file: include/lib/utils.h.
Its purpose is to provide generic macros and helper functions that
are independent of any BL image, architecture, platform and even
not specific to Trusted Firmware.

For now, it contains only 2 macros: ARRAY_SIZE() and
IS_POWER_OF_TWO(). These were previously defined in bl_common.h and
xlat_tables.c respectively.

bl_common.h includes utils.h to retain compatibility for platforms
that relied on bl_common.h for the ARRAY_SIZE() macro. Upstream
platform ports that use this macro have been updated to include
utils.h.

Change-Id: I960450f54134f25d1710bfbdc4184f12c049a9a9
parent c02fcc4a
...@@ -137,8 +137,7 @@ ...@@ -137,8 +137,7 @@
#include <cassert.h> #include <cassert.h>
#include <stdint.h> #include <stdint.h>
#include <stddef.h> #include <stddef.h>
#include <utils.h> /* To retain compatibility */
#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
/* /*
* Declarations of linker defined symbols to help determine memory layout of * Declarations of linker defined symbols to help determine memory layout of
......
/*
* Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* Neither the name of ARM nor the names of its contributors may be used
* to endorse or promote products derived from this software without specific
* prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef __UTILS_H__
#define __UTILS_H__
/* Compute the number of elements in the given array */
#define ARRAY_SIZE(a) \
(sizeof(a) / sizeof((a)[0]))
#define IS_POWER_OF_TWO(x) \
(((x) & ((x) - 1)) == 0)
#endif /* __UTILS_H__ */
...@@ -31,10 +31,10 @@ ...@@ -31,10 +31,10 @@
#define __PLAT_ARM_H__ #define __PLAT_ARM_H__
#include <bakery_lock.h> #include <bakery_lock.h>
#include <bl_common.h>
#include <cassert.h> #include <cassert.h>
#include <cpu_data.h> #include <cpu_data.h>
#include <stdint.h> #include <stdint.h>
#include <utils.h>
#include <xlat_tables.h> #include <xlat_tables.h>
#define ARM_CASSERT_MMAP \ #define ARM_CASSERT_MMAP \
......
...@@ -33,11 +33,10 @@ ...@@ -33,11 +33,10 @@
#include <assert.h> #include <assert.h>
#include <cassert.h> #include <cassert.h>
#include <platform_def.h> #include <platform_def.h>
#include <utils.h>
#include <xlat_tables.h> #include <xlat_tables.h>
#include "../xlat_tables_private.h" #include "../xlat_tables_private.h"
#define IS_POWER_OF_TWO(x) (((x) & ((x) - 1)) == 0)
/* /*
* The virtual address space size must be a power of two (as set in TCR.T0SZ). * The virtual address space size must be a power of two (as set in TCR.T0SZ).
* As we start the initial lookup at level 1, it must also be between 2 GB and * As we start the initial lookup at level 1, it must also be between 2 GB and
......
...@@ -31,11 +31,11 @@ ...@@ -31,11 +31,11 @@
#include <arch.h> #include <arch.h>
#include <arch_helpers.h> #include <arch_helpers.h>
#include <assert.h> #include <assert.h>
#include <bl_common.h>
#include <cassert.h> #include <cassert.h>
#include <debug.h> #include <debug.h>
#include <platform_def.h> #include <platform_def.h>
#include <string.h> #include <string.h>
#include <utils.h>
#include <xlat_tables.h> #include <xlat_tables.h>
#if LOG_LEVEL >= LOG_LEVEL_VERBOSE #if LOG_LEVEL >= LOG_LEVEL_VERBOSE
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <cci.h> #include <cci.h>
#include <plat_arm.h> #include <plat_arm.h>
#include <platform_def.h> #include <platform_def.h>
#include <utils.h>
static const int cci_map[] = { static const int cci_map[] = {
PLAT_ARM_CCI_CLUSTER0_SL_IFACE_IX, PLAT_ARM_CCI_CLUSTER0_SL_IFACE_IX,
......
/* /*
* Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <assert.h> #include <assert.h>
#include <bl_common.h> /* For ARRAY_SIZE */
#include <debug.h> #include <debug.h>
#include <firmware_image_package.h> #include <firmware_image_package.h>
#include <io_driver.h> #include <io_driver.h>
...@@ -37,6 +36,7 @@ ...@@ -37,6 +36,7 @@
#include <io_storage.h> #include <io_storage.h>
#include <platform_def.h> #include <platform_def.h>
#include <string.h> #include <string.h>
#include <utils.h>
/* IO devices */ /* IO devices */
static const io_dev_connector_t *fip_dev_con; static const io_dev_connector_t *fip_dev_con;
......
/* /*
* Copyright (c) 2013-2015, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <debug.h> #include <debug.h>
#include <mt8173_def.h> #include <mt8173_def.h>
#include <platform_def.h> #include <platform_def.h>
#include <utils.h>
#include <xlat_tables.h> #include <xlat_tables.h>
static const int cci_map[] = { static const int cci_map[] = {
......
/* /*
* Copyright (c) 2013-2015, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <arm_gic.h> #include <arm_gic.h>
#include <bl_common.h> #include <bl_common.h>
#include <mt8173_def.h> #include <mt8173_def.h>
#include <utils.h>
const unsigned int mt_irq_sec_array[] = { const unsigned int mt_irq_sec_array[] = {
MT_IRQ_SEC_SGI_0, MT_IRQ_SEC_SGI_0,
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <xlat_tables.h> #include <xlat_tables.h>
#include <platform_def.h> #include <platform_def.h>
#include <plat_private.h> #include <plat_private.h>
#include <utils.h>
#ifdef PLAT_RK_CCI_BASE #ifdef PLAT_RK_CCI_BASE
static const int cci_map[] = { static const int cci_map[] = {
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <bl_common.h> #include <bl_common.h>
#include <gicv2.h> #include <gicv2.h>
#include <platform_def.h> #include <platform_def.h>
#include <utils.h>
/****************************************************************************** /******************************************************************************
* The following functions are defined as weak to allow a platform to override * The following functions are defined as weak to allow a platform to override
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <gicv3.h> #include <gicv3.h>
#include <platform.h> #include <platform.h>
#include <platform_def.h> #include <platform_def.h>
#include <utils.h>
/****************************************************************************** /******************************************************************************
* The following functions are defined as weak to allow a platform to override * The following functions are defined as weak to allow a platform to override
......
/* /*
* Copyright (c) 2013-2015, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <gicv2.h> #include <gicv2.h>
#include <bl_common.h> #include <bl_common.h>
#include <mmio.h> #include <mmio.h>
#include <utils.h>
#include "pm_api_sys.h" #include "pm_api_sys.h"
#include "pm_client.h" #include "pm_client.h"
#include "pm_ipi.h" #include "pm_ipi.h"
......
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