Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
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
7 years ago
by
davidcunado-arm
Committed by
GitHub
7 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #1225 from dp-arm/dp/amu-remove-warn
AMU: Remove unnecessary WARN()
parents
5f3c7ce4
c6cc9ac3
master
v2.5
v2.5-rc1
v2.5-rc0
v2.4
v2.4-rc2
v2.4-rc1
v2.4-rc0
v2.3
v2.3-rc2
v2.3-rc1
v2.3-rc0
v2.2
v2.2-rc2
v2.2-rc1
v2.2-rc0
v2.1
v2.1-rc1
v2.1-rc0
v2.0
v2.0-rc0
v1.6
v1.6-rc1
v1.6-rc0
v1.5
v1.5-rc3
v1.5-rc2
v1.5-rc1
v1.5-rc0
arm_cca_v0.2
arm_cca_v0.1
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/extensions/amu/aarch32/amu.c
+2
-5
lib/extensions/amu/aarch32/amu.c
lib/extensions/amu/aarch64/amu.c
+2
-5
lib/extensions/amu/aarch64/amu.c
with
4 additions
and
10 deletions
+4
-10
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
*/
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
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
*/
...
...
@@ -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
)
{
/*
...
...
This diff is collapsed.
Click to expand it.
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
Menu
Projects
Groups
Snippets
Help