andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1225 from dp-arm/dp/amu-remove-warn 

AMU: Remove unnecessary WARN()
This commit is contained in:
davidcunado-arm 2018-01-15 16:37:39 +00:00 committed by GitHub
parent 5f3c7ce4ad c6cc9ac339
commit 6bef8015d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/extensions/amu/aarch32/amu.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -7,7 +7,6 @@
#include <amu.h>
#include <arch.h>
#include <arch_helpers.h>
#include <debug.h>
#include <platform.h>
#include <pubsub_events.h>
@ -24,10 +23,8 @@ void amu_enable(int el2_unused)
uint64_t features;
features = read_id_pfr0() >> ID_PFR0_AMU_SHIFT;
if ((features & ID_PFR0_AMU_MASK) != 1) {
WARN("Cannot enable AMU - not supported\n");
if ((features & ID_PFR0_AMU_MASK) != 1)
return;
}
if (el2_unused) {
uint64_t v;

7
lib/extensions/amu/aarch64/amu.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -9,7 +9,6 @@
#include <arch.h>
#include <arch_helpers.h>
#include <assert.h>
#include <debug.h>
#include <platform.h>
#include <pubsub_events.h>
@ -38,10 +37,8 @@ void amu_enable(int el2_unused)
{
uint64_t v;
if (!amu_supported()) {
WARN("Cannot enable AMU - not supported\n");
if (!amu_supported())
return;
}
if (el2_unused) {
/*