Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
6bef8015
Unverified
Commit
6bef8015
authored
Jan 15, 2018
by
davidcunado-arm
Committed by
GitHub
Jan 15, 2018
Browse files
Merge pull request #1225 from dp-arm/dp/amu-remove-warn
AMU: Remove unnecessary WARN()
parents
5f3c7ce4
c6cc9ac3
Changes
2
Show whitespace changes
Inline
Side-by-side
lib/extensions/amu/aarch32/amu.c
View file @
6bef8015
/*
/*
* 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
* SPDX-License-Identifier: BSD-3-Clause
*/
*/
...
@@ -7,7 +7,6 @@
...
@@ -7,7 +7,6 @@
#include <amu.h>
#include <amu.h>
#include <arch.h>
#include <arch.h>
#include <arch_helpers.h>
#include <arch_helpers.h>
#include <debug.h>
#include <platform.h>
#include <platform.h>
#include <pubsub_events.h>
#include <pubsub_events.h>
...
@@ -24,10 +23,8 @@ void amu_enable(int el2_unused)
...
@@ -24,10 +23,8 @@ void amu_enable(int el2_unused)
uint64_t
features
;
uint64_t
features
;
features
=
read_id_pfr0
()
>>
ID_PFR0_AMU_SHIFT
;
features
=
read_id_pfr0
()
>>
ID_PFR0_AMU_SHIFT
;
if
((
features
&
ID_PFR0_AMU_MASK
)
!=
1
)
{
if
((
features
&
ID_PFR0_AMU_MASK
)
!=
1
)
WARN
(
"Cannot enable AMU - not supported
\n
"
);
return
;
return
;
}
if
(
el2_unused
)
{
if
(
el2_unused
)
{
uint64_t
v
;
uint64_t
v
;
...
...
lib/extensions/amu/aarch64/amu.c
View file @
6bef8015
/*
/*
* 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
* SPDX-License-Identifier: BSD-3-Clause
*/
*/
...
@@ -9,7 +9,6 @@
...
@@ -9,7 +9,6 @@
#include <arch.h>
#include <arch.h>
#include <arch_helpers.h>
#include <arch_helpers.h>
#include <assert.h>
#include <assert.h>
#include <debug.h>
#include <platform.h>
#include <platform.h>
#include <pubsub_events.h>
#include <pubsub_events.h>
...
@@ -38,10 +37,8 @@ void amu_enable(int el2_unused)
...
@@ -38,10 +37,8 @@ void amu_enable(int el2_unused)
{
{
uint64_t
v
;
uint64_t
v
;
if
(
!
amu_supported
())
{
if
(
!
amu_supported
())
WARN
(
"Cannot enable AMU - not supported
\n
"
);
return
;
return
;
}
if
(
el2_unused
)
{
if
(
el2_unused
)
{
/*
/*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment