From patchwork Tue Jan 24 10:56:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Etienne Carriere X-Patchwork-Id: 13114069 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 43212C25B4E for ; Tue, 24 Jan 2023 13:07:54 +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=955UaqO94OJKIoZibhCLjkI7RFjZyF4CzbxX+wzJWdo=; b=do48FyJroT6ScY PYnGhX7gJyAzXhtJbD7oMDMRtICrx6jLESpF9qszlR+btDWQJ6Wjao21yfrb0hOCpRMbshXTQsPWq sgcR8WXBjhtmcBGVbU6om6m+oSRQzYpsCimSoxguJ9Q7mklUba2CxgumWlpsqCF4NMwzrMl1pHxvW L0mBn042csksdUxIQMA76Uh94mSGyzzBLn1iHy5cOBUB7PUCjWIhIWBSksbCHmeIgvaMxY3G090yK Fy2ANIJDhyBPrT0IflAh9nr9/Q6+/1u/9VvqCczw8BLoqlTOQQTJYBgSmNAxWUUE6ipQqFFWPuroi I66s1v/D1GahZTxcB3Yg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKJ0b-003r8A-1O; Tue, 24 Jan 2023 13:06:41 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKIxX-003pef-39 for linux-arm-kernel@bombadil.infradead.org; Tue, 24 Jan 2023 13:03:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=sBOLFWe1r0zJ4kO4grZGmkZTRU8J2jIvTtXC1Hd0AlY=; b=bJ6I/4F8+2boxo85CvqNkCRbXi HAjA718+tiuXC1OE6+i1PWX60lhIJjPSdXQjpru55bJrAQGrnfVKauFryqpgikdS0Xl3XwEaR4ta9 3g+9/wx752j6VCZJz5EJ8ihMP1C0tejecOtct/k6+gqBBnSiozVd9fjz5RN7m0hIqU+71PTA90ffw LosF+VQFIK10ZOG8/GDbcmapMhOXRzqS6EkjiUeIpe+ArKHKhVamYF79OtyeBq+upg6mCQMoZiX4S K/2OHwIaNaVqE9GQ5PDsoLdGtZhoWHWHe10fgdTAyi/jcKKDMqvSDHU59rgEkShoRnnb7mG1bycoM GXYtTv9g==; Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pKGyk-001nTS-1h for linux-arm-kernel@lists.infradead.org; Tue, 24 Jan 2023 10:56:41 +0000 Received: by mail-wr1-x42e.google.com with SMTP id r2so13458147wrv.7 for ; Tue, 24 Jan 2023 02:56:56 -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=sBOLFWe1r0zJ4kO4grZGmkZTRU8J2jIvTtXC1Hd0AlY=; b=vr4X8ZIKruwzKqYQf/cvVuQzn5uiXgclV1uaSeh4xDurZafWkhm9xM2Zhwgn4M78ub VHsXrMxlvH+TtRHzKiF6xpKvizwN8hOG/2pcCNjpoip94AnsFnFBL9yks/dhJ9d+ZMED g9lCWQyQoNVLTLpdHiDogQyyrXadFxpAINTGZkLI1Jrfiy4CmWrRf/1dMPb/z92Nq6f7 JOHUAg//VwXQ+3cH1Gv/b2uWEzd4bSeXJ+qsg7mg3Vg4le0qSOZkIJAzgO8qfmQb1RtO ybNeNDV6EF9z83CQnFXV3sCq/SEZwkB0SWk/0q9A6VlpwejL9rmHBAmWIHfCeNHBFRn0 2SYg== 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=sBOLFWe1r0zJ4kO4grZGmkZTRU8J2jIvTtXC1Hd0AlY=; b=Bw/O0Xte0oXMQ0I9Y7dBuSz7IAWZ7bB18c489D+Vwr0VFVs6QjMisDcuawjM2AxRgP payJvSKMPN86593Lhp/W01HmlfwPzHDyH0QiSSt2yOJZdDZu+98tJIMoIEWqOZZQg+j9 q42IlW429eGBD7zsrgwoYE8q4YVAJ4wr00Uvx1hJRo0wquLKYknw9EwfSIpAniVBKxrK YW0kCD4lj/MT5hApU9TICELzk0tlOScgLJh9+FOSCzTGKeolvjz+5kClsIXEqcvFBNqR Kpl3gIvs0JZV42z1m2FgSnYcACAVNkpR9x4OQTikTJZ5IXltEMT/f5SA6olyp9xMu6Re CGhw== X-Gm-Message-State: AFqh2koWxEa4HGoRmrRlQPEeTPGAh64gih0x7Mf8L81FOOKYDBo4y944 ybT1jcvKQ+A7GLIV6EYlG9VJbw== X-Google-Smtp-Source: AMrXdXszjlB08CDXF0xh+XPxqY0Tb0HFQlRxrpM9zQwedKBFr2Gzb0eFECWdmwypDIAz2QXHnkF8Mw== X-Received: by 2002:adf:dc81:0:b0:2bc:7f99:f2a with SMTP id r1-20020adfdc81000000b002bc7f990f2amr23896010wrj.54.1674557815505; Tue, 24 Jan 2023 02:56:55 -0800 (PST) Received: from lmecxl1178.lme.st.com ([80.215.43.103]) by smtp.gmail.com with ESMTPSA id m18-20020adfe952000000b00286ad197346sm1599336wrn.70.2023.01.24.02.56.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 02:56:55 -0800 (PST) From: Etienne Carriere To: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Etienne Carriere , devicetree@vger.kernel.org, Jens Wiklander , Marc Zyngier , Sumit Garg Subject: [PATCH v2 3/3] optee: add enable/disable/set_wake handlers to optee irqs Date: Tue, 24 Jan 2023 11:56:43 +0100 Message-Id: <20230124105643.1737250-3-etienne.carriere@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230124105643.1737250-1-etienne.carriere@linaro.org> References: <20230124105643.1737250-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-20230124_105638_772550_10D1E585 X-CRM114-Status: GOOD ( 21.34 ) 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 Implements OP-TEE's It Notif PTA API to deactivate and activate an interrupt notifier and to configure the wakeup capability of that interrupt. These controls are useful for efficient power management of the device when an interrupt controller resources is hosted in OP-TEE world. When OP-TEE does not implement the It Notif PTA, the related handlers simply return with success. If OP-TEE exposes the PTA services, they are invoked on enable, disable and set_wake irqchip operations. Cc: Jens Wiklander Cc: Marc Zyngier Cc: Sumit Garg Signed-off-by: Etienne Carriere --- Changes since v1: - Patch added in v2 series for power-up/down and wakeup configuration of the irq chip. --- drivers/tee/optee/optee_private.h | 2 + drivers/tee/optee/smc_abi.c | 157 ++++++++++++++++++++++++++++++ 2 files changed, 159 insertions(+) diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h index f467409e02e9..257bb505a1fb 100644 --- a/drivers/tee/optee/optee_private.h +++ b/drivers/tee/optee/optee_private.h @@ -166,6 +166,7 @@ struct optee_ops { * @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 + * @notif_it_pta_ctx TEE context for invoking interrupt conif services */ struct optee { struct tee_device *supp_teedev; @@ -185,6 +186,7 @@ struct optee { bool scan_bus_done; struct workqueue_struct *scan_bus_wq; struct work_struct scan_bus_work; + struct tee_context *notif_it_pta_ctx; }; struct optee_session { diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c index 9f4fdd28f04a..95adf8c93c98 100644 --- a/drivers/tee/optee/smc_abi.c +++ b/drivers/tee/optee/smc_abi.c @@ -52,6 +52,43 @@ */ #define OPTEE_MIN_STATIC_POOL_ALIGN 9 /* 512 bytes aligned */ +/* + * Interrupt notification can be configured using Notif-IT PTA services. + * Below are the PTA UUID and its API commands. + */ +#define PTA_IT_NOTIF_UUID \ + UUID_INIT(0x4461e5c7, 0xb523, 0x4b73, 0xac, 0xed, 0x75, 0xad, \ + 0x2b, 0x9b, 0x59, 0xa1) + +/* + * PTA_IT_NOTIF_ACTIVATE_DETECTION - Enable a interrupt notification + * + * [in] params[0].value.a Interrupt ID + */ +#define PTA_IT_NOTIF_ACTIVATE_DETECTION 0 + +/* + * PTA_IT_NOTIF_DEACTIVATE_DETECTION - Disable a interrupt notification + * + * [in] params[0].value.a Interrupt ID + */ +#define PTA_IT_NOTIF_DEACTIVATE_DETECTION 1 + +/* + * PTA_IT_NOTIF_ENABLE_WAKEUP_SOURCE - Enable an interrupt wakeup source + * + * [in] params[0].value.a Interrupt ID + */ +#define PTA_IT_NOTIF_ENABLE_WAKEUP_SOURCE 2 + +/* + * PTA_IT_NOTIF_ENABLE_WAKEUP_SOURCE - Disable an interrupt wakeup source + * + * [in] params[0].value.a Interrupt ID + */ +#define PTA_IT_NOTIF_DISABLE_WAKEUP_SOURCE 3 + + /* * 1. Convert between struct tee_param and struct optee_msg_param * @@ -977,6 +1014,92 @@ static int optee_smc_stop_async_notif(struct tee_context *ctx) * 5. Asynchronous notification */ +static int optee_ctx_match(struct tee_ioctl_version_data *ver, const void *data) +{ + return ver->impl_id == TEE_IMPL_ID_OPTEE; +} + +static void init_optee_pta_context(struct optee *optee) +{ + struct tee_context *ctx = NULL; + const uuid_t pta_uuid = PTA_IT_NOTIF_UUID; + struct tee_ioctl_open_session_arg sess_arg; + int ret; + + ctx = tee_client_open_context(NULL, optee_ctx_match, NULL, NULL); + if (IS_ERR(ctx)) + return; + + memset(&sess_arg, 0, sizeof(sess_arg)); + export_uuid(sess_arg.uuid, &pta_uuid); + sess_arg.clnt_login = TEE_IOCTL_LOGIN_REE_KERNEL; + + ret = tee_client_open_session(ctx, &sess_arg, NULL); + if ((ret < 0) || (sess_arg.ret != 0)) { + pr_err("Can't open IT_NOTIF PTA session: %#x\n", sess_arg.ret); + tee_client_close_context(ctx); + return; + } + + tee_client_close_session(ctx, sess_arg.session); + + optee->notif_it_pta_ctx = ctx; +} + +static void release_optee_pta_context(struct optee *optee) +{ + if (optee->notif_it_pta_ctx) { + tee_client_close_context(optee->notif_it_pta_ctx); + optee->notif_it_pta_ctx = NULL; + } +} + +static int invoke_optee_pta(struct optee *optee, unsigned int command, + unsigned int irq_id) +{ + const uuid_t pta_uuid = PTA_IT_NOTIF_UUID; + struct tee_ioctl_open_session_arg sess_arg; + struct tee_ioctl_invoke_arg inv_arg; + struct tee_param param[1]; + int ret; + + if (!optee->notif_it_pta_ctx) + return -ENOENT; + + memset(&sess_arg, 0, sizeof(sess_arg)); + export_uuid(sess_arg.uuid, &pta_uuid); + sess_arg.clnt_login = TEE_IOCTL_LOGIN_REE_KERNEL; + + ret = tee_client_open_session(optee->notif_it_pta_ctx, &sess_arg, NULL); + if ((ret < 0) || (sess_arg.ret != 0)) { + pr_err("tee_client_open_session failed, err: %#x\n", sess_arg.ret); + if (!ret) + ret = -EINVAL; + return ret; + } + + memset(&inv_arg, 0, sizeof(inv_arg)); + inv_arg.session = sess_arg.session; + inv_arg.func = command; + inv_arg.num_params = 1; + + memset(¶m, 0, sizeof(param)); + param[0].attr = TEE_IOCTL_PARAM_ATTR_TYPE_VALUE_INPUT; + param[0].u.value.a = irq_id; + + ret = tee_client_invoke_func(optee->notif_it_pta_ctx, &inv_arg, param); + if ((ret < 0) || (inv_arg.ret != 0)) { + pr_err("tee_client_invoke_func failed, ret: %d, err: %#x\n", + ret, inv_arg.ret); + if (!ret) + ret = -EINVAL; + } + + tee_client_close_session(optee->notif_it_pta_ctx, sess_arg.session); + + return ret; +} + static void config_notif_it(optee_invoke_fn *invoke_fn, u32 it_value, u32 op_mask, u32 val_mask) { @@ -1001,10 +1124,40 @@ static void optee_it_irq_unmask(struct irq_data *d) config_notif_it(optee->smc.invoke_fn, d->hwirq, OPTEE_SMC_NOTIF_CONFIG_MASK, 0); } +static void optee_it_irq_disable(struct irq_data *d) +{ + struct optee *optee = d->domain->host_data; + + (void)invoke_optee_pta(optee, PTA_IT_NOTIF_DEACTIVATE_DETECTION, d->hwirq); +} + +static void optee_it_irq_enable(struct irq_data *d) +{ + struct optee *optee = d->domain->host_data; + + (void)invoke_optee_pta(optee, PTA_IT_NOTIF_ACTIVATE_DETECTION, d->hwirq); +} + +static int optee_it_irq_set_wake(struct irq_data *d, unsigned int on) +{ + struct optee *optee = d->domain->host_data; + u32 command; + + if (on) + command = PTA_IT_NOTIF_ENABLE_WAKEUP_SOURCE; + else + command = PTA_IT_NOTIF_DISABLE_WAKEUP_SOURCE; + + return invoke_optee_pta(optee, command, d->hwirq); +} + static struct irq_chip optee_it_irq_chip = { .name = "optee-it", .irq_mask = optee_it_irq_mask, .irq_unmask = optee_it_irq_unmask, + .irq_disable = optee_it_irq_disable, + .irq_enable = optee_it_irq_enable, + .irq_set_wake = optee_it_irq_set_wake, }; static int optee_it_alloc(struct irq_domain *d, unsigned int virq, @@ -1463,6 +1616,7 @@ static int optee_smc_remove(struct platform_device *pdev) optee_disable_shm_cache(optee); optee_smc_notif_uninit_irq(optee); + release_optee_pta_context(optee); optee_remove_common(optee); @@ -1650,6 +1804,8 @@ static int optee_probe(struct platform_device *pdev) irq_dispose_mapping(irq); goto err_notif_uninit; } + + init_optee_pta_context(optee); } enable_async_notif(optee->smc.invoke_fn); @@ -1687,6 +1843,7 @@ static int optee_probe(struct platform_device *pdev) optee_disable_shm_cache(optee); optee_smc_notif_uninit_irq(optee); optee_unregister_devices(); + release_optee_pta_context(optee); err_notif_uninit: optee_notif_uninit(optee); err_close_ctx: