diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2016-03-21 10:36:47 +0000 |
|---|---|---|
| committer | Soby Mathew <soby.mathew@arm.com> | 2016-03-22 10:00:42 +0000 |
| commit | 1319e7b19308e07bfa1234dd9aa785f72ab68cea (patch) | |
| tree | 98a596f5f91c4b2b126e10e13211c8273f70dfcc /lib | |
| parent | 55a85659c0a35dba10c72a9c38b82b29f77a90ad (diff) | |
Make cpu operations warning a VERBOSE print
The assembler helper function `print_revision_warning` is used when a
CPU specific operation is enabled in the debug build (e.g. an errata
workaround) but doesn't apply to the executing CPU's revision/part number.
However, in some cases the system integrator may want a single binary to
support multiple platforms with different IP versions, only some of which
contain a specific erratum. In this case, the warning can be emitted very
frequently when CPUs are being powered on/off.
This patch modifies this warning print behaviour so that it is emitted only
when LOG_LEVEL >= LOG_LEVEL_VERBOSE. The `debug.h` header file now contains
guard macros so that it can be included in assembly code.
Change-Id: Ic6e7a07f128dcdb8498a5bfdae920a8feeea1345
Diffstat (limited to 'lib')
| -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 |
3 files changed, 13 insertions, 10 deletions
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 |