diff options
| author | Marc Bonnici <marc.bonnici@arm.com> | 2020-05-29 16:44:58 +0100 |
|---|---|---|
| committer | Marc Bonnici <marc.bonnici@arm.com> | 2020-09-25 14:39:55 +0100 |
| commit | 5a121212e8fb028f9aa6c004688b8d2bd5cc7e87 (patch) | |
| tree | 5440300779d9e5914fd27e212015aac8b1514ce4 | |
| parent | 561ca660d282df236704e83e2cacea6295da3dda (diff) | |
| download | arm-trusted-firmware-5a121212e8fb028f9aa6c004688b8d2bd5cc7e87.tar.gz | |
Update SPCI_VERSION to be EAC compliant
Bumped the version from 0.9 to 1.0 and update the register used by
FF-A_VERSION.
Change-Id: Ia630d36c284c804542585fcf44e5e753b49a65af
| -rw-r--r-- | include/services/spci_svc.h | 4 | ||||
| -rw-r--r-- | plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts | 4 | ||||
| -rw-r--r-- | services/std_svc/spmd/spmd_main.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/services/spci_svc.h b/include/services/spci_svc.h index 49ba40858..7b2a1f0d3 100644 --- a/include/services/spci_svc.h +++ b/include/services/spci_svc.h @@ -29,10 +29,10 @@ (GET_SMC_NUM(_fid) <= SPCI_FNUM_MAX_VALUE)); }) /* SPCI_VERSION helpers */ -#define SPCI_VERSION_MAJOR U(0) +#define SPCI_VERSION_MAJOR U(1) #define SPCI_VERSION_MAJOR_SHIFT 16 #define SPCI_VERSION_MAJOR_MASK U(0x7FFF) -#define SPCI_VERSION_MINOR U(9) +#define SPCI_VERSION_MINOR U(0) #define SPCI_VERSION_MINOR_SHIFT 0 #define SPCI_VERSION_MINOR_MASK U(0xFFFF) diff --git a/plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts b/plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts index 191f06465..8e7fd881a 100644 --- a/plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts +++ b/plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts @@ -10,8 +10,8 @@ attribute { spmc_id = <0x8000>; - maj_ver = <0x0>; - min_ver = <0x9>; + maj_ver = <0x1>; + min_ver = <0x0>; exec_state = <0x0>; load_address = <0x0 0x6000000>; entrypoint = <0x0 0x6000000>; diff --git a/services/std_svc/spmd/spmd_main.c b/services/std_svc/spmd/spmd_main.c index 2945bf426..8a4c69f20 100644 --- a/services/std_svc/spmd/spmd_main.c +++ b/services/std_svc/spmd/spmd_main.c @@ -405,7 +405,7 @@ uint64_t spmd_smc_handler(uint32_t smc_fid, */ ret = MAKE_SPCI_VERSION(spmc_attrs.major_version, spmc_attrs.minor_version); - SMC_RET8(handle, SPCI_SUCCESS_SMC32, SPCI_TARGET_INFO_MBZ, ret, + SMC_RET8(handle, ret, SPCI_TARGET_INFO_MBZ, SPCI_TARGET_INFO_MBZ, SPCI_PARAM_MBZ, SPCI_PARAM_MBZ, SPCI_PARAM_MBZ, SPCI_PARAM_MBZ, SPCI_PARAM_MBZ); break; /* not reached */ |