Skip to content

Commit fc5f325

Browse files
0xc01700xc0170
authored
Merge pull request #12458 from GaborAbonyi/add_musca_b1_platform
Add Musca B1 target
2 parents c250781 + 551c3c5 commit fc5f325

File tree

108 files changed

+19329
-12
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+19329
-12
lines changed

‎components/TARGET_PSA/TARGET_MBED_SPM/COMPONENT_SPE/psa_setup.c

+12
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,18 @@ spm_rot_service_t platform_rot_services[] = {
395395
.tail = NULL
396396
}
397397
},
398+
{
399+
.sid = PSA_PLATFORM_IOCTL,
400+
.mask = PSA_PLATFORM_IOCTL_MSK,
401+
.partition = NULL,
402+
.min_version = 1,
403+
.min_version_policy = PSA_MINOR_VERSION_POLICY_RELAXED,
404+
.allow_nspe = true,
405+
.queue = {
406+
.head = NULL,
407+
.tail = NULL
408+
}
409+
},
398410
};
399411

400412
/* External SIDs used by PLATFORM */

‎components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/inc/tfm_service_list.inc

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
{"PSA_PLATFORM_LC_GET", PLATFORM_ID, PSA_PLATFORM_LC_GET_MSK, 0x00011000, true, 1, TFM_VERSION_POLICY_RELAXED},
4646
{"PSA_PLATFORM_LC_SET", PLATFORM_ID, PSA_PLATFORM_LC_SET_MSK, 0x00011001, true, 1, TFM_VERSION_POLICY_RELAXED},
4747
{"PSA_PLATFORM_SYSTEM_RESET", PLATFORM_ID, PSA_PLATFORM_SYSTEM_RESET_MSK, 0x00011002, true, 1, TFM_VERSION_POLICY_RELAXED},
48+
{"PSA_PLATFORM_IOCTL", PLATFORM_ID, PSA_PLATFORM_IOCTL_MSK, 0x00011003, true, 1, TFM_VERSION_POLICY_RELAXED},
4849

4950
/* -----------------------------------------------------------------------------
5051
* ITS Services

‎components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/inc/tfm_spm_signal_defs.h

+2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@
6262
#define PSA_PLATFORM_LC_SET_MSK (1UL << PSA_PLATFORM_LC_SET_MSK_POS)
6363
#define PSA_PLATFORM_SYSTEM_RESET_MSK_POS (6UL)
6464
#define PSA_PLATFORM_SYSTEM_RESET_MSK (1UL << PSA_PLATFORM_SYSTEM_RESET_MSK_POS)
65+
#define PSA_PLATFORM_IOCTL_MSK_POS (7UL)
66+
#define PSA_PLATFORM_IOCTL_MSK (1UL << PSA_PLATFORM_IOCTL_MSK_POS)
6567

6668
/* -----------------------------------------------------------------------------
6769
* ITS Signals

‎components/TARGET_PSA/inc/psa/tfm_platform_api.h

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
/*
2+
* Copyright (c) 2018-2020, Arm Limited. All rights reserved.
3+
*
4+
* SPDX-License-Identifier: BSD-3-Clause
5+
*
6+
*/
7+
8+
#ifndef __TFM_PLATFORM_API__
9+
#define __TFM_PLATFORM_API__
10+
11+
#include <limits.h>
12+
#include <stdint.h>
13+
#include "psa/client.h"
14+
15+
#ifdef __cplusplus
16+
extern "C" {
17+
#endif
18+
19+
/**
20+
* \brief TFM secure partition platform API version
21+
*/
22+
#define TFM_PLATFORM_API_VERSION_MAJOR (0)
23+
#define TFM_PLATFORM_API_VERSION_MINOR (3)
24+
25+
/*!
26+
* \enum tfm_platform_err_t
27+
*
28+
* \brief Platform service error types
29+
*
30+
*/
31+
enum tfm_platform_err_t {
32+
TFM_PLATFORM_ERR_SUCCESS = 0,
33+
TFM_PLATFORM_ERR_SYSTEM_ERROR,
34+
TFM_PLATFORM_ERR_INVALID_PARAM,
35+
TFM_PLATFORM_ERR_NOT_SUPPORTED,
36+
37+
/* Following entry is only to ensure the error code of int size */
38+
TFM_PLATFORM_ERR_FORCE_INT_SIZE = INT_MAX
39+
};
40+
41+
typedef int32_t tfm_platform_ioctl_req_t;
42+
43+
/*!
44+
* \brief Performs a platform-specific service
45+
*
46+
* \param[in] request Request identifier (valid values vary
47+
* based on the platform)
48+
* \param[in] input Input buffer to the requested service (or NULL)
49+
* \param[in,out] output Output buffer to the requested service (or NULL)
50+
*
51+
* \return Returns values as specified by the \ref tfm_platform_err_t
52+
*/
53+
enum tfm_platform_err_t tfm_platform_ioctl(tfm_platform_ioctl_req_t request,
54+
psa_invec *input,
55+
psa_outvec *output);
56+
57+
58+
#ifdef __cplusplus
59+
}
60+
#endif
61+
62+
#endif /* __TFM_PLATFORM_API__ */

‎components/TARGET_PSA/services/inc/autogen_sid.h

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
#define PSA_PLATFORM_LC_GET 0x00011000
5757
#define PSA_PLATFORM_LC_SET 0x00011001
5858
#define PSA_PLATFORM_SYSTEM_RESET 0x00011002
59+
#define PSA_PLATFORM_IOCTL 0x00011003
5960

6061
/* -----------------------------------------------------------------------------
6162
* ITS Service IDs

‎components/TARGET_PSA/services/inc/mbed_spm_partitions.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
* -------------------------------------------------------------------------- */
116116
#define PLATFORM_ID 8
117117

118-
#define PLATFORM_ROT_SRV_COUNT (3UL)
118+
#define PLATFORM_ROT_SRV_COUNT (4UL)
119119
#define PLATFORM_EXT_ROT_SRV_COUNT (1UL)
120120

121121

@@ -127,11 +127,14 @@
127127
#define PSA_PLATFORM_LC_SET_MSK (1UL << PSA_PLATFORM_LC_SET_MSK_POS)
128128
#define PSA_PLATFORM_SYSTEM_RESET_MSK_POS (6UL)
129129
#define PSA_PLATFORM_SYSTEM_RESET_MSK (1UL << PSA_PLATFORM_SYSTEM_RESET_MSK_POS)
130+
#define PSA_PLATFORM_IOCTL_MSK_POS (7UL)
131+
#define PSA_PLATFORM_IOCTL_MSK (1UL << PSA_PLATFORM_IOCTL_MSK_POS)
130132

131133
#define PLATFORM_WAIT_ANY_SID_MSK (\
132134
PSA_PLATFORM_LC_GET_MSK | \
133135
PSA_PLATFORM_LC_SET_MSK | \
134-
PSA_PLATFORM_SYSTEM_RESET_MSK)
136+
PSA_PLATFORM_SYSTEM_RESET_MSK | \
137+
PSA_PLATFORM_IOCTL_MSK)
135138

136139

137140
/* -----------------------------------------------------------------------------

‎components/TARGET_PSA/services/platform/COMPONENT_PSA_SRV_IMPL/platform_srv_impl.c

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2019 ARM Limited
1+
/* Copyright (c) 2019-2020 Arm Limited
22
*
33
* SPDX-License-Identifier: Apache-2.0
44
*
@@ -45,3 +45,12 @@ MBED_WEAK void mbed_psa_system_reset_impl(void)
4545
/* Reset the system */
4646
NVIC_SystemReset();
4747
}
48+
49+
MBED_WEAK enum tfm_platform_err_t tfm_platform_hal_ioctl(tfm_platform_ioctl_req_t request,
50+
psa_invec *in_vec,
51+
psa_outvec *out_vec)
52+
{
53+
(void)in_vec;
54+
(void)out_vec;
55+
return TFM_PLATFORM_ERR_NOT_SUPPORTED;
56+
}

‎components/TARGET_PSA/services/platform/COMPONENT_PSA_SRV_IMPL/platform_srv_impl.h

+16-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2019 ARM Limited
1+
/* Copyright (c) 2019-2020 Arm Limited
22
*
33
* SPDX-License-Identifier: Apache-2.0
44
*
@@ -19,10 +19,25 @@
1919
#define __PLATFROM_SRV_IMPL_H__
2020

2121
#include "psa/client.h"
22+
#include "psa/lifecycle.h"
2223
#include "mbed_toolchain.h"
24+
#include "tfm_platform_api.h"
2325

2426
psa_status_t psa_platfrom_lifecycle_get_impl(uint32_t *lc_state);
2527
psa_status_t psa_platfrom_lifecycle_change_request_impl(uint32_t lc_state);
2628
MBED_NORETURN void mbed_psa_system_reset_impl(void);
2729

30+
/*!
31+
* \brief Performs a platform-specific service
32+
*
33+
* \param[in] request Request identifier (valid values vary
34+
* based on the platform)
35+
* \param[in] in_vec Input buffer to the requested service (or NULL)
36+
* \param[out] out_vec Output buffer to the requested service (or NULL)
37+
*
38+
* \return Returns values as specified by the \ref tfm_platform_err_t
39+
*/
40+
enum tfm_platform_err_t tfm_platform_hal_ioctl(tfm_platform_ioctl_req_t request,
41+
psa_invec *in_vec,
42+
psa_outvec *out_vec);
2843
#endif // __PLATFROM_SRV_IMPL_H__

‎components/TARGET_PSA/services/platform/COMPONENT_PSA_SRV_IPC/platform_ipc.c

+51-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2019 ARM Limited
1+
/* Copyright (c) 2019-2020 Arm Limited
22
*
33
* SPDX-License-Identifier: Apache-2.0
44
*
@@ -20,6 +20,7 @@
2020
#include "psa/client.h"
2121
#include "mbed_toolchain.h"
2222
#include "mbed_error.h"
23+
#include "tfm_platform_api.h"
2324

2425
uint32_t psa_security_lifecycle_state(void)
2526
{
@@ -66,3 +67,52 @@ void mbed_psa_system_reset(void)
6667
}
6768
error("reset failed - cannot connect to service handle=%ld", conn);
6869
}
70+
71+
enum tfm_platform_err_t
72+
tfm_platform_ioctl(tfm_platform_ioctl_req_t request,
73+
psa_invec *input, psa_outvec *output) {
74+
tfm_platform_ioctl_req_t req = request;
75+
struct psa_invec in_vec[2] = { {0} };
76+
size_t inlen, outlen;
77+
psa_status_t status = PSA_ERROR_CONNECTION_REFUSED;
78+
psa_handle_t handle = PSA_NULL_HANDLE;
79+
80+
in_vec[0].base = &req;
81+
in_vec[0].len = sizeof(req);
82+
if (input != NULL)
83+
{
84+
in_vec[1].base = input->base;
85+
in_vec[1].len = input->len;
86+
inlen = 2;
87+
} else
88+
{
89+
inlen = 1;
90+
}
91+
92+
if (output != NULL)
93+
{
94+
outlen = 1;
95+
} else
96+
{
97+
outlen = 0;
98+
}
99+
100+
handle = psa_connect(PSA_PLATFORM_IOCTL, 1);
101+
if (handle <= 0)
102+
{
103+
return TFM_PLATFORM_ERR_SYSTEM_ERROR;
104+
}
105+
106+
status = psa_call(handle,
107+
in_vec, inlen,
108+
output, outlen);
109+
psa_close(handle);
110+
111+
if (status < PSA_SUCCESS)
112+
{
113+
return TFM_PLATFORM_ERR_SYSTEM_ERROR;
114+
} else
115+
{
116+
return (enum tfm_platform_err_t) status;
117+
}
118+
}

‎components/TARGET_PSA/services/platform/COMPONENT_SPE/platform_partition.c

+97-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2019 ARM Limited
1+
/* Copyright (c) 2019-2020 Arm Limited
22
*
33
* SPDX-License-Identifier: Apache-2.0
44
*
@@ -17,9 +17,13 @@
1717

1818
#include "mbed_spm_partitions.h"
1919
#include "platform_srv_impl.h"
20+
#include "psa/lifecycle.h"
2021
#include "psa/internal_trusted_storage.h"
2122
#include "psa/service.h"
2223

24+
#define INPUT_BUFFER_SIZE 64
25+
#define OUTPUT_BUFFER_SIZE 64
26+
2327
typedef psa_status_t (*SignalHandler)(psa_msg_t *);
2428

2529
static psa_status_t lifecycle_get(psa_msg_t *msg)
@@ -58,6 +62,92 @@ static MBED_NORETURN psa_status_t system_reset_request(psa_msg_t *msg)
5862
mbed_psa_system_reset_impl();
5963
}
6064

65+
static enum tfm_platform_err_t
66+
platform_sp_ioctl_ipc(const psa_msg_t *msg) {
67+
void *input = NULL;
68+
void *output = NULL;
69+
psa_invec invec = {0};
70+
psa_outvec outvec = {0};
71+
uint8_t input_buffer[INPUT_BUFFER_SIZE] = {0};
72+
uint8_t output_buffer[OUTPUT_BUFFER_SIZE] = {0};
73+
tfm_platform_ioctl_req_t request = 0;
74+
enum tfm_platform_err_t ret = TFM_PLATFORM_ERR_SYSTEM_ERROR;
75+
size_t num = 0;
76+
uint32_t in_len = PSA_MAX_IOVEC;
77+
uint32_t out_len = PSA_MAX_IOVEC;
78+
79+
while ((in_len > 0) && (msg->in_size[in_len - 1] == 0))
80+
{
81+
in_len--;
82+
}
83+
84+
while ((out_len > 0) && (msg->out_size[out_len - 1] == 0))
85+
{
86+
out_len--;
87+
}
88+
89+
if ((in_len < 1) || (in_len > 2) ||
90+
(out_len > 1))
91+
{
92+
return TFM_PLATFORM_ERR_SYSTEM_ERROR;
93+
}
94+
95+
num = psa_read(msg->handle, 0, &request, sizeof(request));
96+
if (num != sizeof(request))
97+
{
98+
return PSA_ERROR_PROGRAMMER_ERROR;
99+
}
100+
101+
if (in_len > 1)
102+
{
103+
if (msg->in_size[1] > INPUT_BUFFER_SIZE) {
104+
return PSA_ERROR_PROGRAMMER_ERROR;
105+
}
106+
num = psa_read(msg->handle, 1, &input_buffer, msg->in_size[1]);
107+
if (num != msg->in_size[1]) {
108+
return PSA_ERROR_PROGRAMMER_ERROR;
109+
}
110+
invec.base = input_buffer;
111+
invec.len = msg->in_size[1];
112+
input = &invec;
113+
}
114+
115+
if (out_len > 0)
116+
{
117+
if (msg->out_size[0] > OUTPUT_BUFFER_SIZE) {
118+
return PSA_ERROR_PROGRAMMER_ERROR;
119+
}
120+
outvec.base = output_buffer;
121+
outvec.len = msg->out_size[0];
122+
output = &outvec;
123+
}
124+
125+
ret = tfm_platform_hal_ioctl(request, input, output);
126+
127+
if (output != NULL)
128+
{
129+
psa_write(msg->handle, 0, outvec.base, outvec.len);
130+
}
131+
132+
return ret;
133+
}
134+
135+
static psa_status_t platform_ioctl(psa_msg_t *msg)
136+
{
137+
/* platform_sp_ioctl_ipc returns either psa_status_t or one of the
138+
* following errorcodes:
139+
* enum tfm_platform_err_t {
140+
* TFM_PLATFORM_ERR_SUCCESS = 0,
141+
* TFM_PLATFORM_ERR_SYSTEM_ERROR,
142+
* TFM_PLATFORM_ERR_INVALID_PARAM,
143+
* TFM_PLATFORM_ERR_NOT_SUPPORTED,
144+
*
145+
* TFM_PLATFORM_ERR_FORCE_INT_SIZE = INT_MAX
146+
* };
147+
*/
148+
return platform_sp_ioctl_ipc(msg);
149+
}
150+
61151
static void message_handler(psa_msg_t *msg, SignalHandler handler)
62152
{
63153
psa_status_t status = PSA_SUCCESS;
@@ -102,5 +192,11 @@ void platform_partition_entry(void *ptr)
102192
}
103193
message_handler(&msg, system_reset_request);
104194
}
195+
if ((signals & PSA_PLATFORM_IOCTL_MSK) != 0) {
196+
if (PSA_SUCCESS != psa_get(PSA_PLATFORM_IOCTL_MSK, &msg)) {
197+
continue;
198+
}
199+
message_handler(&msg, platform_ioctl);
200+
}
105201
}
106202
}

‎components/TARGET_PSA/services/platform/platform_psa.json

+8
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@
2929
"non_secure_clients": true,
3030
"minor_version": 1,
3131
"minor_policy": "RELAXED"
32+
},
33+
{
34+
"name": "PSA_PLATFORM_IOCTL",
35+
"identifier": "0x00011003",
36+
"signal": "PSA_PLATFORM_IOCTL_MSK",
37+
"non_secure_clients": true,
38+
"minor_version": 1,
39+
"minor_policy": "RELAXED"
3240
}
3341
],
3442
"extern_sids": [

‎features/storage/kvstore/conf/global/mbed_lib.json

+3
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
},
4444
"ARM_MUSCA_A1_S": {
4545
"storage_type": "TDB_INTERNAL"
46+
},
47+
"ARM_MUSCA_B1_S": {
48+
"storage_type": "TDB_INTERNAL"
4649
}
4750
}
4851
}

0 commit comments

Comments
 (0)