Arm FF-A firmware driver updates for v6.1
Small set of changes in preparation to add support for FF-A v1.1 specification later. It mainly contains: 1. Splitting up ffa_ops into different categories namely information, message and memory. It helps to make info and memory operations independent from ffa_device so thata generic memory management module can use it without specific ffa_dev. 2. Adds support for querying FF-A features and use the same to detect the support for 64-bit operations. 3. Adds v1.1 get_partition_info support and use the same to set up 32-bit execution mode flag automatically. 4. Adds pointer to the ffa_dev_ops in struct ffa_dev and drop ffa_dev_ops_get() which enables to drop ffa_ops in optee_ffa structure using ffa_dev->ops directly. Additionally ffa_dev_ops is renamed as ffa_ops. -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEunHlEgbzHrJD3ZPhAEG6vDF+4pgFAmMgVOEACgkQAEG6vDF+ 4phosQ//Q6tnJtcxgw7AeioIeGrXEAQy9Psyt8JrGixTHWSgq42G8Z0PKPO7MwFn F5RxVSE85E4wLBLu3xiuR1mlAglBOvec3cY4/4XBfN8nxzYUBiaOn8U7Jjnh3QYk vp0MTzECsi9a2T9T4zr0hLAdO/5uZBG16nf45iKOo9qEF6KS7WZWhdPHcyG4MpCH u6L2aKGb0XzfzT0YAHxvOipVTdYg4smtmhtOj5vvuD1XEve4ARh8WjhNFwE2L6zt 6RH/CgzhEJFOJkR/WjNdlcD9b/9QuwvmIORXFUP7jTIR/SYHB4k7xutz/DD2L4/P Xp/qiNrlrQnXpdMbYbr5S9e1jlPfjwbsiG5CNf620gS+Up5ZLD+Vnhu64A+Bfml2 8YSjJHNurkiCzTzpawGiRl0uGEwvvOhZBnlGaaeJP9ga98dQc5eom+qLbeDyT/dK ESILyaetQniHCUU+hIbZ9jnfj0sdlgd5gF6Lbsnqdy25KktIiVzscL0Wkwl5jY6C JiCv++6ieH44NrDTNaFzF/MjpBcBxXmp/qposT2wuPHxdY+OPnbjorGoLZP1F2Ns i/+1l724sm1ETdwm/eVn9aWoH681G1APd45xYE2khLme7o9V+xapJD5khQN0nSet gJ20gstIDjHBhOGYCFg/Q2l7HlrvrFYXLgN/4GI8z6CJUuUCpj0= =u/KH -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmMjhesACgkQmmx57+YA GNlVfBAAk3s11gubrUNcY1HLhZXkAY/QmNVt8yEnP6CjMkOc3nIAVqtjklXJ6+dp WtMsJUx993DH8wmGvid4IF2BWPTSeQ6xMfx5dqKgFLg1fIPRejomD2g+JtPlKyFO UeOzg0T7H3Fht3UnYH3D7muc1zkFXumwZPATqVJY8vFF8jJTnQEfoy0iN1qYBM4Y ex1EXteXDbhA0jezmqGlTMcDGNgZs1JeYBciaZl4U/pH2dF79tTUDeQh/l4ZbtTd Z1V8mvbZHwFuWax2frPeVFnVGYD3VP5c28/qxLYrueYEaSEbOtYFDSkbP0U2D4GG jhYO2PPCPw/qxjx8PGfjciAK1y4WKwTXs+D4KfdY+IyhuoTSi+VN0stCFQGoOf06 eMy/eUTCA02ICe3IKcO3KqZbAH3mBpiw7AgmMAkSRSdOadFKfZ4PauTdmR/a7gJL E4MyMwfY1yJ3oJeHx/WvFPL4Iwl26QTx2q/srjDlTJ9laHQv/D1RBi51zwnEC8bp kxuP69hqapiroiKAJcnHGpJX4icm2vV7YUBGqF03Sw+SByiJYGt47ojEcbA/kEDk Cis383/TN2xNFSZ+uu5MWj2vkbus5m8OQ2OvDgJ7lUoPVgjBpzd7kBuyT5bpY+aU m//viWe28xjOQz0KmB4pnitBO2xmYdo2G94Xak/xgu7ksAVItnY= =aIAe -----END PGP SIGNATURE----- Merge tag 'ffa-updates-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/drivers Arm FF-A firmware driver updates for v6.1 Small set of changes in preparation to add support for FF-A v1.1 specification later. It mainly contains: 1. Splitting up ffa_ops into different categories namely information, message and memory. It helps to make info and memory operations independent from ffa_device so thata generic memory management module can use it without specific ffa_dev. 2. Adds support for querying FF-A features and use the same to detect the support for 64-bit operations. 3. Adds v1.1 get_partition_info support and use the same to set up 32-bit execution mode flag automatically. 4. Adds pointer to the ffa_dev_ops in struct ffa_dev and drop ffa_dev_ops_get() which enables to drop ffa_ops in optee_ffa structure using ffa_dev->ops directly. Additionally ffa_dev_ops is renamed as ffa_ops. * tag 'ffa-updates-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux: firmware: arm_ffa: Split up ffa_ops into info, message and memory operations firmware: arm_ffa: Set up 32bit execution mode flag using partiion property firmware: arm_ffa: Add v1.1 get_partition_info support firmware: arm_ffa: Rename ffa_dev_ops as ffa_ops firmware: arm_ffa: Make memory apis ffa_device independent firmware: arm_ffa: Use FFA_FEATURES to detect if native versions are supported firmware: arm_ffa: Add support for querying FF-A features firmware: arm_ffa: Remove ffa_dev_ops_get() tee: optee: Drop ffa_ops in optee_ffa structure using ffa_dev->ops directly firmware: arm_ffa: Add pointer to the ffa_dev_ops in struct ffa_dev Link: https://lore.kernel.org/r/20220913100612.2924643-1-sudeep.holla@arm.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
387969b7ab
|
@ -167,7 +167,8 @@ bool ffa_device_is_valid(struct ffa_device *ffa_dev)
|
|||
return valid;
|
||||
}
|
||||
|
||||
struct ffa_device *ffa_device_register(const uuid_t *uuid, int vm_id)
|
||||
struct ffa_device *ffa_device_register(const uuid_t *uuid, int vm_id,
|
||||
const struct ffa_ops *ops)
|
||||
{
|
||||
int ret;
|
||||
struct device *dev;
|
||||
|
@ -183,6 +184,7 @@ struct ffa_device *ffa_device_register(const uuid_t *uuid, int vm_id)
|
|||
dev_set_name(&ffa_dev->dev, "arm-ffa-%04x", vm_id);
|
||||
|
||||
ffa_dev->vm_id = vm_id;
|
||||
ffa_dev->ops = ops;
|
||||
uuid_copy(&ffa_dev->uuid, uuid);
|
||||
|
||||
ret = device_register(&ffa_dev->dev);
|
||||
|
|
|
@ -163,6 +163,7 @@ struct ffa_drv_info {
|
|||
struct mutex tx_lock; /* lock to protect Tx buffer */
|
||||
void *rx_buffer;
|
||||
void *tx_buffer;
|
||||
bool mem_ops_native;
|
||||
};
|
||||
|
||||
static struct ffa_drv_info *drv_info;
|
||||
|
@ -263,18 +264,24 @@ static int ffa_rxtx_unmap(u16 vm_id)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#define PARTITION_INFO_GET_RETURN_COUNT_ONLY BIT(0)
|
||||
|
||||
/* buffer must be sizeof(struct ffa_partition_info) * num_partitions */
|
||||
static int
|
||||
__ffa_partition_info_get(u32 uuid0, u32 uuid1, u32 uuid2, u32 uuid3,
|
||||
struct ffa_partition_info *buffer, int num_partitions)
|
||||
{
|
||||
int count;
|
||||
int idx, count, flags = 0, sz, buf_sz;
|
||||
ffa_value_t partition_info;
|
||||
|
||||
if (!buffer || !num_partitions) /* Just get the count for now */
|
||||
flags = PARTITION_INFO_GET_RETURN_COUNT_ONLY;
|
||||
|
||||
mutex_lock(&drv_info->rx_lock);
|
||||
invoke_ffa_fn((ffa_value_t){
|
||||
.a0 = FFA_PARTITION_INFO_GET,
|
||||
.a1 = uuid0, .a2 = uuid1, .a3 = uuid2, .a4 = uuid3,
|
||||
.a5 = flags,
|
||||
}, &partition_info);
|
||||
|
||||
if (partition_info.a0 == FFA_ERROR) {
|
||||
|
@ -284,8 +291,19 @@ __ffa_partition_info_get(u32 uuid0, u32 uuid1, u32 uuid2, u32 uuid3,
|
|||
|
||||
count = partition_info.a2;
|
||||
|
||||
if (drv_info->version > FFA_VERSION_1_0) {
|
||||
buf_sz = sz = partition_info.a3;
|
||||
if (sz > sizeof(*buffer))
|
||||
buf_sz = sizeof(*buffer);
|
||||
} else {
|
||||
/* FFA_VERSION_1_0 lacks size in the response */
|
||||
buf_sz = sz = 8;
|
||||
}
|
||||
|
||||
if (buffer && count <= num_partitions)
|
||||
memcpy(buffer, drv_info->rx_buffer, sizeof(*buffer) * count);
|
||||
for (idx = 0; idx < count; idx++)
|
||||
memcpy(buffer + idx, drv_info->rx_buffer + idx * sz,
|
||||
buf_sz);
|
||||
|
||||
ffa_rx_release();
|
||||
|
||||
|
@ -571,6 +589,39 @@ static int ffa_memory_reclaim(u64 g_handle, u32 flags)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int ffa_features(u32 func_feat_id, u32 input_props,
|
||||
u32 *if_props_1, u32 *if_props_2)
|
||||
{
|
||||
ffa_value_t id;
|
||||
|
||||
if (!ARM_SMCCC_IS_FAST_CALL(func_feat_id) && input_props) {
|
||||
pr_err("%s: Invalid Parameters: %x, %x", __func__,
|
||||
func_feat_id, input_props);
|
||||
return ffa_to_linux_errno(FFA_RET_INVALID_PARAMETERS);
|
||||
}
|
||||
|
||||
invoke_ffa_fn((ffa_value_t){
|
||||
.a0 = FFA_FEATURES, .a1 = func_feat_id, .a2 = input_props,
|
||||
}, &id);
|
||||
|
||||
if (id.a0 == FFA_ERROR)
|
||||
return ffa_to_linux_errno((int)id.a2);
|
||||
|
||||
if (if_props_1)
|
||||
*if_props_1 = id.a2;
|
||||
if (if_props_2)
|
||||
*if_props_2 = id.a3;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void ffa_set_up_mem_ops_native_flag(void)
|
||||
{
|
||||
if (!ffa_features(FFA_FN_NATIVE(MEM_LEND), 0, NULL, NULL) ||
|
||||
!ffa_features(FFA_FN_NATIVE(MEM_SHARE), 0, NULL, NULL))
|
||||
drv_info->mem_ops_native = true;
|
||||
}
|
||||
|
||||
static u32 ffa_api_version_get(void)
|
||||
{
|
||||
return drv_info->version;
|
||||
|
@ -597,11 +648,19 @@ static int ffa_partition_info_get(const char *uuid_str,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void ffa_mode_32bit_set(struct ffa_device *dev)
|
||||
static void _ffa_mode_32bit_set(struct ffa_device *dev)
|
||||
{
|
||||
dev->mode_32bit = true;
|
||||
}
|
||||
|
||||
static void ffa_mode_32bit_set(struct ffa_device *dev)
|
||||
{
|
||||
if (drv_info->version > FFA_VERSION_1_0)
|
||||
return;
|
||||
|
||||
_ffa_mode_32bit_set(dev);
|
||||
}
|
||||
|
||||
static int ffa_sync_send_receive(struct ffa_device *dev,
|
||||
struct ffa_send_direct_data *data)
|
||||
{
|
||||
|
@ -609,17 +668,15 @@ static int ffa_sync_send_receive(struct ffa_device *dev,
|
|||
dev->mode_32bit, data);
|
||||
}
|
||||
|
||||
static int
|
||||
ffa_memory_share(struct ffa_device *dev, struct ffa_mem_ops_args *args)
|
||||
static int ffa_memory_share(struct ffa_mem_ops_args *args)
|
||||
{
|
||||
if (dev->mode_32bit)
|
||||
return ffa_memory_ops(FFA_MEM_SHARE, args);
|
||||
if (drv_info->mem_ops_native)
|
||||
return ffa_memory_ops(FFA_FN_NATIVE(MEM_SHARE), args);
|
||||
|
||||
return ffa_memory_ops(FFA_FN_NATIVE(MEM_SHARE), args);
|
||||
return ffa_memory_ops(FFA_MEM_SHARE, args);
|
||||
}
|
||||
|
||||
static int
|
||||
ffa_memory_lend(struct ffa_device *dev, struct ffa_mem_ops_args *args)
|
||||
static int ffa_memory_lend(struct ffa_mem_ops_args *args)
|
||||
{
|
||||
/* Note that upon a successful MEM_LEND request the caller
|
||||
* must ensure that the memory region specified is not accessed
|
||||
|
@ -628,36 +685,47 @@ ffa_memory_lend(struct ffa_device *dev, struct ffa_mem_ops_args *args)
|
|||
* however on systems without a hypervisor the responsibility
|
||||
* falls to the calling kernel driver to prevent access.
|
||||
*/
|
||||
if (dev->mode_32bit)
|
||||
return ffa_memory_ops(FFA_MEM_LEND, args);
|
||||
if (drv_info->mem_ops_native)
|
||||
return ffa_memory_ops(FFA_FN_NATIVE(MEM_LEND), args);
|
||||
|
||||
return ffa_memory_ops(FFA_FN_NATIVE(MEM_LEND), args);
|
||||
return ffa_memory_ops(FFA_MEM_LEND, args);
|
||||
}
|
||||
|
||||
static const struct ffa_dev_ops ffa_ops = {
|
||||
static const struct ffa_info_ops ffa_drv_info_ops = {
|
||||
.api_version_get = ffa_api_version_get,
|
||||
.partition_info_get = ffa_partition_info_get,
|
||||
};
|
||||
|
||||
static const struct ffa_msg_ops ffa_drv_msg_ops = {
|
||||
.mode_32bit_set = ffa_mode_32bit_set,
|
||||
.sync_send_receive = ffa_sync_send_receive,
|
||||
};
|
||||
|
||||
static const struct ffa_mem_ops ffa_drv_mem_ops = {
|
||||
.memory_reclaim = ffa_memory_reclaim,
|
||||
.memory_share = ffa_memory_share,
|
||||
.memory_lend = ffa_memory_lend,
|
||||
};
|
||||
|
||||
const struct ffa_dev_ops *ffa_dev_ops_get(struct ffa_device *dev)
|
||||
{
|
||||
if (ffa_device_is_valid(dev))
|
||||
return &ffa_ops;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(ffa_dev_ops_get);
|
||||
static const struct ffa_ops ffa_drv_ops = {
|
||||
.info_ops = &ffa_drv_info_ops,
|
||||
.msg_ops = &ffa_drv_msg_ops,
|
||||
.mem_ops = &ffa_drv_mem_ops,
|
||||
};
|
||||
|
||||
void ffa_device_match_uuid(struct ffa_device *ffa_dev, const uuid_t *uuid)
|
||||
{
|
||||
int count, idx;
|
||||
struct ffa_partition_info *pbuf, *tpbuf;
|
||||
|
||||
/*
|
||||
* FF-A v1.1 provides UUID for each partition as part of the discovery
|
||||
* API, the discovered UUID must be populated in the device's UUID and
|
||||
* there is no need to copy the same from the driver table.
|
||||
*/
|
||||
if (drv_info->version > FFA_VERSION_1_0)
|
||||
return;
|
||||
|
||||
count = ffa_partition_probe(uuid, &pbuf);
|
||||
if (count <= 0)
|
||||
return;
|
||||
|
@ -671,6 +739,7 @@ void ffa_device_match_uuid(struct ffa_device *ffa_dev, const uuid_t *uuid)
|
|||
static void ffa_setup_partitions(void)
|
||||
{
|
||||
int count, idx;
|
||||
uuid_t uuid;
|
||||
struct ffa_device *ffa_dev;
|
||||
struct ffa_partition_info *pbuf, *tpbuf;
|
||||
|
||||
|
@ -681,19 +750,24 @@ static void ffa_setup_partitions(void)
|
|||
}
|
||||
|
||||
for (idx = 0, tpbuf = pbuf; idx < count; idx++, tpbuf++) {
|
||||
/* Note that the &uuid_null parameter will require
|
||||
import_uuid(&uuid, (u8 *)tpbuf->uuid);
|
||||
|
||||
/* Note that if the UUID will be uuid_null, that will require
|
||||
* ffa_device_match() to find the UUID of this partition id
|
||||
* with help of ffa_device_match_uuid(). Once the FF-A spec
|
||||
* is updated to provide correct UUID here for each partition
|
||||
* as part of the discovery API, we need to pass the
|
||||
* discovered UUID here instead.
|
||||
* with help of ffa_device_match_uuid(). FF-A v1.1 and above
|
||||
* provides UUID here for each partition as part of the
|
||||
* discovery API and the same is passed.
|
||||
*/
|
||||
ffa_dev = ffa_device_register(&uuid_null, tpbuf->id);
|
||||
ffa_dev = ffa_device_register(&uuid, tpbuf->id, &ffa_drv_ops);
|
||||
if (!ffa_dev) {
|
||||
pr_err("%s: failed to register partition ID 0x%x\n",
|
||||
__func__, tpbuf->id);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (drv_info->version > FFA_VERSION_1_0 &&
|
||||
!(tpbuf->properties & FFA_PARTITION_AARCH64_EXEC))
|
||||
_ffa_mode_32bit_set(ffa_dev);
|
||||
}
|
||||
kfree(pbuf);
|
||||
}
|
||||
|
@ -751,6 +825,8 @@ static int __init ffa_init(void)
|
|||
|
||||
ffa_setup_partitions();
|
||||
|
||||
ffa_set_up_mem_ops_native_flag();
|
||||
|
||||
return 0;
|
||||
free_pages:
|
||||
if (drv_info->tx_buffer)
|
||||
|
|
|
@ -271,8 +271,8 @@ static int optee_ffa_shm_register(struct tee_context *ctx, struct tee_shm *shm,
|
|||
unsigned long start)
|
||||
{
|
||||
struct optee *optee = tee_get_drvdata(ctx->teedev);
|
||||
const struct ffa_dev_ops *ffa_ops = optee->ffa.ffa_ops;
|
||||
struct ffa_device *ffa_dev = optee->ffa.ffa_dev;
|
||||
const struct ffa_mem_ops *mem_ops = ffa_dev->ops->mem_ops;
|
||||
struct ffa_mem_region_attributes mem_attr = {
|
||||
.receiver = ffa_dev->vm_id,
|
||||
.attrs = FFA_MEM_RW,
|
||||
|
@ -294,14 +294,14 @@ static int optee_ffa_shm_register(struct tee_context *ctx, struct tee_shm *shm,
|
|||
if (rc)
|
||||
return rc;
|
||||
args.sg = sgt.sgl;
|
||||
rc = ffa_ops->memory_share(ffa_dev, &args);
|
||||
rc = mem_ops->memory_share(&args);
|
||||
sg_free_table(&sgt);
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
rc = optee_shm_add_ffa_handle(optee, shm, args.g_handle);
|
||||
if (rc) {
|
||||
ffa_ops->memory_reclaim(args.g_handle, 0);
|
||||
mem_ops->memory_reclaim(args.g_handle, 0);
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
@ -314,8 +314,9 @@ static int optee_ffa_shm_unregister(struct tee_context *ctx,
|
|||
struct tee_shm *shm)
|
||||
{
|
||||
struct optee *optee = tee_get_drvdata(ctx->teedev);
|
||||
const struct ffa_dev_ops *ffa_ops = optee->ffa.ffa_ops;
|
||||
struct ffa_device *ffa_dev = optee->ffa.ffa_dev;
|
||||
const struct ffa_msg_ops *msg_ops = ffa_dev->ops->msg_ops;
|
||||
const struct ffa_mem_ops *mem_ops = ffa_dev->ops->mem_ops;
|
||||
u64 global_handle = shm->sec_world_id;
|
||||
struct ffa_send_direct_data data = {
|
||||
.data0 = OPTEE_FFA_UNREGISTER_SHM,
|
||||
|
@ -327,11 +328,11 @@ static int optee_ffa_shm_unregister(struct tee_context *ctx,
|
|||
optee_shm_rem_ffa_handle(optee, global_handle);
|
||||
shm->sec_world_id = 0;
|
||||
|
||||
rc = ffa_ops->sync_send_receive(ffa_dev, &data);
|
||||
rc = msg_ops->sync_send_receive(ffa_dev, &data);
|
||||
if (rc)
|
||||
pr_err("Unregister SHM id 0x%llx rc %d\n", global_handle, rc);
|
||||
|
||||
rc = ffa_ops->memory_reclaim(global_handle, 0);
|
||||
rc = mem_ops->memory_reclaim(global_handle, 0);
|
||||
if (rc)
|
||||
pr_err("mem_reclaim: 0x%llx %d", global_handle, rc);
|
||||
|
||||
|
@ -342,7 +343,7 @@ static int optee_ffa_shm_unregister_supp(struct tee_context *ctx,
|
|||
struct tee_shm *shm)
|
||||
{
|
||||
struct optee *optee = tee_get_drvdata(ctx->teedev);
|
||||
const struct ffa_dev_ops *ffa_ops = optee->ffa.ffa_ops;
|
||||
const struct ffa_mem_ops *mem_ops;
|
||||
u64 global_handle = shm->sec_world_id;
|
||||
int rc;
|
||||
|
||||
|
@ -353,7 +354,8 @@ static int optee_ffa_shm_unregister_supp(struct tee_context *ctx,
|
|||
*/
|
||||
|
||||
optee_shm_rem_ffa_handle(optee, global_handle);
|
||||
rc = ffa_ops->memory_reclaim(global_handle, 0);
|
||||
mem_ops = optee->ffa.ffa_dev->ops->mem_ops;
|
||||
rc = mem_ops->memory_reclaim(global_handle, 0);
|
||||
if (rc)
|
||||
pr_err("mem_reclaim: 0x%llx %d", global_handle, rc);
|
||||
|
||||
|
@ -529,8 +531,8 @@ static int optee_ffa_yielding_call(struct tee_context *ctx,
|
|||
struct optee_msg_arg *rpc_arg)
|
||||
{
|
||||
struct optee *optee = tee_get_drvdata(ctx->teedev);
|
||||
const struct ffa_dev_ops *ffa_ops = optee->ffa.ffa_ops;
|
||||
struct ffa_device *ffa_dev = optee->ffa.ffa_dev;
|
||||
const struct ffa_msg_ops *msg_ops = ffa_dev->ops->msg_ops;
|
||||
struct optee_call_waiter w;
|
||||
u32 cmd = data->data0;
|
||||
u32 w4 = data->data1;
|
||||
|
@ -541,7 +543,7 @@ static int optee_ffa_yielding_call(struct tee_context *ctx,
|
|||
/* Initialize waiter */
|
||||
optee_cq_wait_init(&optee->call_queue, &w);
|
||||
while (true) {
|
||||
rc = ffa_ops->sync_send_receive(ffa_dev, data);
|
||||
rc = msg_ops->sync_send_receive(ffa_dev, data);
|
||||
if (rc)
|
||||
goto done;
|
||||
|
||||
|
@ -576,7 +578,7 @@ static int optee_ffa_yielding_call(struct tee_context *ctx,
|
|||
* OP-TEE has returned with a RPC request.
|
||||
*
|
||||
* Note that data->data4 (passed in register w7) is already
|
||||
* filled in by ffa_ops->sync_send_receive() returning
|
||||
* filled in by ffa_mem_ops->sync_send_receive() returning
|
||||
* above.
|
||||
*/
|
||||
cond_resched();
|
||||
|
@ -652,14 +654,15 @@ static int optee_ffa_do_call_with_arg(struct tee_context *ctx,
|
|||
*/
|
||||
|
||||
static bool optee_ffa_api_is_compatbile(struct ffa_device *ffa_dev,
|
||||
const struct ffa_dev_ops *ops)
|
||||
const struct ffa_ops *ops)
|
||||
{
|
||||
const struct ffa_msg_ops *msg_ops = ops->msg_ops;
|
||||
struct ffa_send_direct_data data = { OPTEE_FFA_GET_API_VERSION };
|
||||
int rc;
|
||||
|
||||
ops->mode_32bit_set(ffa_dev);
|
||||
msg_ops->mode_32bit_set(ffa_dev);
|
||||
|
||||
rc = ops->sync_send_receive(ffa_dev, &data);
|
||||
rc = msg_ops->sync_send_receive(ffa_dev, &data);
|
||||
if (rc) {
|
||||
pr_err("Unexpected error %d\n", rc);
|
||||
return false;
|
||||
|
@ -672,7 +675,7 @@ static bool optee_ffa_api_is_compatbile(struct ffa_device *ffa_dev,
|
|||
}
|
||||
|
||||
data = (struct ffa_send_direct_data){ OPTEE_FFA_GET_OS_VERSION };
|
||||
rc = ops->sync_send_receive(ffa_dev, &data);
|
||||
rc = msg_ops->sync_send_receive(ffa_dev, &data);
|
||||
if (rc) {
|
||||
pr_err("Unexpected error %d\n", rc);
|
||||
return false;
|
||||
|
@ -687,14 +690,14 @@ static bool optee_ffa_api_is_compatbile(struct ffa_device *ffa_dev,
|
|||
}
|
||||
|
||||
static bool optee_ffa_exchange_caps(struct ffa_device *ffa_dev,
|
||||
const struct ffa_dev_ops *ops,
|
||||
const struct ffa_ops *ops,
|
||||
u32 *sec_caps,
|
||||
unsigned int *rpc_param_count)
|
||||
{
|
||||
struct ffa_send_direct_data data = { OPTEE_FFA_EXCHANGE_CAPABILITIES };
|
||||
int rc;
|
||||
|
||||
rc = ops->sync_send_receive(ffa_dev, &data);
|
||||
rc = ops->msg_ops->sync_send_receive(ffa_dev, &data);
|
||||
if (rc) {
|
||||
pr_err("Unexpected error %d", rc);
|
||||
return false;
|
||||
|
@ -783,7 +786,7 @@ static void optee_ffa_remove(struct ffa_device *ffa_dev)
|
|||
|
||||
static int optee_ffa_probe(struct ffa_device *ffa_dev)
|
||||
{
|
||||
const struct ffa_dev_ops *ffa_ops;
|
||||
const struct ffa_ops *ffa_ops;
|
||||
unsigned int rpc_param_count;
|
||||
struct tee_shm_pool *pool;
|
||||
struct tee_device *teedev;
|
||||
|
@ -793,11 +796,7 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
|
|||
u32 sec_caps;
|
||||
int rc;
|
||||
|
||||
ffa_ops = ffa_dev_ops_get(ffa_dev);
|
||||
if (!ffa_ops) {
|
||||
pr_warn("failed \"method\" init: ffa\n");
|
||||
return -ENOENT;
|
||||
}
|
||||
ffa_ops = ffa_dev->ops;
|
||||
|
||||
if (!optee_ffa_api_is_compatbile(ffa_dev, ffa_ops))
|
||||
return -EINVAL;
|
||||
|
@ -821,7 +820,6 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
|
|||
|
||||
optee->ops = &optee_ffa_ops;
|
||||
optee->ffa.ffa_dev = ffa_dev;
|
||||
optee->ffa.ffa_ops = ffa_ops;
|
||||
optee->rpc_param_count = rpc_param_count;
|
||||
|
||||
teedev = tee_device_alloc(&optee_ffa_clnt_desc, NULL, optee->pool,
|
||||
|
|
|
@ -111,7 +111,6 @@ struct optee_smc {
|
|||
*/
|
||||
struct optee_ffa {
|
||||
struct ffa_device *ffa_dev;
|
||||
const struct ffa_dev_ops *ffa_ops;
|
||||
/* Serializes access to @global_ids */
|
||||
struct mutex mutex;
|
||||
struct rhashtable global_ids;
|
||||
|
|
|
@ -17,6 +17,7 @@ struct ffa_device {
|
|||
bool mode_32bit;
|
||||
uuid_t uuid;
|
||||
struct device dev;
|
||||
const struct ffa_ops *ops;
|
||||
};
|
||||
|
||||
#define to_ffa_dev(d) container_of(d, struct ffa_device, dev)
|
||||
|
@ -47,17 +48,18 @@ static inline void *ffa_dev_get_drvdata(struct ffa_device *fdev)
|
|||
}
|
||||
|
||||
#if IS_REACHABLE(CONFIG_ARM_FFA_TRANSPORT)
|
||||
struct ffa_device *ffa_device_register(const uuid_t *uuid, int vm_id);
|
||||
struct ffa_device *ffa_device_register(const uuid_t *uuid, int vm_id,
|
||||
const struct ffa_ops *ops);
|
||||
void ffa_device_unregister(struct ffa_device *ffa_dev);
|
||||
int ffa_driver_register(struct ffa_driver *driver, struct module *owner,
|
||||
const char *mod_name);
|
||||
void ffa_driver_unregister(struct ffa_driver *driver);
|
||||
bool ffa_device_is_valid(struct ffa_device *ffa_dev);
|
||||
const struct ffa_dev_ops *ffa_dev_ops_get(struct ffa_device *dev);
|
||||
|
||||
#else
|
||||
static inline
|
||||
struct ffa_device *ffa_device_register(const uuid_t *uuid, int vm_id)
|
||||
struct ffa_device *ffa_device_register(const uuid_t *uuid, int vm_id,
|
||||
const struct ffa_ops *ops)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
@ -76,11 +78,6 @@ static inline void ffa_driver_unregister(struct ffa_driver *driver) {}
|
|||
static inline
|
||||
bool ffa_device_is_valid(struct ffa_device *ffa_dev) { return false; }
|
||||
|
||||
static inline
|
||||
const struct ffa_dev_ops *ffa_dev_ops_get(struct ffa_device *dev)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
#endif /* CONFIG_ARM_FFA_TRANSPORT */
|
||||
|
||||
#define ffa_register(driver) \
|
||||
|
@ -109,7 +106,10 @@ struct ffa_partition_info {
|
|||
#define FFA_PARTITION_DIRECT_SEND BIT(1)
|
||||
/* partition can send and receive indirect messages. */
|
||||
#define FFA_PARTITION_INDIRECT_MSG BIT(2)
|
||||
/* partition runs in the AArch64 execution state. */
|
||||
#define FFA_PARTITION_AARCH64_EXEC BIT(8)
|
||||
u32 properties;
|
||||
u32 uuid[4];
|
||||
};
|
||||
|
||||
/* For use with FFA_MSG_SEND_DIRECT_{REQ,RESP} which pass data via registers */
|
||||
|
@ -257,18 +257,28 @@ struct ffa_mem_ops_args {
|
|||
struct ffa_mem_region_attributes *attrs;
|
||||
};
|
||||
|
||||
struct ffa_dev_ops {
|
||||
struct ffa_info_ops {
|
||||
u32 (*api_version_get)(void);
|
||||
int (*partition_info_get)(const char *uuid_str,
|
||||
struct ffa_partition_info *buffer);
|
||||
};
|
||||
|
||||
struct ffa_msg_ops {
|
||||
void (*mode_32bit_set)(struct ffa_device *dev);
|
||||
int (*sync_send_receive)(struct ffa_device *dev,
|
||||
struct ffa_send_direct_data *data);
|
||||
};
|
||||
|
||||
struct ffa_mem_ops {
|
||||
int (*memory_reclaim)(u64 g_handle, u32 flags);
|
||||
int (*memory_share)(struct ffa_device *dev,
|
||||
struct ffa_mem_ops_args *args);
|
||||
int (*memory_lend)(struct ffa_device *dev,
|
||||
struct ffa_mem_ops_args *args);
|
||||
int (*memory_share)(struct ffa_mem_ops_args *args);
|
||||
int (*memory_lend)(struct ffa_mem_ops_args *args);
|
||||
};
|
||||
|
||||
struct ffa_ops {
|
||||
const struct ffa_info_ops *info_ops;
|
||||
const struct ffa_msg_ops *msg_ops;
|
||||
const struct ffa_mem_ops *mem_ops;
|
||||
};
|
||||
|
||||
#endif /* _LINUX_ARM_FFA_H */
|
||||
|
|
Loading…
Reference in New Issue