andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SPMD: Add support for SPCI_ID_GET 

This patch introduces the `SPCI_ID_GET` interface which will return the
ID of the calling SPCI component. Returns 0 for requests from the
non-secure world and the SPCI component ID as specified in the manifest
for secure world requests.

Change-Id: Icf81eb1d0e1d7d5c521571e04972b6e2d356e0d1
Signed-off-by: Max Shvetsov <maksims.svecovs@arm.com>
Signed-off-by: Marc Bonnici <marc.bonnici@arm.com>
This commit is contained in:
Max Shvetsov 2020-03-12 15:16:40 +00:00
parent f9ea3a6291
commit ac03ac5ebb
5 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/services/spm_core_manifest.h
View File

@ -43,6 +43,11 @@ typedef struct spm_core_manifest_sect_attribute {
*/
uint32_t binary_size;
/*
* ID of the SPMD (mandatory)
*/
uint16_t spmc_id;
} spmc_manifest_sect_attribute_t;
#endif /* SPMC_MANIFEST_H */

1
plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts
View File

@ -9,6 +9,7 @@
compatible = "spci-core-manifest-1.0";
attribute {
spmc_id = <0x8000>;
maj_ver = <0x0>;
min_ver = <0x9>;
exec_state = <0x0>;

7
plat/common/plat_spmd_manifest.c
View File

@ -37,6 +37,12 @@ static int manifest_parse_attribute(spmc_manifest_sect_attribute_t *attr,
return -ENOENT;
}
rc = fdtw_read_cells(fdt, node, "spmc_id", 1, &attr->spmc_id);
if (rc) {
ERROR("Missing SPMC ID in manifest.\n");
return -ENOENT;
}
rc = fdtw_read_cells(fdt, node, "exec_state", 1, &attr->exec_state);
if (rc)
NOTICE("Execution state not specified in SPM core manifest.\n");
@ -55,6 +61,7 @@ static int manifest_parse_attribute(spmc_manifest_sect_attribute_t *attr,
VERBOSE("SPM core manifest attribute section:\n");
VERBOSE(" version: %x.%x\n", attr->major_version, attr->minor_version);
VERBOSE(" spmc_id: %x\n", attr->spmc_id);
VERBOSE(" binary_size: 0x%x\n", attr->binary_size);
VERBOSE(" load_address: 0x%llx\n", attr->load_address);
VERBOSE(" entrypoint: 0x%llx\n", attr->entrypoint);

30
services/std_svc/spmd/spmd_main.c
View File

@ -162,6 +162,16 @@ static int spmd_spmc_init(void *rd_base, size_t rd_size)
INFO("SPM core run time EL%x.\n",
SPMD_SPM_AT_SEL2 ? MODE_EL2 : MODE_EL1);
/* Validate the SPMC ID, Ensure high bit is set */
if (!(spmc_attrs.spmc_id >> SPMC_SECURE_ID_SHIFT) &
SPMC_SECURE_ID_MASK) {
WARN("Invalid ID (0x%x) for SPMC.\n",
spmc_attrs.spmc_id);
return 1;
}
INFO("SPMC ID %x.\n", spmc_attrs.spmc_id);
/* Validate the SPM core execution state */
if ((spmc_attrs.exec_state != MODE_RW_64) &&
(spmc_attrs.exec_state != MODE_RW_32)) {
@ -436,6 +446,26 @@ uint64_t spmd_smc_handler(uint32_t smc_fid, uint64_t x1, uint64_t x2,
break; /* not reached */
case SPCI_ID_GET:
/*
* Returns the ID of the calling SPCI component.
*/
if (!secure_origin) {
SMC_RET8(handle, SPCI_SUCCESS_SMC32,
SPCI_TARGET_INFO_MBZ, SPCI_NS_ENDPOINT_ID,
SPCI_PARAM_MBZ, SPCI_PARAM_MBZ,
SPCI_PARAM_MBZ, SPCI_PARAM_MBZ,
SPCI_PARAM_MBZ);
} else {
SMC_RET8(handle, SPCI_SUCCESS_SMC32,
SPCI_TARGET_INFO_MBZ, spmc_attrs.spmc_id,
SPCI_PARAM_MBZ, SPCI_PARAM_MBZ,
SPCI_PARAM_MBZ, SPCI_PARAM_MBZ,
SPCI_PARAM_MBZ);
}
break; /* not reached */
case SPCI_RX_RELEASE:
case SPCI_RXTX_MAP_SMC32:
case SPCI_RXTX_MAP_SMC64:

9
services/std_svc/spmd/spmd_private.h
View File

@ -54,6 +54,15 @@ typedef struct spmd_spm_core_context {
spmc_state_t state;
} spmd_spm_core_context_t;
/*
* Reserve ID for NS physical SPCI Endpoint.
*/
#define SPCI_NS_ENDPOINT_ID U(0)
/* Mask and shift to check valid secure SPCI Endpoint ID. */
#define SPMC_SECURE_ID_MASK 0x1
#define SPMC_SECURE_ID_SHIFT 15
/*
* Data structure used by the SPM dispatcher (SPMD) in EL3 to track sequence of
* SPCI calls from lower ELs.