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
fdaf2905
Unverified
Commit
fdaf2905
authored
Dec 09, 2017
by
davidcunado-arm
Committed by
GitHub
Dec 09, 2017
Browse files
Merge pull request #1180 from sandrine-bailleux-arm/sb/spm-rename
Rename some macros in SPM code
parents
49d7ea22
756a2a0e
Changes
2
Show whitespace changes
Inline
Side-by-side
include/services/spm_svc.h
View file @
fdaf2905
...
...
@@ -34,22 +34,22 @@
*/
#define SPM_VERSION_AARCH32 U(0x84000060)
#define SP_EVENT_COMPLETE_AARCH64 U(0xC4000061)
#define SP_MEM_ATTRIBUTES_GET_AARCH64 U(0xC4000064)
#define SP_MEM_ATTRIBUTES_SET_AARCH64 U(0xC4000065)
#define SP_MEM
ORY
_ATTRIBUTES_GET_AARCH64 U(0xC4000064)
#define SP_MEM
ORY
_ATTRIBUTES_SET_AARCH64 U(0xC4000065)
/*
* Macros used by SP_MEM_ATTRIBUTES_SET_AARCH64.
* Macros used by SP_MEM
ORY
_ATTRIBUTES_SET_AARCH64.
*/
#define SP_MEM_ATTR_ACCESS_NOACCESS U(0)
#define SP_MEM_ATTR_ACCESS_RW U(1)
#define SP_MEM
ORY
_ATTR
IBUTES
_ACCESS_NOACCESS U(0)
#define SP_MEM
ORY
_ATTR
IBUTES
_ACCESS_RW U(1)
/* Value U(2) is reserved. */
#define SP_MEM_ATTR_ACCESS_RO U(3)
#define SP_MEM_ATTR_ACCESS_MASK
U(3)
#define SP_MEM_ATTR_ACCESS_SHIFT 0
#define SP_MEM
ORY
_ATTR
IBUTES
_ACCESS_RO U(3)
#define SP_MEM
ORY
_ATTR
IBUTES
_ACCESS_MASK U(3)
#define SP_MEM
ORY
_ATTR
IBUTES
_ACCESS_SHIFT 0
#define SP_MEM_ATTR_EXEC (U(0) << 2)
#define SP_MEM_ATTR_NON_EXEC (U(1) << 2)
#define SP_MEM
ORY
_ATTR
IBUTES
_EXEC (U(0) << 2)
#define SP_MEM
ORY
_ATTR
IBUTES
_NON_EXEC (U(1) << 2)
/*
* SMC IDs defined in [1] for accessing secure partition services from the
...
...
@@ -59,8 +59,8 @@
#define SP_VERSION_AARCH64 U(0xC4000040)
#define SP_VERSION_AARCH32 U(0x84000040)
#define
SP
_COMMUNICATE_AARCH64 U(0xC4000041)
#define
SP
_COMMUNICATE_AARCH32 U(0x84000041)
#define
MM
_COMMUNICATE_AARCH64 U(0xC4000041)
#define
MM
_COMMUNICATE_AARCH32 U(0x84000041)
/* SPM error codes. */
#define SPM_SUCCESS 0
...
...
services/std_svc/spm/spm_main.c
View file @
fdaf2905
...
...
@@ -132,7 +132,7 @@ int32_t spm_init(void)
rc
=
spm_synchronous_sp_entry
(
&
sp_ctx
);
assert
(
rc
==
0
);
sp_init_in_progress
=
0
;
VERBOSE
(
"SP_MEM_ATTRIBUTES_SET_AARCH64 availability has been revoked
\n
"
);
VERBOSE
(
"SP_MEM
ORY
_ATTRIBUTES_SET_AARCH64 availability has been revoked
\n
"
);
return
rc
;
}
...
...
@@ -228,21 +228,21 @@ static mmap_attr_t smc_attr_to_mmap_attr(unsigned int attributes)
{
mmap_attr_t
tf_attr
=
0
;
unsigned
int
access
=
(
attributes
&
SP_MEM_ATTR_ACCESS_MASK
)
>>
SP_MEM_ATTR_ACCESS_SHIFT
;
unsigned
int
access
=
(
attributes
&
SP_MEM
ORY
_ATTR
IBUTES
_ACCESS_MASK
)
>>
SP_MEM
ORY
_ATTR
IBUTES
_ACCESS_SHIFT
;
if
(
access
==
SP_MEM_ATTR_ACCESS_RW
)
{
if
(
access
==
SP_MEM
ORY
_ATTR
IBUTES
_ACCESS_RW
)
{
tf_attr
|=
MT_RW
|
MT_USER
;
}
else
if
(
access
==
SP_MEM_ATTR_ACCESS_RO
)
{
}
else
if
(
access
==
SP_MEM
ORY
_ATTR
IBUTES
_ACCESS_RO
)
{
tf_attr
|=
MT_RO
|
MT_USER
;
}
else
{
/* Other values are reserved. */
assert
(
access
==
SP_MEM_ATTR_ACCESS_NOACCESS
);
assert
(
access
==
SP_MEM
ORY
_ATTR
IBUTES
_ACCESS_NOACCESS
);
/* The only requirement is that there's no access from EL0 */
tf_attr
|=
MT_RO
|
MT_PRIVILEGED
;
}
if
((
attributes
&
SP_MEM_ATTR_NON_EXEC
)
==
0
)
{
if
((
attributes
&
SP_MEM
ORY
_ATTR
IBUTES
_NON_EXEC
)
==
0
)
{
tf_attr
|=
MT_EXECUTE
;
}
else
{
tf_attr
|=
MT_EXECUTE_NEVER
;
...
...
@@ -263,20 +263,21 @@ static int smc_mmap_to_smc_attr(mmap_attr_t attr)
if
((
attr
&
MT_USER
)
==
0
)
{
/* No access from EL0. */
data_access
=
SP_MEM_ATTR_ACCESS_NOACCESS
;
data_access
=
SP_MEM
ORY
_ATTR
IBUTES
_ACCESS_NOACCESS
;
}
else
{
if
((
attr
&
MT_RW
)
!=
0
)
{
assert
(
MT_TYPE
(
attr
)
!=
MT_DEVICE
);
data_access
=
SP_MEM_ATTR_ACCESS_RW
;
data_access
=
SP_MEM
ORY
_ATTR
IBUTES
_ACCESS_RW
;
}
else
{
data_access
=
SP_MEM_ATTR_ACCESS_RO
;
data_access
=
SP_MEM
ORY
_ATTR
IBUTES
_ACCESS_RO
;
}
}
smc_attr
|=
(
data_access
&
SP_MEM_ATTR_ACCESS_MASK
)
<<
SP_MEM_ATTR_ACCESS_SHIFT
;
smc_attr
|=
(
data_access
&
SP_MEMORY_ATTRIBUTES_ACCESS_MASK
)
<<
SP_MEMORY_ATTRIBUTES_ACCESS_SHIFT
;
if
(
attr
&
MT_EXECUTE_NEVER
)
{
smc_attr
|=
SP_MEM_ATTR_NON_EXEC
;
smc_attr
|=
SP_MEM
ORY
_ATTR
IBUTES
_NON_EXEC
;
}
return
smc_attr
;
...
...
@@ -387,20 +388,20 @@ uint64_t spm_smc_handler(uint32_t smc_fid,
/* Return to normal world */
SMC_RET1
(
ns_cpu_context
,
x1
);
case
SP_MEM_ATTRIBUTES_GET_AARCH64
:
INFO
(
"Received SP_MEM_ATTRIBUTES_GET_AARCH64 SMC
\n
"
);
case
SP_MEM
ORY
_ATTRIBUTES_GET_AARCH64
:
INFO
(
"Received SP_MEM
ORY
_ATTRIBUTES_GET_AARCH64 SMC
\n
"
);
if
(
!
sp_init_in_progress
)
{
WARN
(
"SP_MEM_ATTRIBUTES_GET_AARCH64 is available at boot time only
\n
"
);
WARN
(
"SP_MEM
ORY
_ATTRIBUTES_GET_AARCH64 is available at boot time only
\n
"
);
SMC_RET1
(
handle
,
SPM_NOT_SUPPORTED
);
}
SMC_RET1
(
handle
,
spm_memory_attributes_get_smc_handler
(
x1
));
case
SP_MEM_ATTRIBUTES_SET_AARCH64
:
INFO
(
"Received SP_MEM_ATTRIBUTES_SET_AARCH64 SMC
\n
"
);
case
SP_MEM
ORY
_ATTRIBUTES_SET_AARCH64
:
INFO
(
"Received SP_MEM
ORY
_ATTRIBUTES_SET_AARCH64 SMC
\n
"
);
if
(
!
sp_init_in_progress
)
{
WARN
(
"SP_MEM_ATTRIBUTES_SET_AARCH64 is available at boot time only
\n
"
);
WARN
(
"SP_MEM
ORY
_ATTRIBUTES_SET_AARCH64 is available at boot time only
\n
"
);
SMC_RET1
(
handle
,
SPM_NOT_SUPPORTED
);
}
SMC_RET1
(
handle
,
spm_memory_attributes_set_smc_handler
(
x1
,
x2
,
x3
));
...
...
@@ -417,8 +418,8 @@ uint64_t spm_smc_handler(uint32_t smc_fid,
case
SP_VERSION_AARCH32
:
SMC_RET1
(
handle
,
SP_VERSION_COMPILED
);
case
SP
_COMMUNICATE_AARCH32
:
case
SP
_COMMUNICATE_AARCH64
:
case
MM
_COMMUNICATE_AARCH32
:
case
MM
_COMMUNICATE_AARCH64
:
/* Save the Normal world context */
cm_el1_sysregs_context_save
(
NON_SECURE
);
...
...
@@ -435,13 +436,13 @@ uint64_t spm_smc_handler(uint32_t smc_fid,
assert
(
x1
==
0
);
if
(
x3
!=
0
)
{
VERBOSE
(
"
SP
_COMMUNICATE_AARCH32/64: X3 is not 0 as recommended.
\n
"
);
VERBOSE
(
"
MM
_COMMUNICATE_AARCH32/64: X3 is not 0 as recommended.
\n
"
);
}
SMC_RET4
(
&
sp_ctx
.
cpu_ctx
,
smc_fid
,
x1
,
x2
,
x3
);
case
SP_MEM_ATTRIBUTES_GET_AARCH64
:
case
SP_MEM_ATTRIBUTES_SET_AARCH64
:
case
SP_MEM
ORY
_ATTRIBUTES_GET_AARCH64
:
case
SP_MEM
ORY
_ATTRIBUTES_SET_AARCH64
:
/* SMC interfaces reserved for secure callers. */
SMC_RET1
(
handle
,
SPM_NOT_SUPPORTED
);
...
...
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