diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/aarch64/xlat_helpers.c | 127 | ||||
| -rw-r--r-- | lib/cpus/aarch64/cortex_a53.S | 5 | ||||
| -rw-r--r-- | lib/cpus/aarch64/cortex_a57.S | 7 | ||||
| -rw-r--r-- | lib/cpus/aarch64/cpu_helpers.S | 11 |
4 files changed, 13 insertions, 137 deletions
diff --git a/lib/aarch64/xlat_helpers.c b/lib/aarch64/xlat_helpers.c deleted file mode 100644 index d401ffc4..00000000 --- a/lib/aarch64/xlat_helpers.c +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Copyright (c) 2013-2014, 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. - */ - -#include <arch.h> -#include <assert.h> - -/******************************************************************************* - * Helper to create a level 1/2 table descriptor which points to a level 2/3 - * table. - ******************************************************************************/ -unsigned long create_table_desc(unsigned long *next_table_ptr) -{ - unsigned long desc = (unsigned long) next_table_ptr; - - /* Clear the last 12 bits */ - desc >>= FOUR_KB_SHIFT; - desc <<= FOUR_KB_SHIFT; - - desc |= TABLE_DESC; - - return desc; -} - -/******************************************************************************* - * Helper to create a level 1/2/3 block descriptor which maps the va to addr - ******************************************************************************/ -unsigned long create_block_desc(unsigned long desc, - unsigned long addr, - unsigned int level) -{ - switch (level) { - case LEVEL1: - desc |= (addr << FIRST_LEVEL_DESC_N) | BLOCK_DESC; - break; - case LEVEL2: - desc |= (addr << SECOND_LEVEL_DESC_N) | BLOCK_DESC; - break; - case LEVEL3: - desc |= (addr << THIRD_LEVEL_DESC_N) | TABLE_DESC; - break; - default: - assert(0); - } - - return desc; -} - -/******************************************************************************* - * Helper to create a level 1/2/3 block descriptor which maps the va to output_ - * addr with Device nGnRE attributes. - ******************************************************************************/ -unsigned long create_device_block(unsigned long output_addr, - unsigned int level, - unsigned int ns) -{ - unsigned long upper_attrs, lower_attrs, desc; - - lower_attrs = LOWER_ATTRS(ACCESS_FLAG | OSH | AP_RW); - lower_attrs |= LOWER_ATTRS(ns | ATTR_DEVICE_INDEX); - upper_attrs = UPPER_ATTRS(XN); - desc = upper_attrs | lower_attrs; - - return create_block_desc(desc, output_addr, level); -} - -/******************************************************************************* - * Helper to create a level 1/2/3 block descriptor which maps the va to output_ - * addr with inner-shareable normal wbwa read-only memory attributes. - ******************************************************************************/ -unsigned long create_romem_block(unsigned long output_addr, - unsigned int level, - unsigned int ns) -{ - unsigned long upper_attrs, lower_attrs, desc; - - lower_attrs = LOWER_ATTRS(ACCESS_FLAG | ISH | AP_RO); - lower_attrs |= LOWER_ATTRS(ns | ATTR_IWBWA_OWBWA_NTR_INDEX); - upper_attrs = UPPER_ATTRS(0ull); - desc = upper_attrs | lower_attrs; - - return create_block_desc(desc, output_addr, level); -} - -/******************************************************************************* - * Helper to create a level 1/2/3 block descriptor which maps the va to output_ - * addr with inner-shareable normal wbwa read-write memory attributes. - ******************************************************************************/ -unsigned long create_rwmem_block(unsigned long output_addr, - unsigned int level, - unsigned int ns) -{ - unsigned long upper_attrs, lower_attrs, desc; - - lower_attrs = LOWER_ATTRS(ACCESS_FLAG | ISH | AP_RW); - lower_attrs |= LOWER_ATTRS(ns | ATTR_IWBWA_OWBWA_NTR_INDEX); - upper_attrs = UPPER_ATTRS(XN); - desc = upper_attrs | lower_attrs; - - return create_block_desc(desc, output_addr, level); -} diff --git a/lib/cpus/aarch64/cortex_a53.S b/lib/cpus/aarch64/cortex_a53.S index c33ba571..bb565162 100644 --- a/lib/cpus/aarch64/cortex_a53.S +++ b/lib/cpus/aarch64/cortex_a53.S @@ -32,6 +32,7 @@ #include <bl_common.h> #include <cortex_a53.h> #include <cpu_macros.S> +#include <debug.h> #include <plat_macros.S> /* --------------------------------------------- @@ -73,7 +74,7 @@ func errata_a53_826319_wa */ cmp x0, #2 b.ls apply_826319 -#if DEBUG +#if LOG_LEVEL >= LOG_LEVEL_VERBOSE b print_revision_warning #else ret @@ -109,7 +110,7 @@ func a53_disable_non_temporal_hint */ cmp x0, #3 b.ls disable_hint -#if DEBUG +#if LOG_LEVEL >= LOG_LEVEL_VERBOSE b print_revision_warning #else ret diff --git a/lib/cpus/aarch64/cortex_a57.S b/lib/cpus/aarch64/cortex_a57.S index 99db25b8..4c0b8ce3 100644 --- a/lib/cpus/aarch64/cortex_a57.S +++ b/lib/cpus/aarch64/cortex_a57.S @@ -33,6 +33,7 @@ #include <bl_common.h> #include <cortex_a57.h> #include <cpu_macros.S> +#include <debug.h> #include <plat_macros.S> /* --------------------------------------------- @@ -99,7 +100,7 @@ func errata_a57_806969_wa * Compare x0 against revision r0p0 */ cbz x0, apply_806969 -#if DEBUG +#if LOG_LEVEL >= LOG_LEVEL_VERBOSE b print_revision_warning #else ret @@ -125,7 +126,7 @@ func errata_a57_813420_wa * Compare x0 against revision r0p0 */ cbz x0, apply_813420 -#if DEBUG +#if LOG_LEVEL >= LOG_LEVEL_VERBOSE b print_revision_warning #else ret @@ -154,7 +155,7 @@ func a57_disable_ldnp_overread */ cmp x0, #0x12 b.ls disable_hint -#if DEBUG +#if LOG_LEVEL >= LOG_LEVEL_VERBOSE b print_revision_warning #else ret diff --git a/lib/cpus/aarch64/cpu_helpers.S b/lib/cpus/aarch64/cpu_helpers.S index e41d95ba..dab933c7 100644 --- a/lib/cpus/aarch64/cpu_helpers.S +++ b/lib/cpus/aarch64/cpu_helpers.S @@ -35,6 +35,7 @@ #if IMAGE_BL31 #include <cpu_data.h> #endif +#include <debug.h> /* Reset fn is needed in BL at reset vector */ #if IMAGE_BL1 || IMAGE_BL31 @@ -204,10 +205,10 @@ error_exit: ret endfunc get_cpu_ops_ptr -#if DEBUG -.section .rodata.rev_warn_str, "aS" -rev_warn_str: - .asciz "Warning: Skipping CPU specific reset operation for non-matching CPU revision number.\n" +#if LOG_LEVEL >= LOG_LEVEL_VERBOSE +.section .rodata.rev_verbose_str, "aS" +rev_verbose_str: + .asciz "VERBOSE: Skipping CPU specific reset operation for non-matching CPU revision number.\n" /* * This function prints the above warning message to the crash console. @@ -224,7 +225,7 @@ func print_revision_warning /* Check if the console is initialized */ cbz x0, 1f /* The console is initialized */ - adr x4, rev_warn_str + adr x4, rev_verbose_str bl asm_print_str 1: ret x5 |