From patchwork Thu Jan 10 12:24:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 155144 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1835950jaa; Thu, 10 Jan 2019 04:25:45 -0800 (PST) X-Google-Smtp-Source: ALg8bN5JJfrm1kZWIc7KUV461ThWvS5aEENYzC3XpTzu0g0Gsak1qR0H19FDsWlr1/VcT/Cqv0mR X-Received: by 2002:a62:9fd9:: with SMTP id v86mr9959333pfk.191.1547123145294; Thu, 10 Jan 2019 04:25:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547123145; cv=none; d=google.com; s=arc-20160816; b=SseK9ng596gkA6oaw07aWQIkQqymk8sBKwNwFwzW9ZDvGCsPz3VRFJ49+rl/NTN2vU QOFL4WE81fA8ruOGkx1PwpT7vN10MgDUCq0Ph1Bs5HJOawugEotLFi+CeyXJUXCLtQ2p NKsUurFS6gDp8CEEFJ2284HoBCiMuijizZAW9M1biZ5FkzTcS7N+0CHr6atgPw9IJV3g y/BWuD6IZYbt4ZI5gddn2HTFDl41DIX/YPWaCkpHm3Uj0OzJNQzW+MnWXvuK1MQolfCj 1CQ52cmXJuk9r+pJpDSfWxCpOU+2jPWJ18qZRK3iyr697OOPcKw03dbPYjpLxKUqx1ff FH6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=fG6Bxz4zCKnlte2DiphB1mWwnICLjL7B6OfDSnAmPoM=; b=FlegngdJEhm9Bk2vyZwOo3QasXxmkTOkDwE98Q2H1P8MoDt/I+skYODta4xIODacK2 qzuoBKRRM0io6KQpgdiYJ8h99cRGDjworod/zh1IDaZZq8vV2qYXJtD8FqFaQQrXIweg qPOpfeFy7SBoI5hEwNsSxzP5jQ/sFT+NFCZRTmjmvqBcvAkqlIDI3Qqncbh2N3RjtJDd r8FJoy//B4RVgYrdloVe29htyFSoEU/izoFQ0pZnU8791RWVBm/hyseMKezN1Tjx/xHX fFKMcpoXxSqPGEDby5HgaINrIRXY9GKLX7e3VjtJ92EWzpaLI4dV5VdQbjsL7raTAKGE K3cw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dr9F0jpt; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ce11si21515378plb.420.2019.01.10.04.25.45; Thu, 10 Jan 2019 04:25:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dr9F0jpt; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728483AbfAJMZo (ORCPT + 3 others); Thu, 10 Jan 2019 07:25:44 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:38860 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728352AbfAJMZo (ORCPT ); Thu, 10 Jan 2019 07:25:44 -0500 Received: by mail-pl1-f193.google.com with SMTP id e5so5119274plb.5 for ; Thu, 10 Jan 2019 04:25:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fG6Bxz4zCKnlte2DiphB1mWwnICLjL7B6OfDSnAmPoM=; b=dr9F0jptT97nERs45FBkoKZrhIfKnDtAMrmjVYkZirPQiYs5b3uF5s+/48Q/UDjHPp i2SgeCGe5nvs9VunxJXGc5jkpxH0l2STEwJak0PiPGSgqGPRQq1W5r5yJ6NiWpOToDDe dJlJUZj+7fCaql4lHbc78E0On8kv42sPV+GgQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fG6Bxz4zCKnlte2DiphB1mWwnICLjL7B6OfDSnAmPoM=; b=qkfOfGvIy6CNG/aJkbwKW/U3HADTNFa2R9Zj9TeqKBEmhC88x0cQCZikHP0UEGUhtb 5NyGEz81tn0LId7WouK1zypIZOuhO9BJuGmx2v5PhJtpavKKfrNcGyD25WjEyoE/h1l1 JLsTl9FOoD9ecskQBLzD0oEi16m3L1/m91DXNhmwVrAg9671Z9pKTfm974bW1zZgXb4Y BfZeEcHzNXc6tHRvLxn+ay2itWm7PKeFn9jmtfAecWDKTyH8Zj17Yu9HwvMuTz67Pm2H hV3qlPGKZXv035RlFJuW0O9xT4bOlH23DrwhGJq33dPvfEJt3oQRUQCUSzikuT+tTMB0 rA8w== X-Gm-Message-State: AJcUukfVkxWYOf5sY/rFUkaJYGyiw7VLf4ZfW+aTgeLN/8ceoaIpmqbp 07gBXjjbyk8omyuSDQMj+h49g4/OifQ= X-Received: by 2002:a17:902:b592:: with SMTP id a18mr10171014pls.293.1547123143455; Thu, 10 Jan 2019 04:25:43 -0800 (PST) Received: from localhost.localdomain ([117.196.233.251]) by smtp.gmail.com with ESMTPSA id m67sm142985541pfb.25.2019.01.10.04.25.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Jan 2019 04:25:43 -0800 (PST) From: Sumit Garg To: linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org, jens.wiklander@linaro.org, mpm@selenic.com, herbert@gondor.apana.org.au, robh+dt@kernel.org, mark.rutland@arm.com, arnd@arndb.de, gregkh@linuxfoundation.org, daniel.thompson@linaro.org, ard.biesheuvel@linaro.org, bhsharma@redhat.com, tee-dev@lists.linaro.org, Sumit Garg Subject: [PATCH v2 1/4] tee: add bus driver framework for TEE based devices Date: Thu, 10 Jan 2019 17:54:54 +0530 Message-Id: <1547123097-16431-2-git-send-email-sumit.garg@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547123097-16431-1-git-send-email-sumit.garg@linaro.org> References: <1547123097-16431-1-git-send-email-sumit.garg@linaro.org> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Introduce a generic TEE bus driver concept for TEE based kernel drivers which would like to communicate with TEE based devices/services. In this TEE bus concept, devices/services are identified via Universally Unique Identifier (UUID) and drivers register a table of device UUIDs which they can support. So this TEE bus framework registers a match() callback function which iterates over the driver UUID table to find a corresponding match for device UUID. If a match is found, then this particular device is probed via corresponding probe api registered by the driver. This process happens whenever a device or a driver is registered with TEE bus. Also this framework allows for device enumeration to be specific to corresponding TEE implementation like OP-TEE etc. Signed-off-by: Sumit Garg --- drivers/tee/tee_core.c | 41 ++++++++++++++++++++++++++++++++++++++--- include/linux/tee_drv.h | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c index 7b2bb4c..9ddb89e 100644 --- a/drivers/tee/tee_core.c +++ b/drivers/tee/tee_core.c @@ -15,7 +15,6 @@ #define pr_fmt(fmt) "%s: " fmt, __func__ #include -#include #include #include #include @@ -1027,6 +1026,30 @@ int tee_client_invoke_func(struct tee_context *ctx, } EXPORT_SYMBOL_GPL(tee_client_invoke_func); +static int tee_client_device_match(struct device *dev, + struct device_driver *drv) +{ + struct tee_client_device *tee_device; + const struct tee_client_device_id *id_table; + + tee_device = to_tee_client_device(dev); + id_table = to_tee_client_driver(drv)->id_table; + + while (!uuid_is_null(&id_table->uuid)) { + if (uuid_equal(&tee_device->id.uuid, &id_table->uuid)) + return 1; + id_table++; + } + + return 0; +} + +struct bus_type tee_bus_type = { + .name = "tee", + .match = tee_client_device_match, +}; +EXPORT_SYMBOL_GPL(tee_bus_type); + static int __init tee_init(void) { int rc; @@ -1040,10 +1063,21 @@ static int __init tee_init(void) rc = alloc_chrdev_region(&tee_devt, 0, TEE_NUM_DEVICES, "tee"); if (rc) { pr_err("failed to allocate char dev region\n"); - class_destroy(tee_class); - tee_class = NULL; + goto class_err; } + rc = bus_register(&tee_bus_type); + if (rc) { + pr_err("failed to register tee bus\n"); + goto class_err; + } + + return 0; + +class_err: + class_destroy(tee_class); + tee_class = NULL; + return rc; } @@ -1052,6 +1086,7 @@ static void __exit tee_exit(void) class_destroy(tee_class); tee_class = NULL; unregister_chrdev_region(tee_devt, TEE_NUM_DEVICES); + bus_unregister(&tee_bus_type); } subsys_initcall(tee_init); diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index 6cfe058..ed16bf1 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -20,6 +20,8 @@ #include #include #include +#include +#include /* * The file describes the API provided by the generic TEE driver to the @@ -538,4 +540,38 @@ static inline bool tee_param_is_memref(struct tee_param *param) } } +extern struct bus_type tee_bus_type; + +/** + * struct tee_client_device_id - tee based device identifier + * @uuid: For TEE based client devices we use the device uuid + * as the identifier. + */ +struct tee_client_device_id { + uuid_t uuid; +}; + +/** + * struct tee_client_device - tee based device + * @id: device identifier + * @dev: device structure + */ +struct tee_client_device { + struct tee_client_device_id id; + struct device dev; +}; +#define to_tee_client_device(d) container_of(d, struct tee_client_device, dev) + +/** + * struct tee_client_driver - tee client driver + * @id_table: device id table supported by this driver + * @driver: driver structure + */ +struct tee_client_driver { + const struct tee_client_device_id *id_table; + struct device_driver driver; +}; +#define to_tee_client_driver(d) \ + container_of(d, struct tee_client_driver, driver) + #endif /*__TEE_DRV_H*/ From patchwork Thu Jan 10 12:24:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 155145 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1836103jaa; Thu, 10 Jan 2019 04:25:54 -0800 (PST) X-Google-Smtp-Source: ALg8bN4I8kzF+Ns/cso4q8uvAiP6YUBFPFFVEKjcqovs+Zijk7zzpXqWr7LdsZLRlVlU08VSr4Ge X-Received: by 2002:a63:e20a:: with SMTP id q10mr8967963pgh.206.1547123154113; Thu, 10 Jan 2019 04:25:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547123154; cv=none; d=google.com; s=arc-20160816; b=jhKC+0l/artyPBzRr6QB50BPru4U91qDatEZcNApsrrEPf6WMoYKBu3b2mgErj+b7J fuFGbjMnu3+VHyF2XCqvxqTg2RZ7jjtTnr7wawQa/jIgfc+B7IrAd5VQjZvpCihQMQrz kHwNuE6NyjI8mIL9oWslHvNfO5Cr4Tl2lexUVUyndtV/rwfUGeVuBYyuL7oL4skx76rC q384zHB/2kmCELbZISvEare13yGbE12NxF6qzy5DoMgyLjSV6rLL8Tkh65soTgFErEvg DXCypO/SjgMs2+4se+PjEQ1yTNB01kbNgGRMTxid6wbMTsiaV1m+dHgFs80dp141ywhw myUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=d+KWrKOuDpBX8jJHDJHHBhRKTXGgkfJrV7NGClro9/k=; b=lWkkoFqHT9ih/2hvBasX9OL5l6d903xk8RBtCz2l0oKSdgIVBoBw0D4ZSvi/4A2W96 RsDXtg/kBwyWvvgvRp00Oomlyz4gFTeDQkOHwp2aiwwW3EbNvwxiStRimJb0x2sFyzAc 85TyQ6HX7nZL9+di2i9zOvUpKIqkYTmQcxa42J/k84EenH74Xv7vG7aRpbbA8S8q7U13 Uw/ISfe4jL4HWW/2DZCB0FIFcuLqhu5ofo8hYbqdcpirZ+6JntCszwlsrML022x7sUUi 5i9XlCPhQfQuuY8NK20H+OgC8ep3JrKZ2j41+QsizUztcI9nlWAnWibdNkneyMJjkRyI 5+NA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cSOkYzgW; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 18si18751409pgo.331.2019.01.10.04.25.53; Thu, 10 Jan 2019 04:25:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cSOkYzgW; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728543AbfAJMZw (ORCPT + 3 others); Thu, 10 Jan 2019 07:25:52 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:46444 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728352AbfAJMZw (ORCPT ); Thu, 10 Jan 2019 07:25:52 -0500 Received: by mail-pl1-f196.google.com with SMTP id t13so5110420ply.13 for ; Thu, 10 Jan 2019 04:25:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=d+KWrKOuDpBX8jJHDJHHBhRKTXGgkfJrV7NGClro9/k=; b=cSOkYzgWzOCDmPB7T+gj+IGVJVEkpN2AQLAhEmUxpIxuZIksC0ju/BAbKJRkwdqf6/ ZZnXShegs0Sc7f7uX43K8FRBHzcyYZYp5HKQkIGRjhf3vvx9HQ8YM2TMFaDkyBzIc0Te v3JSh7ziVp1yLzz0KZKaqdQjaZGiDvmrn1tDc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=d+KWrKOuDpBX8jJHDJHHBhRKTXGgkfJrV7NGClro9/k=; b=SZjAS9lVwNQbKapbwNcO8CryZ78y80sA1u1uolqf0FyWhMsmvixAJHDu5xeh1xDQHj ud1P7SDuTLx5mFdepxShOVX8zFN9bC++eOJxRgWTXTa/3s92xzWMOilQWRAV/FGjtmkc E/dJSqOrNZs41xD6g8yhI/sSVgykFgQOPYiyEAROvIYQOCzXDJsTe7Fm4ts93XxZCIOI wEwEWU6LVSwELeZTEtF9lrCVOedl6aQyd/vvsF7Wq0EtGdVkbZlg/xC9XrjiM1yaKogl 4296iN2Pkw8uALR0jj+7EEdj1T+DoqI4kGaPcaPuEQqKaRxsdmmCJgwGwoMIjYXJlT1e ofDQ== X-Gm-Message-State: AJcUukcdBLgjFhK3/59HQ8Q0MdldVmFkHASbN8IsxU+T782HXLdsKTVY buOOoOlxi4jb7ivDaN2jmSZvsg== X-Received: by 2002:a17:902:d202:: with SMTP id t2mr10303040ply.193.1547123151732; Thu, 10 Jan 2019 04:25:51 -0800 (PST) Received: from localhost.localdomain ([117.196.233.251]) by smtp.gmail.com with ESMTPSA id m67sm142985541pfb.25.2019.01.10.04.25.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Jan 2019 04:25:51 -0800 (PST) From: Sumit Garg To: linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org, jens.wiklander@linaro.org, mpm@selenic.com, herbert@gondor.apana.org.au, robh+dt@kernel.org, mark.rutland@arm.com, arnd@arndb.de, gregkh@linuxfoundation.org, daniel.thompson@linaro.org, ard.biesheuvel@linaro.org, bhsharma@redhat.com, tee-dev@lists.linaro.org, Sumit Garg Subject: [PATCH v2 2/4] tee: optee: add TEE bus device enumeration support Date: Thu, 10 Jan 2019 17:54:55 +0530 Message-Id: <1547123097-16431-3-git-send-email-sumit.garg@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547123097-16431-1-git-send-email-sumit.garg@linaro.org> References: <1547123097-16431-1-git-send-email-sumit.garg@linaro.org> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org OP-TEE provides a pseudo TA to enumerate TAs which can act as devices/ services for TEE bus. So implement device enumeration using invoke function: PTA_CMD_GET_DEVICES provided by pseudo TA to fetch array of device UUIDs. Also register these enumerated devices with TEE bus as "optee-clntX" device. Signed-off-by: Sumit Garg --- drivers/tee/optee/Makefile | 1 + drivers/tee/optee/core.c | 4 + drivers/tee/optee/device.c | 150 ++++++++++++++++++++++++++++++++++++++ drivers/tee/optee/optee_private.h | 3 + 4 files changed, 158 insertions(+) create mode 100644 drivers/tee/optee/device.c -- 2.7.4 diff --git a/drivers/tee/optee/Makefile b/drivers/tee/optee/Makefile index 48d262a..56263ae 100644 --- a/drivers/tee/optee/Makefile +++ b/drivers/tee/optee/Makefile @@ -5,3 +5,4 @@ optee-objs += call.o optee-objs += rpc.o optee-objs += supp.o optee-objs += shm_pool.o +optee-objs += device.o diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index e5efce3..ac59c77 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -634,6 +634,10 @@ static struct optee *optee_probe(struct device_node *np) if (optee->sec_caps & OPTEE_SMC_SEC_CAP_DYNAMIC_SHM) pr_info("dynamic shared memory is enabled\n"); + rc = optee_enumerate_devices(); + if (rc) + goto err; + pr_info("initialized driver\n"); return optee; err: diff --git a/drivers/tee/optee/device.c b/drivers/tee/optee/device.c new file mode 100644 index 0000000..b38d24b --- /dev/null +++ b/drivers/tee/optee/device.c @@ -0,0 +1,150 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2019 Linaro Ltd. + */ + +#include +#include +#include +#include +#include "optee_private.h" + +/* + * Get device UUIDs + * + * [out] memref[0] Array of device UUIDs + * + * Return codes: + * TEE_SUCCESS - Invoke command success + * TEE_ERROR_BAD_PARAMETERS - Incorrect input param + * TEE_ERROR_SHORT_BUFFER - Output buffer size less than required + */ +#define PTA_CMD_GET_DEVICES 0x0 + +static int optee_ctx_match(struct tee_ioctl_version_data *ver, const void *data) +{ + if (ver->impl_id == TEE_IMPL_ID_OPTEE) + return 1; + else + return 0; +} + +static int get_devices(struct tee_context *ctx, u32 session, + struct tee_shm *device_uuid, u32 *shm_size) +{ + u32 ret = 0; + struct tee_ioctl_invoke_arg inv_arg = {0}; + struct tee_param param[4] = {0}; + + /* Invoke PTA_CMD_GET_DEVICES function */ + inv_arg.func = PTA_CMD_GET_DEVICES; + inv_arg.session = session; + inv_arg.num_params = 4; + + /* Fill invoke cmd params */ + param[0].attr = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT; + param[0].u.memref.shm = device_uuid; + param[0].u.memref.size = *shm_size; + param[0].u.memref.shm_offs = 0; + + ret = tee_client_invoke_func(ctx, &inv_arg, param); + if ((ret < 0) || ((inv_arg.ret != TEEC_SUCCESS) && + (inv_arg.ret != TEEC_ERROR_SHORT_BUFFER))) { + pr_err("PTA_CMD_GET_DEVICES invoke function err: %x\n", + inv_arg.ret); + return -EINVAL; + } + + *shm_size = param[0].u.memref.size; + + return 0; +} + +static int optee_register_device(uuid_t *device_uuid, u32 device_id) +{ + struct tee_client_device *optee_device = NULL; + int rc; + + optee_device = kzalloc(sizeof(*optee_device), GFP_KERNEL); + if (!optee_device) + return -ENOMEM; + + optee_device->dev.bus = &tee_bus_type; + dev_set_name(&optee_device->dev, "optee-clnt%u", device_id); + uuid_copy(&optee_device->id.uuid, device_uuid); + + rc = device_register(&optee_device->dev); + if (rc) + pr_err("device registration failed, err: %d\n", rc); + + return rc; +} + +int optee_enumerate_devices(void) +{ + uuid_t pta_uuid = + UUID_INIT(0x7011a688, 0xddde, 0x4053, + 0xa5, 0xa9, 0x7b, 0x3c, 0x4d, 0xdf, 0x13, 0xb8); + struct tee_ioctl_open_session_arg sess_arg = {0}; + struct tee_shm *device_shm = NULL; + uuid_t *device_uuid = NULL; + struct tee_context *ctx = NULL; + u32 shm_size = 0, idx = 0; + int rc; + + /* Open context with OP-TEE driver */ + ctx = tee_client_open_context(NULL, optee_ctx_match, NULL, NULL); + if (IS_ERR(ctx)) + return -ENODEV; + + /* Open session with device enumeration pseudo TA */ + memcpy(sess_arg.uuid, pta_uuid.b, TEE_IOCTL_UUID_LEN); + sess_arg.clnt_login = TEE_IOCTL_LOGIN_PUBLIC; + sess_arg.num_params = 0; + + rc = tee_client_open_session(ctx, &sess_arg, NULL); + if ((rc < 0) || (sess_arg.ret != TEEC_SUCCESS)) { + /* Device enumeration pseudo TA not found */ + rc = 0; + goto out_ctx; + } + + rc = get_devices(ctx, sess_arg.session, device_shm, &shm_size); + if (rc < 0) + goto out_sess; + + device_shm = tee_shm_alloc(ctx, shm_size, + TEE_SHM_MAPPED | TEE_SHM_DMA_BUF); + if (IS_ERR(device_shm)) { + pr_err("tee_shm_alloc failed\n"); + rc = PTR_ERR(device_shm); + goto out_sess; + } + + rc = get_devices(ctx, sess_arg.session, device_shm, &shm_size); + if (rc < 0) + goto out_shm; + + device_uuid = tee_shm_get_va(device_shm, 0); + if (IS_ERR(device_uuid)) { + pr_err("tee_shm_get_va failed\n"); + rc = PTR_ERR(device_uuid); + goto out_shm; + } + + while (idx < shm_size / sizeof(uuid_t)) { + rc = optee_register_device(&device_uuid[idx], idx); + if (rc) + goto out_shm; + idx++; + } + +out_shm: + tee_shm_free(device_shm); +out_sess: + tee_client_close_session(ctx, sess_arg.session); +out_ctx: + tee_client_close_context(ctx); + + return rc; +} diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h index 35e7938..a5e84af 100644 --- a/drivers/tee/optee/optee_private.h +++ b/drivers/tee/optee/optee_private.h @@ -28,6 +28,7 @@ #define TEEC_ERROR_BAD_PARAMETERS 0xFFFF0006 #define TEEC_ERROR_COMMUNICATION 0xFFFF000E #define TEEC_ERROR_OUT_OF_MEMORY 0xFFFF000C +#define TEEC_ERROR_SHORT_BUFFER 0xFFFF0010 #define TEEC_ORIGIN_COMMS 0x00000002 @@ -181,6 +182,8 @@ void optee_free_pages_list(void *array, size_t num_entries); void optee_fill_pages_list(u64 *dst, struct page **pages, int num_pages, size_t page_offset); +int optee_enumerate_devices(void); + /* * Small helpers */ From patchwork Thu Jan 10 12:24:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 155146 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1836227jaa; Thu, 10 Jan 2019 04:26:03 -0800 (PST) X-Google-Smtp-Source: ALg8bN7DVV60RJSP9K+oT1ey4ylEUUnMdAmSf6O1HBehOeAiYI6tZLeJCewWM0U6yQzcg0iccFz5 X-Received: by 2002:a63:8f45:: with SMTP id r5mr9129431pgn.222.1547123163778; Thu, 10 Jan 2019 04:26:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547123163; cv=none; d=google.com; s=arc-20160816; b=z2eDngsB6N9j0bX5bM7GXQE2GUeceV+HaCPSKnJTV5wlPsU4x26L0IzkUeuK4edkhg nCYDYHMTSmBHUxr5qmQbmfprcfgQvOez53j6Fudn3Mgr6Lh9Rs90UGWOn9Y12EHhpyt4 sUpfCT2R9kmRFUNBF2ZFn6N+T2zQRfmzWP5RVCtZklAS4z5A1EdXgTNdsc3ltgZIk1LK Hz+q+WLH7IaybDdxCGI+HKJ4wjJDDbTFfuMB7TgyC8zGE99XHtCkHLcs30Eug3ApF+l/ b27uj2utxLK/nKopYgqPGmJbMZfU3jYhEbkJROEz4Tdr79wsAP9b0DjuYm+BiJyRop82 XfxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=xmkcyMZKGPzMvMKxjtfmwiWNsAxxqPR66jDHmZbAgx0=; b=aWQM3kgr39JZ8XLEunvTb++m82lHnKKZrQhQ2xaP+TFG6pEutUyXUGVG+B+TDKDLNY X1huGY0HuVAwFFMAIESRntHUfbbQ8R+QdHvY2WC536l5orp3zSdasQlXcnyqAPFZadsX Z92tgCWjpcG4nUVCoaWGvcPoHGVsVs9+6knzxAWjTZ9yrPPI9tFGnamPVVTrmOdZ7vHs sW7ME2jvLc7ytEHOgMU7nqCisAvyPRY336SkW6ToqKNiZteLuZYOtJ8nKsuMb3mZKYT1 +/kgowYiA/XeuAxQ6+ec7pk+XXW2/pq6/ZirXTjkpWYp/JWDPnUMn7WMqPNvaEDyd+eW 3TBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=J7SKdesZ; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v9si303525pfl.45.2019.01.10.04.26.03; Thu, 10 Jan 2019 04:26:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=J7SKdesZ; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728595AbfAJM0C (ORCPT + 3 others); Thu, 10 Jan 2019 07:26:02 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:36775 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728593AbfAJM0B (ORCPT ); Thu, 10 Jan 2019 07:26:01 -0500 Received: by mail-pf1-f193.google.com with SMTP id b85so5242917pfc.3 for ; Thu, 10 Jan 2019 04:26:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xmkcyMZKGPzMvMKxjtfmwiWNsAxxqPR66jDHmZbAgx0=; b=J7SKdesZLm6Y9+X6F2SsUmlo3xJzXD6shk9TFdntFYJZFwu+eCwEhAFHjhc5wmSEsm jbvAthFaklKJC+Z3Y78vA8b03Vv60Kcm8Txwoz4qjERSviQU1YXSC0o4tBfXDm96vYHp aemXD3QAeJnkKuq3CUrnnvJNosMSE1XFh2Yic= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xmkcyMZKGPzMvMKxjtfmwiWNsAxxqPR66jDHmZbAgx0=; b=iRCPOTaNYZCnQ/3/Ol+OawBg8zBOMeG8Jr+MWRDUIuHnI/fF9VXY5oW9TVwSAcj+ug Vf0hVg0s/wYFFv/1gc120GnNOBeifhI/m1tQnIK/IKMC84KTBUQ54pfxdw2UaPtrgA1v tbKWeSC9Qr3oZeQRH8wtQwcRkL1fcxwp7P6DVNRrfCX2dv17QjjkNCS7Kv71Aq6AllJ8 z3ikRi6Fupj9q8pNLwnvc3pMJZTEW6GgAsKQ3c/DcznS4zXzZwqQxbJmxDGNwgGNO3mx M3X/FC2sNqes+TK7TC0UpuDGDRnTvxAZtZY8QLhxknrGwfUhrM8wYnqO/MONUGpNiTjv iCog== X-Gm-Message-State: AJcUukdS6FERgcuPg8EeNzpo7PzG3+bP46P8wBWa3KJhhrKdtzmYtuJK 65jstm/FU8vXdrwG2b5zE3vvvA== X-Received: by 2002:a63:ea4f:: with SMTP id l15mr9028354pgk.102.1547123161238; Thu, 10 Jan 2019 04:26:01 -0800 (PST) Received: from localhost.localdomain ([117.196.233.251]) by smtp.gmail.com with ESMTPSA id m67sm142985541pfb.25.2019.01.10.04.25.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Jan 2019 04:26:00 -0800 (PST) From: Sumit Garg To: linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org, jens.wiklander@linaro.org, mpm@selenic.com, herbert@gondor.apana.org.au, robh+dt@kernel.org, mark.rutland@arm.com, arnd@arndb.de, gregkh@linuxfoundation.org, daniel.thompson@linaro.org, ard.biesheuvel@linaro.org, bhsharma@redhat.com, tee-dev@lists.linaro.org, Sumit Garg Subject: [PATCH v2 3/4] tee: add supp_nowait flag in tee_context struct Date: Thu, 10 Jan 2019 17:54:56 +0530 Message-Id: <1547123097-16431-4-git-send-email-sumit.garg@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547123097-16431-1-git-send-email-sumit.garg@linaro.org> References: <1547123097-16431-1-git-send-email-sumit.garg@linaro.org> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org This flag indicates that requests in this context should not wait for tee-supplicant daemon to be started if not present and just return with an error code. It is needed for requests which should be non-blocking in nature like ones arising from TEE based kernel drivers or any in kernel api that uses TEE internal client interface. Signed-off-by: Sumit Garg --- drivers/tee/optee/supp.c | 10 +++++++++- drivers/tee/tee_core.c | 2 ++ include/linux/tee_drv.h | 6 ++++++ 3 files changed, 17 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/tee/optee/supp.c b/drivers/tee/optee/supp.c index 43626e1..92f56b8 100644 --- a/drivers/tee/optee/supp.c +++ b/drivers/tee/optee/supp.c @@ -88,10 +88,18 @@ u32 optee_supp_thrd_req(struct tee_context *ctx, u32 func, size_t num_params, { struct optee *optee = tee_get_drvdata(ctx->teedev); struct optee_supp *supp = &optee->supp; - struct optee_supp_req *req = kzalloc(sizeof(*req), GFP_KERNEL); + struct optee_supp_req *req; bool interruptable; u32 ret; + /* + * Return in case there is no supplicant available and + * non-blocking request. + */ + if (!supp->ctx && ctx->supp_nowait) + return TEEC_ERROR_COMMUNICATION; + + req = kzalloc(sizeof(*req), GFP_KERNEL); if (!req) return TEEC_ERROR_OUT_OF_MEMORY; diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c index 9ddb89e..5d6c317 100644 --- a/drivers/tee/tee_core.c +++ b/drivers/tee/tee_core.c @@ -105,6 +105,7 @@ static int tee_open(struct inode *inode, struct file *filp) if (IS_ERR(ctx)) return PTR_ERR(ctx); + ctx->supp_nowait = false; filp->private_data = ctx; return 0; } @@ -981,6 +982,7 @@ tee_client_open_context(struct tee_context *start, } while (IS_ERR(ctx) && PTR_ERR(ctx) != -ENOMEM); put_device(put_dev); + ctx->supp_nowait = true; return ctx; } EXPORT_SYMBOL_GPL(tee_client_open_context); diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index ed16bf1..fe1a920 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -49,6 +49,11 @@ struct tee_shm_pool; * @releasing: flag that indicates if context is being released right now. * It is needed to break circular dependency on context during * shared memory release. + * @supp_nowait: flag that indicates that requests in this context should not + * wait for tee-supplicant daemon to be started if not present + * and just return with an error code. It is needed for requests + * that arises from TEE based kernel drivers that should be + * non-blocking in nature. */ struct tee_context { struct tee_device *teedev; @@ -56,6 +61,7 @@ struct tee_context { void *data; struct kref refcount; bool releasing; + bool supp_nowait; }; struct tee_param_memref { From patchwork Thu Jan 10 12:24:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 155147 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1836367jaa; Thu, 10 Jan 2019 04:26:13 -0800 (PST) X-Google-Smtp-Source: ALg8bN5yh4j7tBQDAiYJK/OPTkjLUa1wF43GD5xiW4JT0sTeScf5+HUBPJJO3mxfstq/1h5q6LrL X-Received: by 2002:a63:1e17:: with SMTP id e23mr6950126pge.130.1547123173273; Thu, 10 Jan 2019 04:26:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547123173; cv=none; d=google.com; s=arc-20160816; b=mx/OiwAsqP331V4Vja9LDpWcqPfUxZiQF0CYQhBaqNioH3trwQsJV2/V9heXnJLhWx v/teLBsVcgY8gUmUnLs4QUM/4N9ccgIdaKTHFGGJgMVZORVhGQ6R3CmeKBoLJPqGCT+6 PH90CqqAk+py8YtIrqMkHBHAnFqMIRjUwBFVEmk0ShwZG+WGbe0p8zbU8TBwR3olrHBq KQjHUKe/25Ry3Pq3QsToEv+/LbN5zQC5NnFDUZqEat6zdHnPahH6ON4Qm4lixknS/cmb ccj8EVQOHxOkGoXGf7YzZxHGJp8ZZubykXgwZMmVN0IsiXFTOhP/YfEmE1+T8Gkn4DcH c16w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=zfINy+UqI7Z90bTr73imVbYxd5qisc4ZIYp6v90nl7A=; b=hColt9NYFRMLzU8IiodN992LoiP2xpzeDQ8+/7dCE5w3fS3dkMie9XUIUDOzmmSgZf KmMig3JWpaD83cgLgdgTLr1k9nqvVaX2UDz3Eoos9ijVaaX6I4CMtvPuoxDq2xC6f7Rq l1ltyJIOpbf177NlxrkXNZvWePRugzTQzk3oCAZYR4VFvhLJ9RMKfKS7dHAJuUkRdfhP GtszEJkCH2in5D/+IBhvHlMG7Rig6DhT1jBA78YKJBe1SyytTBVxrxixh8FGsfAvvFoD Den7pqCbLBeTtw3Jy13gbS1msWiPujt9pyYhA9YxHYZnvg2obl6QSllExwd++0YaJ89U i8Gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gWHJvSv9; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q8si23230147pli.284.2019.01.10.04.26.13; Thu, 10 Jan 2019 04:26:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gWHJvSv9; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728637AbfAJM0M (ORCPT + 3 others); Thu, 10 Jan 2019 07:26:12 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:39996 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728636AbfAJM0L (ORCPT ); Thu, 10 Jan 2019 07:26:11 -0500 Received: by mail-pf1-f195.google.com with SMTP id i12so5235577pfo.7 for ; Thu, 10 Jan 2019 04:26:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zfINy+UqI7Z90bTr73imVbYxd5qisc4ZIYp6v90nl7A=; b=gWHJvSv9l+TZgMOjeLzS9yvXAXxcIcOYDxBy7uVbFlcThhM0/14qo6wzD9lQOBmtoJ rzTLghFtCFnPju1GcFSQIn9eMOP3PBbJEEB9UuTxxcjdcs0oVJ/tK3VuOtWNkjSFzlli bqq7sxy6nlYUSJsxOAbNd6OrYgSTuabRqn4fU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zfINy+UqI7Z90bTr73imVbYxd5qisc4ZIYp6v90nl7A=; b=HB2bVH8MxfP9eUnypGGLsfwoHH23C6zGgcPPMy/vtBylh0Klgu9CURDyw4kjiadvDs ohYl8tvnYQsvJHISisoNHl4OykKXxZQP9GEwt+h+wCqC+RMFbFjbKdpzeQPnyGUl75FY 8LXlLPCW52xPad4QScqAUBonBv3scs0JTC+xBnR4QJwyDc6y7bUBmz4q5FfvMryBqxgi Yv9eYeQVUqqOXOgMJDUn6fTsA7sSULWQbRUtJ/rm/yuofKiSgb337LYaA8Fw+JYFh82/ Vi3bt2InlPbxDPzdIOZp6DXFlaXOWLQTiC9auUlNnLvuukUl+bLdLY2v+rXW2h7+NfD8 lfYw== X-Gm-Message-State: AJcUukd1Hjxt2eeb1veH1JrtQLW8/VrhwkjAXba7Cnvy7ZIFqQAc0KXF A1wqQXQaZxXQvO1hef5ijJtcXQ== X-Received: by 2002:a62:de06:: with SMTP id h6mr10325201pfg.158.1547123170864; Thu, 10 Jan 2019 04:26:10 -0800 (PST) Received: from localhost.localdomain ([117.196.233.251]) by smtp.gmail.com with ESMTPSA id m67sm142985541pfb.25.2019.01.10.04.26.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Jan 2019 04:26:10 -0800 (PST) From: Sumit Garg To: linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org, jens.wiklander@linaro.org, mpm@selenic.com, herbert@gondor.apana.org.au, robh+dt@kernel.org, mark.rutland@arm.com, arnd@arndb.de, gregkh@linuxfoundation.org, daniel.thompson@linaro.org, ard.biesheuvel@linaro.org, bhsharma@redhat.com, tee-dev@lists.linaro.org, Sumit Garg Subject: [PATCH v2 4/4] hwrng: add OP-TEE based rng driver Date: Thu, 10 Jan 2019 17:54:57 +0530 Message-Id: <1547123097-16431-5-git-send-email-sumit.garg@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547123097-16431-1-git-send-email-sumit.garg@linaro.org> References: <1547123097-16431-1-git-send-email-sumit.garg@linaro.org> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org On ARM SoC's with TrustZone enabled, peripherals like entropy sources might not be accessible to normal world (linux in this case) and rather accessible to secure world (OP-TEE in this case) only. So this driver aims to provides a generic interface to OP-TEE based random number generator service. This driver registers on TEE bus to interact with OP-TEE based rng device/service. Signed-off-by: Sumit Garg --- MAINTAINERS | 5 + drivers/char/hw_random/Kconfig | 15 ++ drivers/char/hw_random/Makefile | 1 + drivers/char/hw_random/optee-rng.c | 272 +++++++++++++++++++++++++++++++++++++ 4 files changed, 293 insertions(+) create mode 100644 drivers/char/hw_random/optee-rng.c -- 2.7.4 diff --git a/MAINTAINERS b/MAINTAINERS index 32d44447..502733c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11260,6 +11260,11 @@ M: Jens Wiklander S: Maintained F: drivers/tee/optee/ +OP-TEE RANDOM NUMBER GENERATOR (RNG) DRIVER +M: Sumit Garg +S: Maintained +F: drivers/char/hw_random/optee-rng.c + OPA-VNIC DRIVER M: Dennis Dalessandro M: Niranjana Vishwanathapura diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig index dac895d..25a7d8f 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -424,6 +424,21 @@ config HW_RANDOM_EXYNOS will be called exynos-trng. If unsure, say Y. + +config HW_RANDOM_OPTEE + tristate "OP-TEE based Random Number Generator support" + depends on OPTEE + default HW_RANDOM + help + This driver provides support for OP-TEE based Random Number + Generator on ARM SoCs where hardware entropy sources are not + accessible to normal world (Linux). + + To compile this driver as a module, choose M here: the module + will be called optee-rng. + + If unsure, say Y. + endif # HW_RANDOM config UML_RANDOM diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile index e35ec3c..7c9ef4a 100644 --- a/drivers/char/hw_random/Makefile +++ b/drivers/char/hw_random/Makefile @@ -38,3 +38,4 @@ obj-$(CONFIG_HW_RANDOM_CAVIUM) += cavium-rng.o cavium-rng-vf.o obj-$(CONFIG_HW_RANDOM_MTK) += mtk-rng.o obj-$(CONFIG_HW_RANDOM_S390) += s390-trng.o obj-$(CONFIG_HW_RANDOM_KEYSTONE) += ks-sa-rng.o +obj-$(CONFIG_HW_RANDOM_OPTEE) += optee-rng.o diff --git a/drivers/char/hw_random/optee-rng.c b/drivers/char/hw_random/optee-rng.c new file mode 100644 index 0000000..ebfe1f2c --- /dev/null +++ b/drivers/char/hw_random/optee-rng.c @@ -0,0 +1,272 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2018-2019 Linaro Ltd. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#define DRIVER_NAME "optee-rng" + +#define TEE_ERROR_HEALTH_TEST_FAIL 0x00000001 + +/* + * TA_CMD_GET_ENTROPY - Get Entropy from RNG + * + * param[0] (inout memref) - Entropy buffer memory reference + * param[1] unused + * param[2] unused + * param[3] unused + * + * Result: + * TEE_SUCCESS - Invoke command success + * TEE_ERROR_BAD_PARAMETERS - Incorrect input param + * TEE_ERROR_NOT_SUPPORTED - Requested entropy size greater than size of pool + * TEE_ERROR_HEALTH_TEST_FAIL - Continuous health testing failed + */ +#define TA_CMD_GET_ENTROPY 0x0 + +/* + * TA_CMD_GET_RNG_INFO - Get RNG information + * + * param[0] (out value) - value.a: RNG data-rate in bytes per second + * value.b: Quality/Entropy per 1024 bit of data + * param[1] unused + * param[2] unused + * param[3] unused + * + * Result: + * TEE_SUCCESS - Invoke command success + * TEE_ERROR_BAD_PARAMETERS - Incorrect input param + */ +#define TA_CMD_GET_RNG_INFO 0x1 + +#define MAX_ENTROPY_REQ_SZ (4 * 1024) + +static struct tee_context *ctx; +static struct tee_shm *entropy_shm_pool; +static u32 ta_rng_data_rate; +static u32 ta_rng_session_id; + +static size_t get_optee_rng_data(void *buf, size_t req_size) +{ + u32 ret = 0; + u8 *rng_data = NULL; + size_t rng_size = 0; + struct tee_ioctl_invoke_arg inv_arg = {0}; + struct tee_param param[4] = {0}; + + /* Invoke TA_CMD_GET_RNG function of Trusted App */ + inv_arg.func = TA_CMD_GET_ENTROPY; + inv_arg.session = ta_rng_session_id; + inv_arg.num_params = 4; + + /* Fill invoke cmd params */ + param[0].attr = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INOUT; + param[0].u.memref.shm = entropy_shm_pool; + param[0].u.memref.size = req_size; + param[0].u.memref.shm_offs = 0; + + ret = tee_client_invoke_func(ctx, &inv_arg, param); + if ((ret < 0) || (inv_arg.ret != 0)) { + pr_err("TA_CMD_GET_ENTROPY invoke function error: %x\n", + inv_arg.ret); + return 0; + } + + rng_data = tee_shm_get_va(entropy_shm_pool, 0); + if (IS_ERR(rng_data)) { + pr_err("tee_shm_get_va failed\n"); + return 0; + } + + rng_size = param[0].u.memref.size; + memcpy(buf, rng_data, rng_size); + + return rng_size; +} + +static int optee_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait) +{ + u8 *data = buf; + size_t read = 0, rng_size = 0; + int timeout = 1; + + if (max > MAX_ENTROPY_REQ_SZ) + max = MAX_ENTROPY_REQ_SZ; + + while (read == 0) { + rng_size = get_optee_rng_data(data, (max - read)); + + data += rng_size; + read += rng_size; + + if (wait) { + if (timeout-- == 0) + return read; + msleep((1000 * (max - read)) / ta_rng_data_rate); + } else { + return read; + } + } + + return read; +} + +static int optee_rng_init(struct hwrng *rng) +{ + entropy_shm_pool = tee_shm_alloc(ctx, MAX_ENTROPY_REQ_SZ, + TEE_SHM_MAPPED | TEE_SHM_DMA_BUF); + if (IS_ERR(entropy_shm_pool)) { + pr_err("tee_shm_alloc failed\n"); + return PTR_ERR(entropy_shm_pool); + } + + return 0; +} + +static void optee_rng_cleanup(struct hwrng *rng) +{ + tee_shm_free(entropy_shm_pool); +} + +static struct hwrng optee_rng = { + .name = DRIVER_NAME, + .init = optee_rng_init, + .cleanup = optee_rng_cleanup, + .read = optee_rng_read, +}; + +static int get_optee_rng_info(void) +{ + u32 ret = 0; + struct tee_ioctl_invoke_arg inv_arg = {0}; + struct tee_param param[4] = {0}; + + /* Invoke TA_CMD_GET_RNG function of Trusted App */ + inv_arg.func = TA_CMD_GET_RNG_INFO; + inv_arg.session = ta_rng_session_id; + inv_arg.num_params = 4; + + /* Fill invoke cmd params */ + param[0].attr = TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_OUTPUT; + + ret = tee_client_invoke_func(ctx, &inv_arg, param); + if ((ret < 0) || (inv_arg.ret != 0)) { + pr_err("TA_CMD_GET_RNG_INFO invoke function error: %x\n", + inv_arg.ret); + return -EINVAL; + } + + ta_rng_data_rate = param[0].u.value.a; + optee_rng.quality = param[0].u.value.b; + + return 0; +} + +static int optee_ctx_match(struct tee_ioctl_version_data *ver, const void *data) +{ + if (ver->impl_id == TEE_IMPL_ID_OPTEE) + return 1; + else + return 0; +} + +static int optee_rng_probe(struct device *dev) +{ + struct tee_client_device *rng_device = to_tee_client_device(dev); + int ret = 0, err = -ENODEV; + struct tee_ioctl_open_session_arg sess_arg = {0}; + + /* Open context with TEE driver */ + ctx = tee_client_open_context(NULL, optee_ctx_match, NULL, NULL); + if (IS_ERR(ctx)) + return -ENODEV; + + /* Open session with hwrng Trusted App */ + memcpy(sess_arg.uuid, rng_device->id.uuid.b, TEE_IOCTL_UUID_LEN); + sess_arg.clnt_login = TEE_IOCTL_LOGIN_PUBLIC; + sess_arg.num_params = 0; + + ret = tee_client_open_session(ctx, &sess_arg, NULL); + if ((ret < 0) || (sess_arg.ret != 0)) { + pr_err("tee_client_open_session failed, error: %x\n", + sess_arg.ret); + err = -EINVAL; + goto out_ctx; + } + ta_rng_session_id = sess_arg.session; + + err = get_optee_rng_info(); + if (err) + goto out_sess; + + err = hwrng_register(&optee_rng); + if (err) { + pr_err("registering failed (%d)\n", err); + goto out_sess; + } + + return 0; + +out_sess: + tee_client_close_session(ctx, ta_rng_session_id); +out_ctx: + tee_client_close_context(ctx); + + return err; +} + +static int optee_rng_remove(struct device *dev) +{ + tee_client_close_session(ctx, ta_rng_session_id); + tee_client_close_context(ctx); + hwrng_unregister(&optee_rng); + + return 0; +} + +const struct tee_client_device_id optee_rng_id_table[] = { + {UUID_INIT(0xab7a617c, 0xb8e7, 0x4d8f, + 0x83, 0x01, 0xd0, 0x9b, 0x61, 0x03, 0x6b, 0x64)}, + {} +}; + +static struct tee_client_driver optee_rng_driver = { + .id_table = optee_rng_id_table, + .driver = { + .name = DRIVER_NAME, + .bus = &tee_bus_type, + .probe = optee_rng_probe, + .remove = optee_rng_remove, + }, +}; + +static int __init mod_init(void) +{ + int rc; + + rc = driver_register(&optee_rng_driver.driver); + if (rc) + pr_warn("driver registration failed, err: %d", rc); + + return rc; +} + +static void __exit mod_exit(void) +{ + driver_unregister(&optee_rng_driver.driver); +} + +module_init(mod_init); +module_exit(mod_exit); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Sumit Garg "); +MODULE_DESCRIPTION("OP-TEE based random number generator driver");