From patchwork Wed Feb 15 17:02:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Etienne Carriere X-Patchwork-Id: 13141961 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id C131FC636D4 for ; Wed, 15 Feb 2023 17:04:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cloBXadXXC9rzWOQa+y0Bg6FRTFIfVlFT+39sjfw6to=; b=CBdcDFvkNav2dE T0Tv4c1VUha1cZ54XA7AEG+4wo+E2vhNNX4EAao7vgaTePmvxZPWxfIiURvy8HkQXX+cW4Be/Vg9n gFnvW4bDAtl2j5m3LSqhJoY7S/yRtTc259hHG0XqH3ugA4zD5bTUA+dzYuIzrIYCZploF45KdKB1+ 7V34Fr2y0O+r1uvTuPskhgMtGvgmIpFmx2XCNCcjrm1SBmefyn598tvW+Vf2WJvFWknMKtmFzfg+f LIhscl7Vt0DiOrghkG090o8xbkM+Y8cLlGifQbMNbgQS9mq0BQeHzlSBOLaQn51KPH9PQqyUT+wzk 7jdN4epkbgDj1/anqa7A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pSLBM-006bQR-8T; Wed, 15 Feb 2023 17:03:00 +0000 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pSLBC-006bNw-0U for linux-arm-kernel@lists.infradead.org; Wed, 15 Feb 2023 17:02:53 +0000 Received: by mail-wm1-x32d.google.com with SMTP id hg24-20020a05600c539800b003e1f5f2a29cso2061387wmb.4 for ; Wed, 15 Feb 2023 09:02:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WiZADvWOmxCdPIUazfbuTYmfEz/1yOYWessMhqvHszk=; b=dNPM7pL8rUSgc2jImPNKjwMXskjKNPF92j+W7BvGiWNoCyqXMGJjeiJnsFASxSbw1x BdyBuBGuRhFCwAhQAqSZXbBE1sGpoHhlHQftxTw6iS2SG+QJ67KbSVywRG5zyZ6vlLvC h90CUmLnQF0kfM7LVwSlkL6X2yMtSG9T4rQSb4HIFhJK6svycNoFF5SsCZSlvdg38TnM xCBBzCckeLLK9WdbleYwoSGRErxGb9FpVB0CWIdvavHjxvQVLJ4ErHW6TjcHoMR/WNpr 16aZ6SqqlJhyOjK6TPHHzSZJ8ZRJUYHvK7fVSThJd0NR08URygAYQuAoExueg5M3XIhD dJvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WiZADvWOmxCdPIUazfbuTYmfEz/1yOYWessMhqvHszk=; b=Twjr1SJHYmai6Z5JxyvFufGfTsqmkqcGEnBSsdd62M/4aglOJKDwsf3hXi0l6G6zFw 0xJR6BixOuTMfMu4PCNlyApat+nTNf4N3uBg8QcQ+TlFrC4Wd9NuaY3eQHBzenLN2K/m QLBNS7X03YzU1R6h6YmaMVab0bDoAUrsW8q8iByGOIoYyiNmcvVw8Xuq/ZmLO1eD4/oi BuN0LLLAH7rZlIijouGCQY9IqazaJW1rrldlizW/Sv/TAeo/AsQJj4Zz7K6MvMSZczqZ +IRXMEsnZ0goHmwFD9X0Hsue6fx9Rt8tGtMFau5zfnsHihVfi8I9Vu1jkMAhNgkwqDy4 RhBQ== X-Gm-Message-State: AO0yUKVB/cY++Zd8T5Bd0fikJyI8LK1tQK/29ULnu3br5slFzW14oJEc esQX9pDKtO37Oj325NggKHND+PaKeo/BMLrL X-Google-Smtp-Source: AK7set9lwS1FJrOeQaKOqyxbs6IcpeDLkn/cpCKO3rYtS5QGwP2it0Kqho+hBDKMHykhGMegaHSYyg== X-Received: by 2002:a05:600c:4488:b0:3d9:fb89:4e3d with SMTP id e8-20020a05600c448800b003d9fb894e3dmr2559026wmo.28.1676480566248; Wed, 15 Feb 2023 09:02:46 -0800 (PST) Received: from lmecxl1178.lme.st.com (176-165-102-236.abo.bbox.fr. [176.165.102.236]) by smtp.gmail.com with ESMTPSA id c2-20020a05600c0a4200b003e1fb31fc2bsm2941556wmq.37.2023.02.15.09.02.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 09:02:45 -0800 (PST) From: Etienne Carriere To: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Jens Wiklander , Sumit Garg , op-tee@lists.trustedfirmware.org, Cristian Marussi , Etienne Carriere Subject: [PATCH v4 2/2] firmware: arm_scmi: optee: use optee system invocation Date: Wed, 15 Feb 2023 18:02:38 +0100 Message-Id: <20230215170238.1864311-2-etienne.carriere@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230215170238.1864311-1-etienne.carriere@linaro.org> References: <20230215170238.1864311-1-etienne.carriere@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230215_090250_069771_39190297 X-CRM114-Status: GOOD ( 13.26 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Changes SCMI optee transport to request an OP-TEE system invocation context per SCMI channel. This prevents possible deadlock when many Linux clients invoke OP-TEE are all suspended waiting for an OP-TEE RPC request access an SCMI resource through the SCMI OP-TEE PTA service. Signed-off-by: Etienne Carriere --- No change since v3 Changes since v2: - Fixed syntax issues (missing ';' chars), reported by kernel test robot. Changes since v1: - Updated to use new tee API functions tee_client_request_system_context() and tee_client_release_system_context(). --- drivers/firmware/arm_scmi/optee.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/arm_scmi/optee.c b/drivers/firmware/arm_scmi/optee.c index 2a7aeab40e54..28a006348e1c 100644 --- a/drivers/firmware/arm_scmi/optee.c +++ b/drivers/firmware/arm_scmi/optee.c @@ -119,6 +119,7 @@ struct scmi_optee_channel { u32 tee_session; u32 caps; u32 rx_len; + bool sys_thread; struct mutex mu; struct scmi_chan_info *cinfo; union { @@ -432,9 +433,15 @@ static int scmi_optee_chan_setup(struct scmi_chan_info *cinfo, struct device *de channel->channel_id = channel_id; mutex_init(&channel->mu); + ret = tee_client_request_system_context(scmi_optee_private->tee_ctx); + if (ret) + dev_warn(dev, "Couldn't provision an OP-TEE system context\n"); + else + channel->sys_thread = true; + ret = setup_shmem(dev, cinfo, channel); if (ret) - return ret; + goto err_release_sysctx; ret = open_session(scmi_optee_private, &channel->tee_session); if (ret) @@ -458,6 +465,9 @@ static int scmi_optee_chan_setup(struct scmi_chan_info *cinfo, struct device *de err_free_shm: if (channel->tee_shm) tee_shm_free(channel->tee_shm); +err_release_sysctx: + if (channel->sys_thread) + tee_client_release_system_context(scmi_optee_private->tee_ctx); return ret; } @@ -483,6 +493,9 @@ static int scmi_optee_chan_free(int id, void *p, void *data) scmi_free_channel(cinfo, data, id); + if (channel->sys_thread) + tee_client_release_system_context(scmi_optee_private->tee_ctx); + return 0; }