Received: by 2002:a25:ef43:0:0:0:0:0 with SMTP id w3csp347988ybm; Fri, 29 May 2020 01:30:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwwAKDf2CZ4xQI+F7EPixVqGs4PAphJfeK57VTt8+z0IaMEQM9f5dlvmhRkrJHzMtltI8Ga X-Received: by 2002:a05:6402:1bc1:: with SMTP id ch1mr7233727edb.90.1590741033864; Fri, 29 May 2020 01:30:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590741033; cv=none; d=google.com; s=arc-20160816; b=TXlKyKIv/wsuqNc/pUxmhWmSm3unbR69i85RdpN+siAvfIE2iVDpiD6GVa/Gn5Dqxb XXPJOn59q8zb5LX/z0Y8e4AvZ4gGc65Nalp/k1mDxvfMUTIQrfEf8KnzxbV3tOnkwe8W 3+FePxl9UsemubeeUekBzJD8j4L7YyIgggitiRUQRn4ipd8jTYBknR8jJF/OIDAHDaCx 102/3kmA5D37HQq6BM4YXsLGIyqmaZYPGXaPqrrbON82oZ6LrZd6mSCC7kLA9GB5hGoj S4OkBFPcsWUT0KeRSEP2eE6YJIVZP//yRkJm0INnlJQmS1SL+V5u2c91SO4c/vs1r48Y g3Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GD1xOkqu8g05RnnmG4kL93iITTCz/UawAKS6BNf7nuw=; b=e14paCsw7colp8bFVpPIeDKfKX0ex9l0E4qttcJawIdCI7w9DD/pSgx2NjTI2ZD+56 VsNT+PWvXsvA42CJphsdbiWI7wRe+oWadNDRcePVs7IqPNvxqYE1BAQ2I9eH+QRmqfEq 4dDrMw/ILkWOQkd8ysnyHiqrVoNEGPn/T3NCpvhfxwlXHYPd0KS/6r6QkuAyylWHfJ+e pz9vsA9clPKHE+p359/BegQaT2797WSuAeZnZw1GnZNL/SK3IuzFA1twxcopBimzWN2o gL3MRKs7Vt40ITMqrx0XJV37zscRVjDzcaI0mJKTNz5Y3KfOqXxO7U+coUiPRUMFkkYR RGfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mvZnjn9x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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. [23.128.96.18]) by mx.google.com with ESMTP id gq24si252870ejb.55.2020.05.29.01.30.09; Fri, 29 May 2020 01:30:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mvZnjn9x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 S1726846AbgE2I10 (ORCPT + 99 others); Fri, 29 May 2020 04:27:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726805AbgE2I1X (ORCPT ); Fri, 29 May 2020 04:27:23 -0400 Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1870C08C5C6 for ; Fri, 29 May 2020 01:27:22 -0700 (PDT) Received: by mail-lj1-x241.google.com with SMTP id e4so1569908ljn.4 for ; Fri, 29 May 2020 01:27:22 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=GD1xOkqu8g05RnnmG4kL93iITTCz/UawAKS6BNf7nuw=; b=mvZnjn9x4WPgj5i1nN7kNGVgyim1CRgFXzrIIpiosZlgLsYMovUM5TonHSgUC0l+MF sUek9n766jP3nFi5danATXG1mvgxejnSme+IVMV7nFxXUX60Dv1+xhq3R4p06q+FWuwb q2aUhimJJrjLduAiSRBqSLaYx76jo0ZZ200ogjpcml+FUBZ/3hlJx4EB0qJhqBwjVu5r prsIICu693sxP1MnVoKtgtw3tJ+AP2WGn1TsdIwUn7E6Mg5NDpueVawNihyuZLLDqRYu uDkrkSd/VT5s6UeeBwYyUoQKEVqtKU8DR8I6Vv7C06RBk81mZs2gF6G0ir4d0hp8p87m XA/Q== 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:mime-version:content-transfer-encoding; bh=GD1xOkqu8g05RnnmG4kL93iITTCz/UawAKS6BNf7nuw=; b=enDezu4fRvklzZgNEhqZp3+53A1wZUvKNabbSvE32GbGhFuQFdCVvcbnMKoiFXE2L7 dEVYOSHx/tRgkRevOakQ6OpIS/aotpzNH9Fbia4RvU3I/jMfkfGrCAQvTFIS//Hx1X5T Vk97gObGakGDHdNPlP+K8TIFHT6jdCXja2yzzAnH8MT+gEnQxmbfjE306biwnCSYOGs7 e7adKzN1W9WNzTuBVesMPdK99+lh0+GL9uzuh1u1kK62GntEYW6FEX8VHEks/PL/7iA6 OgEi5s2Bwz8d7XtxcWb9GV9ZyVGtRfJaSucDulyhIACGwrFQNHAd9A8tlOMDyCoeKekV KMcA== X-Gm-Message-State: AOAM531vTioAXGAfOdVtjQ34IayGYDhDTqUETQZTQz3ZMjCYdAd/fZKi cf3os4+3EILUimvD0jpW4ZML5cpl02E= X-Received: by 2002:a2e:890e:: with SMTP id d14mr3501516lji.216.1590740840985; Fri, 29 May 2020 01:27:20 -0700 (PDT) Received: from localhost.localdomain ([176.59.41.83]) by smtp.gmail.com with ESMTPSA id y20sm1878450lji.31.2020.05.29.01.27.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2020 01:27:20 -0700 (PDT) From: Maxim Uvarov To: linux-kernel@vger.kernel.org, tee-dev@lists.linaro.org Cc: peterhuewe@gmx.de, jarkko.sakkinen@linux.intel.com, jgg@ziepe.ca, gregkh@linuxfoundation.org, jens.wiklander@linaro.org, linux-integrity@vger.kernel.org, arnd@linaro.org, sumit.garg@linaro.org, Maxim Uvarov Subject: [PATCHv5 1/3] optee: do drivers initialization before and after tee-supplicant run Date: Fri, 29 May 2020 11:26:59 +0300 Message-Id: <20200529082701.13457-2-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200529082701.13457-1-maxim.uvarov@linaro.org> References: <20200529082701.13457-1-maxim.uvarov@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some drivers (like ftpm) can operate only after tee-supplicant runs because of tee-supplicant provides things like storage services.  This patch splits probe of non tee-supplicant dependable drivers to the early stage, and after tee-supplicant run probe other drivers. Signed-off-by: Maxim Uvarov Suggested-by: Sumit Garg Suggested-by: Arnd Bergmann --- drivers/tee/optee/core.c | 24 +++++++++++++++++++++--- drivers/tee/optee/device.c | 17 +++++++++++------ drivers/tee/optee/optee_private.h | 10 +++++++++- 3 files changed, 41 insertions(+), 10 deletions(-) diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index 99698b8a3a74..bf0851fdf108 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -17,6 +17,7 @@ #include #include #include +#include #include "optee_private.h" #include "optee_smc.h" #include "shm_pool.h" @@ -218,6 +219,11 @@ static void optee_get_version(struct tee_device *teedev, *vers = v; } +static void optee_bus_scan(struct work_struct *work) +{ + WARN_ON(optee_enumerate_devices(PTA_CMD_GET_DEVICES_SUPP)); +} + static int optee_open(struct tee_context *ctx) { struct optee_context_data *ctxdata; @@ -241,8 +247,18 @@ static int optee_open(struct tee_context *ctx) kfree(ctxdata); return -EBUSY; } - } + if (!optee->scan_bus_done) { + INIT_WORK(&optee->scan_bus_work, optee_bus_scan); + optee->scan_bus_wq = create_workqueue("optee_bus_scan"); + if (!optee->scan_bus_wq) { + kfree(ctxdata); + return -ECHILD; + } + queue_work(optee->scan_bus_wq, &optee->scan_bus_work); + optee->scan_bus_done = true; + } + } mutex_init(&ctxdata->mutex); INIT_LIST_HEAD(&ctxdata->sess_list); @@ -296,8 +312,10 @@ static void optee_release(struct tee_context *ctx) ctx->data = NULL; - if (teedev == optee->supp_teedev) + if (teedev == optee->supp_teedev) { + destroy_workqueue(optee->scan_bus_wq); optee_supp_release(&optee->supp); + } } static const struct tee_driver_ops optee_ops = { @@ -675,7 +693,7 @@ static int optee_probe(struct platform_device *pdev) platform_set_drvdata(pdev, optee); - rc = optee_enumerate_devices(); + rc = optee_enumerate_devices(PTA_CMD_GET_DEVICES); if (rc) { optee_remove(pdev); return rc; diff --git a/drivers/tee/optee/device.c b/drivers/tee/optee/device.c index e3a148521ec1..d4931dad07aa 100644 --- a/drivers/tee/optee/device.c +++ b/drivers/tee/optee/device.c @@ -21,7 +21,6 @@ * 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) { @@ -32,7 +31,8 @@ static int optee_ctx_match(struct tee_ioctl_version_data *ver, const void *data) } static int get_devices(struct tee_context *ctx, u32 session, - struct tee_shm *device_shm, u32 *shm_size) + struct tee_shm *device_shm, u32 *shm_size, + u32 func) { int ret = 0; struct tee_ioctl_invoke_arg inv_arg; @@ -42,7 +42,7 @@ static int get_devices(struct tee_context *ctx, u32 session, memset(¶m, 0, sizeof(param)); /* Invoke PTA_CMD_GET_DEVICES function */ - inv_arg.func = PTA_CMD_GET_DEVICES; + inv_arg.func = func; inv_arg.session = session; inv_arg.num_params = 4; @@ -87,7 +87,7 @@ static int optee_register_device(const uuid_t *device_uuid, u32 device_id) return rc; } -int optee_enumerate_devices(void) +static int __optee_enumerate_devices(u32 func) { const uuid_t pta_uuid = UUID_INIT(0x7011a688, 0xddde, 0x4053, @@ -118,7 +118,7 @@ int optee_enumerate_devices(void) goto out_ctx; } - rc = get_devices(ctx, sess_arg.session, NULL, &shm_size); + rc = get_devices(ctx, sess_arg.session, NULL, &shm_size, func); if (rc < 0 || !shm_size) goto out_sess; @@ -130,7 +130,7 @@ int optee_enumerate_devices(void) goto out_sess; } - rc = get_devices(ctx, sess_arg.session, device_shm, &shm_size); + rc = get_devices(ctx, sess_arg.session, device_shm, &shm_size, func); if (rc < 0) goto out_shm; @@ -158,3 +158,8 @@ int optee_enumerate_devices(void) return rc; } + +int optee_enumerate_devices(u32 func) +{ + return __optee_enumerate_devices(func); +} diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h index d9c5037b4e03..8b71839a357e 100644 --- a/drivers/tee/optee/optee_private.h +++ b/drivers/tee/optee/optee_private.h @@ -78,6 +78,9 @@ struct optee_supp { * @memremaped_shm virtual address of memory in shared memory pool * @sec_caps: secure world capabilities defined by * OPTEE_SMC_SEC_CAP_* in optee_smc.h + * @scan_bus_done flag if device registation was already done. + * @scan_bus_wq workqueue to scan optee bus and register optee drivers + * @scan_bus_work workq to scan optee bus and register optee drivers */ struct optee { struct tee_device *supp_teedev; @@ -89,6 +92,9 @@ struct optee { struct tee_shm_pool *pool; void *memremaped_shm; u32 sec_caps; + bool scan_bus_done; + struct workqueue_struct *scan_bus_wq; + struct work_struct scan_bus_work; }; struct optee_session { @@ -173,7 +179,9 @@ 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); +#define PTA_CMD_GET_DEVICES 0x0 +#define PTA_CMD_GET_DEVICES_SUPP 0x1 +int optee_enumerate_devices(u32 func); /* * Small helpers -- 2.17.1