From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CCB86C282D8 for ; Fri, 1 Feb 2019 08:29:04 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9AC0B20869 for ; Fri, 1 Feb 2019 08:29:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="oeUscFJw"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=linaro.org header.i=@linaro.org header.b="iw9sVCdy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9AC0B20869 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=PthAj58ztnllrDe7CgA718cI+G1pF0AsGfFCAqG5QyA=; b=oeUscFJwEGvReg 0OFv+W5BRL1gPnf0gAWpE10RFqNK2mzudSLa4UqLqbT0sKVku3COdd3PlLS84KP1ZRB11LTK+i81g C5KOekSjpLCl+BoxFXqNQIc07vsVT72k8lq7PYZpeWH3JixN0Zg1nDqL0wcu3Wv6Bq/biWPUToDmW c84sMNPIWFJN6SjoEAdWL7RnYEtbWwwds/dpL/WG114M3ADRuw3l7Yhx05GVzkfBDsqWA/0oMQav9 86/NwlXa+Xh+fMi2Jfl3ImKnYgHXiAzLfnaUmmwqaKuGFOM+WyJz7I1JluGvjMWC1EFSwgZQ8AtXf 8DNO58rIVJQfWVc27gJA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpUC3-0005JU-FR; Fri, 01 Feb 2019 08:28:59 +0000 Received: from mail-lj1-x242.google.com ([2a00:1450:4864:20::242]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpUBL-0004jH-VR for linux-arm-kernel@lists.infradead.org; Fri, 01 Feb 2019 08:28:57 +0000 Received: by mail-lj1-x242.google.com with SMTP id u89-v6so5099917lje.1 for ; Fri, 01 Feb 2019 00:28:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=foK+8CjtT2/xFNQZTp6Mx8q5LPpRtM43A4iBY31qJzU=; b=iw9sVCdyFG4w7+jOsD1kaKgaG3tsZFJtlXSr/B87rH0YX8AWGC5YgRwaCl9yN7+G8h aIKk2IiD/4qsBC0TL0SH7jUs4sEw9Z/D0U9IzxEt2XyzMjA23p5pP/SPFCd1XFESK6O/ BnrcMNPuRq8pDuf2HJP1zCL7wNM8Ho5Xww/OE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=foK+8CjtT2/xFNQZTp6Mx8q5LPpRtM43A4iBY31qJzU=; b=XozCmzHw363TmpRKJt8bOPW5XDMA8SyWfdrfp//KXWbDv9/dCoGgLHLTT+sEfRgR46 uUD5hl/rxeG0tRb7KPBkAQ01rozKyx385P1V0xTVVs0WK1cmKy17PcHC1WcggzuaSs79 r0tnmFmhUt+TrdeR+p1p1jAWjncLdX3BkrKdMK7KuTs8Tz1yoGBOxu3ACiwH+0qxItDN Vwi02eS7epB7xh2HtcAh+MpVKLCVDek68RH4wSNDbKpKoaqI4t2IK0VxoQxfMGlWRcm6 309+Fv5aZP0OJNx2TU3Er5lB/9x3V3wSV4jihy7HzmjOVU9UCmNMp0Dh01nTGUcV+qOS oHAg== X-Gm-Message-State: AJcUukdXHppHF5VnbZQq53TVxGURKUSneUYcneaMUCrL2lHNYWPGzCsm N+Ill2RnoO/Zr1lwucPJnuQDIA== X-Google-Smtp-Source: ALg8bN4j2IFUYY4b3aR1PzE3BT7NF5FDIQ2Vu4gFqNrL2mcTF7E+JdFRgLtVI1ZryAoRZ8JtRGgipA== X-Received: by 2002:a05:651c:14e:: with SMTP id c14mr31357748ljd.20.1549009693375; Fri, 01 Feb 2019 00:28:13 -0800 (PST) Received: from jax.urgonet (h-84-105.A175.priv.bahnhof.se. [79.136.84.105]) by smtp.gmail.com with ESMTPSA id h3sm1239278lfj.25.2019.02.01.00.28.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Feb 2019 00:28:12 -0800 (PST) Date: Fri, 1 Feb 2019 09:28:10 +0100 From: Jens Wiklander To: Sumit Garg Subject: Re: [PATCH v6 3/4] tee: optee: add TEE bus device enumeration support Message-ID: <20190201082809.GA5329@jax.urgonet> References: <1548740978-28495-1-git-send-email-sumit.garg@linaro.org> <1548740978-28495-4-git-send-email-sumit.garg@linaro.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1548740978-28495-4-git-send-email-sumit.garg@linaro.org> User-Agent: Mutt/1.9.4 (2018-02-28) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190201_002816_513376_3FD0825B X-CRM114-Status: GOOD ( 22.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, daniel.thompson@linaro.org, michal.lkml@markovi.net, herbert@gondor.apana.org.au, arnd@arndb.de, ard.biesheuvel@linaro.org, gregkh@linuxfoundation.org, bhsharma@redhat.com, linux-kernel@vger.kernel.org, tee-dev@lists.linaro.org, yamada.masahiro@socionext.com, robh+dt@kernel.org, linux-crypto@vger.kernel.org, mpm@selenic.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Jan 29, 2019 at 11:19:37AM +0530, Sumit Garg wrote: > 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 > Reviewed-by: Daniel Thompson > --- > drivers/tee/optee/Makefile | 1 + > drivers/tee/optee/core.c | 4 + > drivers/tee/optee/device.c | 155 ++++++++++++++++++++++++++++++++++++++ > drivers/tee/optee/optee_private.h | 3 + > 4 files changed, 163 insertions(+) > create mode 100644 drivers/tee/optee/device.c > > 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..c24c37f > --- /dev/null > +++ b/drivers/tee/optee/device.c > @@ -0,0 +1,155 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (C) 2019 Linaro Ltd. > + */ > + > +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > + > +#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.uuid, 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) While testing I discovered that this line should be: if (rc < 0 || !shm_size) to cover the common case where there's no devices. I'll fixup the commit with this trivial change. Cheers, Jens > + 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 > */ > -- > 2.7.4 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel