Skip to content

GitLab

Commit abde216d authored by Olivier Deprez's avatar Olivier Deprez Committed by TrustedFirmware Code Review
Browse files

Merge "feat(ff-a): update FF-A version to v1.1" into integration

parents d1987f4c e1c732d4
Show whitespace changes
Inline Side-by-side
include/services/ffa_svc.h
View file @ abde216d
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
/* The macros below are used to identify FFA calls from the SMC function ID */ /* The macros below are used to identify FFA calls from the SMC function ID */
#define FFA_FNUM_MIN_VALUE U(0x60) #define FFA_FNUM_MIN_VALUE U(0x60)
#define FFA_FNUM_MAX_VALUE U(0x85) #define FFA_FNUM_MAX_VALUE U(0x87)
#define is_ffa_fid(fid) __extension__ ({ \ #define is_ffa_fid(fid) __extension__ ({ \
__typeof__(fid) _fid = (fid); \ __typeof__(fid) _fid = (fid); \
((GET_SMC_NUM(_fid) >= FFA_FNUM_MIN_VALUE) && \ ((GET_SMC_NUM(_fid) >= FFA_FNUM_MIN_VALUE) && \
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#define FFA_VERSION_MAJOR U(1) #define FFA_VERSION_MAJOR U(1)
#define FFA_VERSION_MAJOR_SHIFT 16 #define FFA_VERSION_MAJOR_SHIFT 16
#define FFA_VERSION_MAJOR_MASK U(0x7FFF) #define FFA_VERSION_MAJOR_MASK U(0x7FFF)
#define FFA_VERSION_MINOR U(0) #define FFA_VERSION_MINOR U(1)
#define FFA_VERSION_MINOR_SHIFT 0 #define FFA_VERSION_MINOR_SHIFT 0
#define FFA_VERSION_MINOR_MASK U(0xFFFF) #define FFA_VERSION_MINOR_MASK U(0xFFFF)
#define FFA_VERSION_BIT31_MASK U(0x1u << 31) #define FFA_VERSION_BIT31_MASK U(0x1u << 31)
...@@ -71,11 +71,11 @@ ...@@ -71,11 +71,11 @@
#define FFA_FNUM_RXTX_UNMAP U(0x67) #define FFA_FNUM_RXTX_UNMAP U(0x67)
#define FFA_FNUM_PARTITION_INFO_GET U(0x68) #define FFA_FNUM_PARTITION_INFO_GET U(0x68)
#define FFA_FNUM_ID_GET U(0x69) #define FFA_FNUM_ID_GET U(0x69)
#define FFA_FNUM_MSG_POLL U(0x6A) #define FFA_FNUM_MSG_POLL U(0x6A) /* Legacy FF-A v1.0 */
#define FFA_FNUM_MSG_WAIT U(0x6B) #define FFA_FNUM_MSG_WAIT U(0x6B)
#define FFA_FNUM_MSG_YIELD U(0x6C) #define FFA_FNUM_MSG_YIELD U(0x6C)
#define FFA_FNUM_MSG_RUN U(0x6D) #define FFA_FNUM_MSG_RUN U(0x6D)
#define FFA_FNUM_MSG_SEND U(0x6E) #define FFA_FNUM_MSG_SEND U(0x6E) /* Legacy FF-A v1.0 */
#define FFA_FNUM_MSG_SEND_DIRECT_REQ U(0x6F) #define FFA_FNUM_MSG_SEND_DIRECT_REQ U(0x6F)
#define FFA_FNUM_MSG_SEND_DIRECT_RESP U(0x70) #define FFA_FNUM_MSG_SEND_DIRECT_RESP U(0x70)
#define FFA_FNUM_MEM_DONATE U(0x71) #define FFA_FNUM_MEM_DONATE U(0x71)
...@@ -85,8 +85,20 @@ ...@@ -85,8 +85,20 @@
#define FFA_FNUM_MEM_RETRIEVE_RESP U(0x75) #define FFA_FNUM_MEM_RETRIEVE_RESP U(0x75)
#define FFA_FNUM_MEM_RELINQUISH U(0x76) #define FFA_FNUM_MEM_RELINQUISH U(0x76)
#define FFA_FNUM_MEM_RECLAIM U(0x77) #define FFA_FNUM_MEM_RECLAIM U(0x77)
#define FFA_FNUM_SECONDARY_EP_REGISTER U(0x84) #define FFA_FNUM_NORMAL_WORLD_RESUME U(0x7C)
/* FF-A v1.1 */
#define FFA_FNUM_NOTIFICATION_BITMAP_CREATE U(0x7D)
#define FFA_FNUM_NOTIFICATION_BITMAP_DESTROY U(0x7E)
#define FFA_FNUM_NOTIFICATION_BIND U(0x7F)
#define FFA_FNUM_NOTIFICATION_UNBIND U(0x80)
#define FFA_FNUM_NOTIFICATION_SET U(0x81)
#define FFA_FNUM_NOTIFICATION_GET U(0x82)
#define FFA_FNUM_NOTIFICATION_INFO_GET U(0x83)
#define FFA_FNUM_RX_ACQUIRE U(0x84)
#define FFA_FNUM_SPM_ID_GET U(0x85) #define FFA_FNUM_SPM_ID_GET U(0x85)
#define FFA_FNUM_MSG_SEND2 U(0x86)
#define FFA_FNUM_SECONDARY_EP_REGISTER U(0x87)
/* FFA SMC32 FIDs */ /* FFA SMC32 FIDs */
#define FFA_ERROR FFA_FID(SMC_32, FFA_FNUM_ERROR) #define FFA_ERROR FFA_FID(SMC_32, FFA_FNUM_ERROR)
......
plat/arm/board/diphda/common/fdts/diphda_spmc_manifest.dts
View file @ abde216d
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
attribute { attribute {
spmc_id = <0x8000>; spmc_id = <0x8000>;
maj_ver = <0x1>; maj_ver = <0x1>;
min_ver = <0x0>; min_ver = <0x1>;
exec_state = <0x0>; exec_state = <0x0>;
load_address = <0x0 0x2002000>; load_address = <0x0 0x2002000>;
entrypoint = <0x0 0x2002000>; entrypoint = <0x0 0x2002000>;
......
plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts
View file @ abde216d
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
attribute { attribute {
spmc_id = <0x8000>; spmc_id = <0x8000>;
maj_ver = <0x1>; maj_ver = <0x1>;
min_ver = <0x0>; min_ver = <0x1>;
exec_state = <0x0>; exec_state = <0x0>;
load_address = <0x0 0x6000000>; load_address = <0x0 0x6000000>;
entrypoint = <0x0 0x6000000>; entrypoint = <0x0 0x6000000>;
......
plat/arm/board/fvp/fdts/fvp_spmc_optee_sp_manifest.dts
View file @ abde216d
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
attribute { attribute {
spmc_id = <0x8000>; spmc_id = <0x8000>;
maj_ver = <0x1>; maj_ver = <0x1>;
min_ver = <0x0>; min_ver = <0x1>;
exec_state = <0x0>; exec_state = <0x0>;
load_address = <0x0 0x6000000>; load_address = <0x0 0x6000000>;
entrypoint = <0x0 0x6000000>; entrypoint = <0x0 0x6000000>;
......
plat/arm/board/tc0/fdts/tc0_spmc_manifest.dts
View file @ abde216d
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
attribute { attribute {
spmc_id = <0x8000>; spmc_id = <0x8000>;
maj_ver = <0x1>; maj_ver = <0x1>;
min_ver = <0x0>; min_ver = <0x1>;
exec_state = <0x0>; exec_state = <0x0>;
load_address = <0x0 0xfd000000>; load_address = <0x0 0xfd000000>;
entrypoint = <0x0 0xfd000000>; entrypoint = <0x0 0xfd000000>;
......
plat/arm/board/tc0/fdts/tc0_spmc_optee_sp_manifest.dts
View file @ abde216d
/* /*
* Copyright (c) 2020, Arm Limited. All rights reserved. * Copyright (c) 2020-2021, Arm Limited. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
attribute { attribute {
spmc_id = <0x8000>; spmc_id = <0x8000>;
maj_ver = <0x1>; maj_ver = <0x1>;
min_ver = <0x0>; min_ver = <0x1>;
exec_state = <0x0>; exec_state = <0x0>;
load_address = <0x0 0xfd000000>; load_address = <0x0 0xfd000000>;
entrypoint = <0x0 0xfd000000>; entrypoint = <0x0 0xfd000000>;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment