From patchwork Mon Jan 21 09:29:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 156185 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp6167773jaa; Mon, 21 Jan 2019 01:30:02 -0800 (PST) X-Google-Smtp-Source: ALg8bN7otee7nAbvcD8DTcYgu+DOkHNatIrN3eZgQnUk3s3zuK7RNg6E+8Q83DYbVTPft6qTUe3+ X-Received: by 2002:aa7:8542:: with SMTP id y2mr29488465pfn.83.1548063002858; Mon, 21 Jan 2019 01:30:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548063002; cv=none; d=google.com; s=arc-20160816; b=LpGqc8zV1fN30g2q9IPPUQEgisndfntVzF6Ufa28U0UXRVLoQ1p+SP7gs9C8wGXbuA befaQpQq7Ni7twT6tBK9qfTKKngKB5iF0rTef7e8uLewo8OP5PTXpidGoYfFwE8LNCTI Tn6EuhfXN32kJLQ0uqtrla/pfPty3PIv+oaW+LJnbJsGVa6rfTT0Apn/yEslQ48WH/Yf wQm59IIt0CovR4PBHGsV5TtsYXI0oWDhDzGRbuz7ikjGLloJzVYUEm5vyMAyaIwaKxHd JJ1/jIbeOtWgnevBjieHjBaYvDb1POLPeQ6w22aM+N6nfJ/70JnZcOPHUAdNpoxaFIKQ /Ztg== 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=z9Rwq9XvERgXKC4dth0NtQ5GI/bk1t7E/UkygENFoiY=; b=BX0/i1fMEBA2X0Ga0uBLt2ta9RnRJ9sZ/AzZe25aJIvTztR02g0FjPzjims9ulNOuZ tPeQqS8cocMnClBJzYTRkPljtxm+H2HZs9oTN2Dgq6fGfwFhujJXY33TtygnEabon3jP h3mgdxkfQGnj74HrXHkKtztVcLYCapQyvv1pwphtBqgJJMoZ+eHHbBndUbfv7eBWWmLU v4tk8a26TEByz9n3BZSmrmnSkYJpmfa/DWLxUsBFLykGKQegBiVYjlpu/Zgg2ACdmACC sJ6xwvphiF+sEEOM+1mP/XrEpdw2AwPJYng4yM1dILTE1i4WnHGS99YJM1K3z3HNm3Bw X5pQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=P85rzBSL; 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 o1si11746886plk.257.2019.01.21.01.30.02; Mon, 21 Jan 2019 01:30:02 -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=P85rzBSL; 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 S1727053AbfAUJaC (ORCPT + 3 others); Mon, 21 Jan 2019 04:30:02 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:42604 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726735AbfAUJaB (ORCPT ); Mon, 21 Jan 2019 04:30:01 -0500 Received: by mail-pf1-f194.google.com with SMTP id 64so9853543pfr.9 for ; Mon, 21 Jan 2019 01:30: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=z9Rwq9XvERgXKC4dth0NtQ5GI/bk1t7E/UkygENFoiY=; b=P85rzBSLRM58loF2f7ry1GroGt+dGnwluFo7y3l1N+iyJf0OSFyMvevCC+1SxdCC/c I1IOyDUVciVyLeagtiqh9UcclqlhPhRKjbWictu8UtiJflFZ2JNNhqy0MNTXqSyfdZ45 69lIvGfcH6eP/cNyrGwuu1EzFRpnEbIfVXp7o= 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=z9Rwq9XvERgXKC4dth0NtQ5GI/bk1t7E/UkygENFoiY=; b=aqmqEdMGgTP1bI7FH3vNeQtn1kSjJLn47C8uE5Yt3pVTWPM7jiCDuQhZHQpogBNTkd 8LeO0mSUf7gbmaiHXSyBs2C4n+Y28xKeiwPVf/OKspFEFbUcqAY6uGUjQwYsFi+Minfw vsV8FMeaMPRdZUIc05hhJnS6vDM2dQNU3jPKWu/NiTPWROBbDmtG9ttOpb558fbIaUr0 jD6X6XtOzjU5Fwamxm84tEf/r/arKAZcqS7FEdhO5nX53UwCLFZfYTMWbHs7q+T1fs9r M3jQe43ji401rNkItJBq392a03MxxgGjCK26ru1XWub5ktA4dqhAHeGNr8IbB7h/GiMf dgBw== X-Gm-Message-State: AJcUukctIPQgFrpkY4//S0o4M8LmBoKN5eVzsNtjDh6h6OwsJ2QTiKFT gwQEUo7xJUNSAsDftROHAsUP6g== X-Received: by 2002:a63:1444:: with SMTP id 4mr27674649pgu.430.1548063001031; Mon, 21 Jan 2019 01:30:01 -0800 (PST) Received: from localhost.localdomain ([117.252.65.115]) by smtp.gmail.com with ESMTPSA id h9sm16182777pgd.53.2019.01.21.01.29.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Jan 2019 01:30:00 -0800 (PST) From: Sumit Garg To: jens.wiklander@linaro.org, herbert@gondor.apana.org.au Cc: linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, mpm@selenic.com, 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 v4 1/4] tee: add bus driver framework for TEE based devices Date: Mon, 21 Jan 2019 14:59:16 +0530 Message-Id: <1548062959-31860-2-git-send-email-sumit.garg@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1548062959-31860-1-git-send-email-sumit.garg@linaro.org> References: <1548062959-31860-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 | 45 +++++++++++++++++++++++++++++++++++++++++---- include/linux/tee_drv.h | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 77 insertions(+), 5 deletions(-) -- 2.7.4 Reviewed-by: Bhupesh Sharma diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c index 7b2bb4c..55370d5 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) +{ + const tee_client_device_id *id_table; + struct tee_client_device *tee_device; + + id_table = to_tee_client_driver(drv)->id_table; + tee_device = to_tee_client_device(dev); + + while (!uuid_is_null(id_table)) { + if (uuid_equal(&tee_device->id, id_table)) + 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,18 +1063,32 @@ 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 out_unreg_class; } + rc = bus_register(&tee_bus_type); + if (rc) { + pr_err("failed to register tee bus\n"); + goto out_unreg_chrdev; + } + + return 0; + +out_unreg_chrdev: + unregister_chrdev_region(tee_devt, TEE_NUM_DEVICES); +out_unreg_class: + class_destroy(tee_class); + tee_class = NULL; + return rc; } static void __exit tee_exit(void) { + bus_unregister(&tee_bus_type); + unregister_chrdev_region(tee_devt, TEE_NUM_DEVICES); class_destroy(tee_class); tee_class = NULL; - unregister_chrdev_region(tee_devt, TEE_NUM_DEVICES); } subsys_initcall(tee_init); diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index 6cfe058..ba985d8 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -15,11 +15,13 @@ #ifndef __TEE_DRV_H #define __TEE_DRV_H -#include +#include #include #include #include #include +#include +#include /* * The file describes the API provided by the generic TEE driver to the @@ -538,4 +540,37 @@ static inline bool tee_param_is_memref(struct tee_param *param) } } +extern struct bus_type tee_bus_type; + +/* + * For TEE based client devices we use the device uuid as the + * identifier. + */ +typedef uuid_t tee_client_device_id; + +/** + * struct tee_client_device - tee based device + * @id: device identifier + * @dev: device structure + */ +struct tee_client_device { + 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 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 Mon Jan 21 09:29:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 156187 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp6167984jaa; Mon, 21 Jan 2019 01:30:16 -0800 (PST) X-Google-Smtp-Source: ALg8bN5zD9HfqwVXdS/4SZsiRTf6Er51Lb2FzcLjg7naCLitrk0aTtCEdDaN6ZTafD5r/ThjxFny X-Received: by 2002:a63:ac1a:: with SMTP id v26mr27885119pge.293.1548063016752; Mon, 21 Jan 2019 01:30:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548063016; cv=none; d=google.com; s=arc-20160816; b=daE44K86nJFtyvUI+gOvvPRIzmY4+pCNPDfucip7JLAixZTKkHNRRr/rbNhXNE5vXY s0MBQlP93T/QifCUhnKyStirgjcjVlHi6tu5389eEOEbBYGa7rzj75rlX8CB+2Fyc33t J3x+QoYZssM48w3QlNk8CUkpZRqn6/Jql62WXkdhrX9RiD5BKoc2qohpRGC3/qYRBmuZ ZioPkCQnRh8PEIel2/CumQ0KEtHaPuD0rBROS4BWcmm5hEsz3HYK/noeT3sPq3WoZit7 SBeOzXuwegCxEE8WZQqvEalGhTJjhzNANEknl/KJ/TCwq/5Cj1G8UiXVlf8ydsUNAeFE YflQ== 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=gNIfaDAJxo92xkUgZQoWkczYxox0RUjsVUDgKWLkCFo=; b=QLWDCPJWQvKazQbSJLe8TRF+AcNmElc7laQ2nHqK1XSkhEViStVS5KzOTqb8/LDxcP 9gZPJu9bOK5G1qQKU6gZcTrp2jjsEH50hDGrM2hTZodxTweKU34raQVwvXmN5t7vpG3W d0u5HK+uAKirDNmoZjavFsbaducF8agMi9hpVkgV39pvQpntjuA810HesuoA9YGAA7WC wwXQVeEYrvqmAx5KodhvEBaWZTFGSSTXaY1mwMg3c/1g0ua22wPpY3G+Ak6L2EXyLsai IuR6u2pGpfc0ixa8bOd8O4Sgb9+RRlHlUFQ6YpYAY/7/Im8CG1mypUnnhMJ7gksrG9NW 7CtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YWp6esVU; 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 u24si12637340pgj.489.2019.01.21.01.30.16; Mon, 21 Jan 2019 01:30:16 -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=YWp6esVU; 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 S1727743AbfAUJaP (ORCPT + 3 others); Mon, 21 Jan 2019 04:30:15 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:42396 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727137AbfAUJaP (ORCPT ); Mon, 21 Jan 2019 04:30:15 -0500 Received: by mail-pl1-f193.google.com with SMTP id y1so9539694plp.9 for ; Mon, 21 Jan 2019 01:30:15 -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=gNIfaDAJxo92xkUgZQoWkczYxox0RUjsVUDgKWLkCFo=; b=YWp6esVUSB2LrKD/+WBhGzde6gToqUO5mQeM6RnPUCri/fXUlaYjJNXrIrD6g+xBTi EbVayh/0QmihcMivu7PqkrFDJ7ZjUWRHEKmtEUlmXwLUtpLmbq0MW27EA9sNpVr+2Q3d VaUiwvEN1RTm9KuQpLAnZ/86BWUQ+4obxhQKA= 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=gNIfaDAJxo92xkUgZQoWkczYxox0RUjsVUDgKWLkCFo=; b=PTQEslaCf7h80inMCE5oXSAPb2YQr2f3Iu5Qr/FGhbqkzhccB32YY1b8CvvCYJTOX6 OioJe/A27CNrgh+GciefIbTuHx2ii5xmQoVhuFvYmDptSc34eoqUb70LBtPf/Lxxu571 tj2HwxsU5BayS360vpRrDmNZxFFsGhTIaW4c7M2wTFQa/IsG2Jcly8jhfA8NeMPPxO6W YLf06agueBuVp/SFkHTYEOWwtW2S/idtkr9mkTcOmpNgHMVeYRnCcMaBHNkOuDphlDXM VjtRIuNoAGw1IjtDVSIUKemDSvQH8FJSTU4ynCuVgEzPpKxONgMYijj9E4wZVZeJYOEW llgA== X-Gm-Message-State: AJcUukcVc7OnYCewsULVkxCGyvygr27m7qyhWM9+7BofS9zb1vPTxnlD z2awgfwzbdjx6RBQxGBU+cRxPg== X-Received: by 2002:a17:902:66e6:: with SMTP id e93mr28756857plk.92.1548063014939; Mon, 21 Jan 2019 01:30:14 -0800 (PST) Received: from localhost.localdomain ([117.252.65.115]) by smtp.gmail.com with ESMTPSA id h9sm16182777pgd.53.2019.01.21.01.30.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Jan 2019 01:30:14 -0800 (PST) From: Sumit Garg To: jens.wiklander@linaro.org, herbert@gondor.apana.org.au Cc: linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, mpm@selenic.com, 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 v4 3/4] tee: optee: add TEE bus device enumeration support Date: Mon, 21 Jan 2019 14:59:18 +0530 Message-Id: <1548062959-31860-4-git-send-email-sumit.garg@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1548062959-31860-1-git-send-email-sumit.garg@linaro.org> References: <1548062959-31860-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 | 153 ++++++++++++++++++++++++++++++++++++++ drivers/tee/optee/optee_private.h | 3 + 4 files changed, 161 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..b7633ce --- /dev/null +++ b/drivers/tee/optee/device.c @@ -0,0 +1,153 @@ +// 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_shm, 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_shm; + 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(const 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, device_uuid); + + rc = device_register(&optee_device->dev); + if (rc) { + pr_err("device registration failed, err: %d\n", rc); + kfree(optee_device); + } + + return rc; +} + +int optee_enumerate_devices(void) +{ + const 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; + const uuid_t *device_uuid = NULL; + struct tee_context *ctx = NULL; + u32 shm_size = 0, idx, num_devices = 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, NULL, &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; + } + + num_devices = shm_size / sizeof(uuid_t); + + for (idx = 0; idx < num_devices; idx++) { + rc = optee_register_device(&device_uuid[idx], idx); + if (rc) + goto out_shm; + } + +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 Mon Jan 21 09:29:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 156188 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp6168079jaa; Mon, 21 Jan 2019 01:30:24 -0800 (PST) X-Google-Smtp-Source: ALg8bN5K4tI/MSeThGjE/g2ROZgaZE7/7INSsziStwi0ENB1YaU3va46Dqo/wDxQtgTtFj/1M1dl X-Received: by 2002:a63:ac1a:: with SMTP id v26mr27885505pge.293.1548063023966; Mon, 21 Jan 2019 01:30:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548063023; cv=none; d=google.com; s=arc-20160816; b=bl2wxb1D70TohIoiBEVaPJvddoepwhRSWT0uN3P8+KvxhjzkTM4cXaoFzvkK8GicPA F4P0VCMF+s8oDCcxnlWwFPkeKU25hKliCtMA12LqvcnHJrIjn9KmNizuN8TNSR+6cJR1 sUuTYvAdxHz7eU+BERh4YMOm1N9xdkKPvaLw7INJ/ljXx8HWLODkZVnE3rJ30NTWiFkw t1F472K/u9tdEmgYPiL/EA2GdNSgFvm4buGbJA4GVu8SQMv+6acoq1k7olc2Laf8kj2S 3wOYR3iOozUzoH/zB0Bh3AasLX+aPIRiEwCw3kRVPYCYcsX34HKEug9VTvfjD4YqQCX9 DH7w== 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=uKLCQxwqa8Js3kK/DxuzRxhuNhuhV7512lhQqbniQjs=; b=RgYBhwqcwLZmwp+VOi74cE/apn5E7awHSRM4p+D7ty0UAdlX0y7lMusCNWJWOcpuqj lkCOQnZL/otDbwxXUuoGARHAh6SEAdigjC5zZyFG4AT6EQgBmvoZH79VnUEV+k/bHCCj zcnM1vGnavJ589ZqHbAKAeqxSGp1XlS7GkHUCl6XhaSUcGXAshtvOQQJXUBEEjmMyC3z IwGVpCNlOs4CiumE8jNXoB3vAMm7tfptYRP9bB0g7o15zZit8GxHk9Jap8hI+JfCT2Wn 3hNRXlOK5JelxScyYrFLZGyhAQe/71lfayw7H1LfgsrR+gwXzy+Ucg1De3cM5GmFa8W4 vbdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aDJE+ypp; 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 u24si12637340pgj.489.2019.01.21.01.30.23; Mon, 21 Jan 2019 01:30:23 -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=aDJE+ypp; 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 S1727789AbfAUJaX (ORCPT + 3 others); Mon, 21 Jan 2019 04:30:23 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:40697 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727785AbfAUJaW (ORCPT ); Mon, 21 Jan 2019 04:30:22 -0500 Received: by mail-pg1-f195.google.com with SMTP id z10so9223547pgp.7 for ; Mon, 21 Jan 2019 01:30:22 -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=uKLCQxwqa8Js3kK/DxuzRxhuNhuhV7512lhQqbniQjs=; b=aDJE+yppROVooI4t69NTdkyGKbRb/k2yEaxVPv3cHM69UZn8DDD2oqCK7Fmc/LVm/O WAf+8U/zk1xrfBDmRRRYo5IFXDk/SfjtzyOzMaXXOkfAafrd+pAkYRhefNMeAqhPQ2RU QUSYH2zUeqFQNPr2j+idEVGAskM7vM4hSrBp8= 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=uKLCQxwqa8Js3kK/DxuzRxhuNhuhV7512lhQqbniQjs=; b=YG1qQ2fsqecNbl8cVhm5OjAUzwJGQ9Dt8UubkzGiJ3TA8HMYEfHQfie6F2iPN2Pg6b s6dmyqvxhODvFJlu20HC6Mt+Ewj9fdr/YSiel9/7pTkz8+V7piIOUcMCHXz0UgSLRBMM YYceSjQxx5dkksCidozYHrFDhamllKTvrphNIWEi6PxdBOfezp6rg+tGjS2iMQrxCUZB hcqx+AqPeSAnnVfkdip3H2sleR5qorMEqfvz15Gv+B8dR7+szIcQQhD1jllEYbL1BnHl hgilI1qw8v2EMYZYyMnacuwkGeIUyrS+HyVeNRsN/+mDao5hgcv65yksddQyV5sHyHl4 ge0Q== X-Gm-Message-State: AJcUukdast+SCmU0TZfqdXmXAlgDOsnxsQAOcHNESt5YSfX+M1Ce7Tf2 cDagPCk5ne73k3Z24wB6lIa/Rw== X-Received: by 2002:a65:584e:: with SMTP id s14mr27462624pgr.142.1548063021763; Mon, 21 Jan 2019 01:30:21 -0800 (PST) Received: from localhost.localdomain ([117.252.65.115]) by smtp.gmail.com with ESMTPSA id h9sm16182777pgd.53.2019.01.21.01.30.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Jan 2019 01:30:21 -0800 (PST) From: Sumit Garg To: jens.wiklander@linaro.org, herbert@gondor.apana.org.au Cc: linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, mpm@selenic.com, 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 v4 4/4] hwrng: add OP-TEE based rng driver Date: Mon, 21 Jan 2019 14:59:19 +0530 Message-Id: <1548062959-31860-5-git-send-email-sumit.garg@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1548062959-31860-1-git-send-email-sumit.garg@linaro.org> References: <1548062959-31860-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..6ac862a --- /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_ENTROPY 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(struct device *dev) +{ + u32 ret = 0; + struct tee_ioctl_invoke_arg inv_arg = {0}; + struct tee_param param[4] = {0}; + + /* Invoke TA_CMD_GET_RNG_INFO 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)) { + dev_err(dev, "TA_CMD_GET_RNG_INFO invoke func 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.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)) { + dev_err(dev, "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(dev); + if (err) + goto out_sess; + + err = hwrng_register(&optee_rng); + if (err) { + dev_err(dev, "hwrng registration 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) +{ + hwrng_unregister(&optee_rng); + tee_client_close_session(ctx, ta_rng_session_id); + tee_client_close_context(ctx); + + return 0; +} + +const 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 optee_rng_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 optee_rng_mod_exit(void) +{ + driver_unregister(&optee_rng_driver.driver); +} + +module_init(optee_rng_mod_init); +module_exit(optee_rng_mod_exit); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Sumit Garg "); +MODULE_DESCRIPTION("OP-TEE based random number generator driver");