From patchwork Tue Jan 24 10:56:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Etienne Carriere X-Patchwork-Id: 47658 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2084876wrn; Tue, 24 Jan 2023 03:04:34 -0800 (PST) X-Google-Smtp-Source: AMrXdXubTDwfnCwPvS0n8A5BLyihCWO4iHCZlLW/qdxmpOPlYHTMb5/9I6VSrcX1R4crAMNOYNVO X-Received: by 2002:a17:906:dfda:b0:871:e9a0:ebaa with SMTP id jt26-20020a170906dfda00b00871e9a0ebaamr31581797ejc.31.1674558274578; Tue, 24 Jan 2023 03:04:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674558274; cv=none; d=google.com; s=arc-20160816; b=X/JGqUC4JgfkD6Blyj7f+xxWwzxHVRvFCAVDoltqa1vrDy6A9GyexrvagpAVrXtuei AFoJ3amTLc7kDWPhcHkIxSm/V+I4bzdFXqYndnniOKNsS4PN9qik6cPENhTCbWCjwjHS p5Glbp9KrywrnFTLyXa6UU6+Dfwx4x5ZGESNQcIx/TtjluHpLLAlAZCguRVPmlRhQN84 EdllOn+vrJ/7XW9HMkZHjIdoB1bV4YFMOeV99i1mQlDyqOuoarZVP2Gm2fhui7AFiB6o bshFDexelAiYz/IH9bSPOR0F6cM4d88rAXfFTVXnUdcVHDSYgzoGo4D0cJef0QZNznd/ syQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=m7zN4CDUViF3PTZLyM/3kFec4UidZAgrawq/W4v1dbE=; b=Mwe3VR/8ITSg2oLhmtQ/BOWHwemxruwqhedJEU3lUmM2e5iI0Pa6OwcNLqoQ9POqMC S3FuspGd9FprTDkdKlnhOs7IpBI3o5SQsX9NSnzRm/pEz1VP+nxr3x6VM36kiVzMUt6N BKehngi3lMjLMEbLbnd/zW3V92j8JYpa+x3fzrkq3jEJvDT3MyDaIfGxVvVTRyR5UfcR BVcbbeLKM4iGaVsh5dSl4fhGMFUxUJnf1FFHw2Pd5KTdT3F7hFtUoQ6b0rlmzopPwL7m 9GBZ2/jRgNi7kjeztP7L0yNzvjHmexegIP5T/l6Pm12etopRqib/oSJuDZ2XAUcKbqdz kFlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SVJXlXmb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 22-20020a170906015600b0078d20d71475si2238789ejh.413.2023.01.24.03.04.10; Tue, 24 Jan 2023 03:04:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SVJXlXmb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S233193AbjAXK45 (ORCPT + 99 others); Tue, 24 Jan 2023 05:56:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232744AbjAXK44 (ORCPT ); Tue, 24 Jan 2023 05:56:56 -0500 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EFE2DEC45 for ; Tue, 24 Jan 2023 02:56:54 -0800 (PST) Received: by mail-wr1-x431.google.com with SMTP id e3so13442842wru.13 for ; Tue, 24 Jan 2023 02:56:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=m7zN4CDUViF3PTZLyM/3kFec4UidZAgrawq/W4v1dbE=; b=SVJXlXmbWCgWfJoKLOELiV3fZM7TPGBX7/4aB4cChDFmAvaO9yCbZCWDpOcBZqJxaR KjIFa5J7OWQxCCSQRDc4f1OIGR1hBaWUF078zeJ8y/lM05hTyPeezt5abkzBoaOKnmlu jTa3bmaeBNjpSZvnrIm15snup4RRtZNHZRf+yM0ZEJLZ1KaCqFHbkBDp5ZjlGQzmCH8A q0EIoCrh1pgKipIQ3BjEfUn5cTeCRq4Y6O/7IbwYqJtXjpKZzSO132hhx609ae1/jmmp vYKvjj1A9a3WC4y57svKbk834PKkeoAJShWJsTjeUzT3yCJWhS2HJpTGcAeo11cyvoMc sAzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=m7zN4CDUViF3PTZLyM/3kFec4UidZAgrawq/W4v1dbE=; b=YIDcqv4eeqsph6yY5qxIha0YHm/LUWrXyO6AWK+KDDCRoA31lLcZnVPyyF1sHvY5CH hulx1nwL7S8Kalm4UhQZQIRNYi1ihP/SawIQHMtOvByU86B7RQo3W8VGImibIm4h+UFx YQxHVH+j5tcjqiP+LlxiCE8KOc6564xUZcfNWdTrrbm7y8mb5YD4RajQ94b97nSDUMHC 5pYO6XQNe/as+tXjFbLrE2WnD9iW9fiBUKfHdBv92jR9gB6GutwjWYSkKkh4uxK5BkfL hm+Swm4r4MabsLP9s5cFrJCAx/3Ypz+hSe5PgT+aVNP1Yy6QGm/lgn4nuCUM/g+VEX0g xAIA== X-Gm-Message-State: AFqh2kqa3HYNk0oWCTMcYE8hbfGI539Cj+H1jWVvauv1XZNdK6aiPAjh jCmo188KHdQydDokczUVwP/IhFtKYR1pRKoJ X-Received: by 2002:adf:e587:0:b0:2be:54a7:2b8b with SMTP id l7-20020adfe587000000b002be54a72b8bmr14573243wrm.21.1674557813173; Tue, 24 Jan 2023 02:56:53 -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.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 02:56:52 -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 , Krzysztof Kozlowski , Marc Zyngier , Rob Herring , Sumit Garg , Pascal Paillet Subject: [PATCH v2 1/3] dt-bindings: arm: optee: add interrupt controller properties Date: Tue, 24 Jan 2023 11:56:41 +0100 Message-Id: <20230124105643.1737250-1-etienne.carriere@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755901617131933274?= X-GMAIL-MSGID: =?utf-8?q?1755901617131933274?= Adds an optional interrupt controller property to optee firmware node in the DT bindings. Optee driver may embeds an irqchip exposing interrupts notified by the TEE world. Optee registers up to 1 interrupt controller and identifies each line with a line number from 0 to UINT16_MAX. In the example, the platform SCMI device uses optee interrupt irq 5 as async signal to trigger processing of an async incoming SCMI message, in the scope of a CPU DVFS control. A platform can have several SCMI channels driven this way. Optee irqs also permits small embedded devices to share e.g. a gpio expander, a group of wakeup sources, etc... between OP-TEE world (for sensitive services) and Linux world (for non-sensitive services). The physical controller is driven from the TEE which exposes some controls to Linux kernel. Cc: Jens Wiklander Cc: Krzysztof Kozlowski Cc: Marc Zyngier Cc: Rob Herring Cc: Sumit Garg Co-developed-by: Pascal Paillet Signed-off-by: Pascal Paillet Signed-off-by: Etienne Carriere --- Changes since v1: - Added a description to #interrupt-cells property. - Changed of example. Linux wakeup event was subject to discussion and i don't know much about input events in Linux. So move to SCMI. In the example, an SCMI server in OP-TEE world raises optee irq 5 so that Linux scmi optee channel &scmi_cpu_dvfs pushed in the incoming SCMI message in the scmi device for liekly later processing in threaded context. The example includes all parties: optee, scmi, sram, gic. - Obviously rephrased the commit message. - Added Cc: tags --- .../arm/firmware/linaro,optee-tz.yaml | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.yaml b/Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.yaml index d4dc0749f9fd..9c00c27f8b2c 100644 --- a/Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.yaml +++ b/Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.yaml @@ -40,6 +40,14 @@ properties: HVC #0, register assignments register assignments are specified in drivers/tee/optee/optee_smc.h + interrupt-controller: true + + "#interrupt-cells": + const: 1 + description: | + OP-TEE exposes irq for irp chip controllers from OP-TEE world. Each + irq is assigned a single line number identifier used as first argument. + required: - compatible - method @@ -64,3 +72,62 @@ examples: method = "hvc"; }; }; + + - | + #include + firmware { + optee: optee { + compatible = "linaro,optee-tz"; + method = "smc"; + interrupts = ; + interrupt-controller; + #interrupt-cells = <1>; + }; + + scmi { + compatible = "linaro,scmi-optee"; + linaro,optee-channel-id = <0>; + interrupt-parent = <&gic>; + #address-cells = <1>; + #size-cells = <0>; + + scmi_cpu_dvfs: protocol@13 { + reg = <0x13>; + linaro,optee-channel-id = <1>; + shmem = <&scmi_shm_tx>, <&scmi_shm_rx>; + interrupts-extended = <&optee 5>; + interrupt-names = "a2p"; + #clock-cells = <1>; + }; + }; + }; + + gic: interrupt-controller@a0021000 { + compatible = "arm,cortex-a7-gic"; + reg = <0xa0021000 0x1000>, <0xa0022000 0x2000>; + interrupt-controller; + #interrupt-cells = <3>; + }; + + soc { + #address-cells = <1>; + #size-cells = <1>; + + sram@2ffff000 { + compatible = "mmio-sram"; + reg = <0x2ffff000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x2ffff000 0x1000>; + + scmi_shm_tx: scmi-sram@0 { + compatible = "arm,scmi-shmem"; + reg = <0 0x80>; + }; + + scmi_shm_rx: scmi-sram@100 { + compatible = "arm,scmi-shmem"; + reg = <0x100 0x80>; + }; + }; + }; From patchwork Tue Jan 24 10:56:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Etienne Carriere X-Patchwork-Id: 47659 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2084931wrn; Tue, 24 Jan 2023 03:04:42 -0800 (PST) X-Google-Smtp-Source: AMrXdXui+xaVBGHVwojtlo9YUSeP9lShH4OR2zaj0FC9AgAgAkwcxj4O975hImQqRQ5PVVTbY9vk X-Received: by 2002:a05:6402:10c6:b0:497:d4ca:457d with SMTP id p6-20020a05640210c600b00497d4ca457dmr28100538edu.34.1674558282206; Tue, 24 Jan 2023 03:04:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674558282; cv=none; d=google.com; s=arc-20160816; b=pglB1rsZp6WncfFbpuSh85EQltF6mfKkjU7WXqv6y7bv9KdVX4hR3D2kywNsoBa33Z 7FBkeOK7jR0eHtnQw+M9/Cg0uh73KRPUodqyTpobthtiuvVgR5oU+z5s9MyoTvLfcOZK E0EXEAiU8hM3Ammyupg5nKI6clKHl3HXSO09kwQunR4cByfltekv0wTNCLR0jbizyvQG CstmRu4wvKR/0uhso8iTtSX25Uha+QSw+yvMpsDkVt4dbVocgeT6IgcxQJRZRttAIV61 un9RlqtKpc/6xIun5J0/L4IWj2klREvTODJselBF3Xko9HHeDQN+6vOh7x0o5RD38p+H 7arw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=M0XsyXY+n4GmucCFBe52Rya1+343IWilmPWRC806Fhg=; b=zMdNdt6Nxs+/c0JomAbI4LsFFeqL30kf+I5IyYwty6sn9hU5adYx+Rjvoxre9RC1d8 eXLweO8nPyboMH9/f5/x/kenwNSHjSeYUzWMaJj1UP+JmHlD+vzscqKTmJwg+InvPBMw bE8iWmUrfMx0q4pGpi8o6PmVRYpS0IVw45g3CeeMDXh+cAqhXpTSQIXFO60B3StMRk6d gVbiTWkCWjAqhgyoZ+nuaIyJ2Pczm8CLEbpctXf37XNOKCaA5sHniQIJXQv3RxXB4xYM IJVc+gc4bsZmGuW41wna8VRH8m+Q/EjI6hzseR3fXyVSwr48ldYrYxb5pkEAUS7wZ8bN MHEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jbXCuDn2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e14-20020a056402088e00b004917c8c661csi2646732edy.243.2023.01.24.03.04.18; Tue, 24 Jan 2023 03:04:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jbXCuDn2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S233692AbjAXK47 (ORCPT + 99 others); Tue, 24 Jan 2023 05:56:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233605AbjAXK46 (ORCPT ); Tue, 24 Jan 2023 05:56:58 -0500 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3AF84EFB5 for ; Tue, 24 Jan 2023 02:56:56 -0800 (PST) Received: by mail-wr1-x432.google.com with SMTP id q5so8809951wrv.0 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=M0XsyXY+n4GmucCFBe52Rya1+343IWilmPWRC806Fhg=; b=jbXCuDn2lEsFfmOYVq5Vyfw0PcjbNLGJHTKCMz6JdOor9KLvZTd2JrpFPjSA5IBM+f tud2Rt1SCaQkciYEOjWm92GOJ44oUWYX+dKEnIfU4TJnXsvonQc4IHubNZez7SMvZSNb bAdTE2izXCwRtnn80WMWjNMX5jLqI2Btxqfo5htF17CvYmb8ZLm/9YNAtX+XfUgvrtix 5iYsqy4BraYM4qWDjbmoXPECDnweok9L8w0K9gZC1DQL60P1D9uYobxig9HtMtmdwmLu QgWrjxDHD5JUv0NJlZFu5w/ueJVEsZWHa3PKTZ5feFT3IJxmIEeeu9Wv/m5Z4+twQNV4 Hdfg== 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=M0XsyXY+n4GmucCFBe52Rya1+343IWilmPWRC806Fhg=; b=E6uLL8gg+et3yTbL07hC/fjGcTTikbwvCxfSqxFOu2DBjqaeXsJ6+wbA6fg2ix0TX3 bw4YEKS5tBAbdIZDfN7HIFCRd0nb2XyG+IFDSt2FyUjuy57cJiuLOa6RCSrLOQXTi5Iv FtmbtfDnlfwXJdCKbXd/5FJmXCzDnTeZe60ptF+hGocYe2CSXmXkFScl2D5vDc1cpuzO +nDIyALdt8KQ5pwqMARfcMNd/1pa7wU6/+GSDBVxNlldfkeY81G9twgJxQGNc5TlhDcT blhH0zds4S49Xs+07yp8/9UmxySyc69EhW8IK/qNE7En7rVi8O+Cp2XuUOh078Ve2BPW A2fA== X-Gm-Message-State: AFqh2kqTXuo97b7GY9/ycNo8wIdQfUDaKs53hi5GIHWe0fVs9uRUkOGc lE/dB9GcJyjslk9hFKqt7wFdKPct81ksdmnZ X-Received: by 2002:a5d:50d0:0:b0:2bd:c2d7:2700 with SMTP id f16-20020a5d50d0000000b002bdc2d72700mr25279331wrt.42.1674557814429; Tue, 24 Jan 2023 02:56:54 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 02:56:54 -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 , Pascal Paillet , Fabrice Gasnier Subject: [PATCH v2 2/3] optee: multiplex tee interrupt events on optee async notif irq Date: Tue, 24 Jan 2023 11:56:42 +0100 Message-Id: <20230124105643.1737250-2-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-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755901625039386642?= X-GMAIL-MSGID: =?utf-8?q?1755901625039386642?= Implements an irqchip in optee driver to relay interrupts notified from OP-TEE world to the Linux OS. Optee registers up to 1 interrupt controller and identifies each line with a line number from 0 to UINT16_MAX. Existing optee async notif uses an irq for OP-TEE to signal Linux of a pending event. The implementation binds each event (an async notif value) to the awaking of a waiting thread or the processing of some TEE background (bottom half) tasks to be scheduled. The interrupt notification service added by this change allows TEE to relay interrupt signals to Linux on secure interrupt occurrences where the end consumer of the signal lives in normal world. When optee driver initializes, it negotiates with the TEE whether interrupt notification is supported or not. The feature is enabled if both Linux kernel and OP-TEE support it. OP-TEE defines 2 SMC function IDs for non-secure world to control interrupt events. SMC function OPTEE_SMC_GET_NOTIF_IT allows non-secure world to retrieve pending interrupts by grapes up to 5 lines. The function also reports whether there are pending async values targeting suspended threaded sequences execution and whether TEE has background threaded work to do (async notif value 0 was retrieved). SMC function OPTEE_SMC_CONFIG_NOTIF_IT configures the insterrupt line for masking and enabling state and wakeup source. Cc: Jens Wiklander Cc: Marc Zyngier Cc: Sumit Garg Co-developed-by: Pascal Paillet Signed-off-by: Pascal Paillet Co-developed-by: Fabrice Gasnier Signed-off-by: Fabrice Gasnier Signed-off-by: Etienne Carriere --- Changes since v1: - Removed dependency on optee per-cpu irq notification. - Change SMC function ID API to retrieves up to 5 optee irq events, the optee bottom half event and returns if other async notifications are pending, in a single invocation. - Implement only mask/unmask irqchip handlers with a 2nd SMC function to mask/unmask a optee irq in OP-TEE world from an interrupt context. - Added Cc: tags. --- drivers/tee/optee/optee_private.h | 10 ++ drivers/tee/optee/optee_smc.h | 88 ++++++++++++++++- drivers/tee/optee/smc_abi.c | 158 ++++++++++++++++++++++++++++-- 3 files changed, 249 insertions(+), 7 deletions(-) diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h index 04ae58892608..f467409e02e9 100644 --- a/drivers/tee/optee/optee_private.h +++ b/drivers/tee/optee/optee_private.h @@ -94,11 +94,21 @@ struct optee_supp { struct completion reqs_c; }; +/* + * struct optee_smc - optee smc communication struct + * @invoke_fn handler function to invoke secure monitor + * @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 + * @notif_irq interrupt used as async notification by OP-TEE or 0 + * @domain interrupt domain registered by OP-TEE driver + */ struct optee_smc { optee_invoke_fn *invoke_fn; void *memremaped_shm; u32 sec_caps; unsigned int notif_irq; + struct irq_domain *domain; }; /** diff --git a/drivers/tee/optee/optee_smc.h b/drivers/tee/optee/optee_smc.h index 73b5e7760d10..df32ad18eddb 100644 --- a/drivers/tee/optee/optee_smc.h +++ b/drivers/tee/optee/optee_smc.h @@ -226,7 +226,8 @@ struct optee_smc_get_shm_config_result { * a3 Bit[7:0]: Number of parameters needed for RPC to be supplied * as the second MSG arg struct for * OPTEE_SMC_CALL_WITH_ARG - * Bit[31:8]: Reserved (MBZ) + * Bit[23:8]: The maximum interrupt event notification number + * Bit[31:24]: Reserved (MBZ) * a4-7 Preserved * * Error return register usage: @@ -254,6 +255,11 @@ struct optee_smc_get_shm_config_result { #define OPTEE_SMC_SEC_CAP_ASYNC_NOTIF BIT(5) /* Secure world supports pre-allocating RPC arg struct */ #define OPTEE_SMC_SEC_CAP_RPC_ARG BIT(6) +/* Secure world supports interrupt events notification to normal world */ +#define OPTEE_SMC_SEC_CAP_IT_NOTIF BIT(7) + +#define OPTEE_SMC_SEC_CAP_MAX_NOTIF_IT_MASK GENMASK(23, 8) +#define OPTEE_SMC_SEC_CAP_MAX_NOTIF_IT_SHIFT 8 #define OPTEE_SMC_FUNCID_EXCHANGE_CAPABILITIES 9 #define OPTEE_SMC_EXCHANGE_CAPABILITIES \ @@ -426,6 +432,86 @@ struct optee_smc_disable_shm_cache_result { /* See OPTEE_SMC_CALL_WITH_REGD_ARG above */ #define OPTEE_SMC_FUNCID_CALL_WITH_REGD_ARG 19 +/* + * Retrieve up to 5 pending interrupt event notified by OP-TEE world + * and whether threaded event are pending on OP-TEE async notif + * controller, all this since the last call of this function. + * + * OP-TEE keeps a record of all posted interrupt notification events. + * When the async notif interrupt is received by + * non-secure world, this function should be called until all pended + * interrupt events have been retrieved. When an interrupt event is + * retrieved it is cleared from the record in OP-TEE world. + * + * It is expected that this function is called from an interrupt handler + * in normal world. + * + * Call requests usage: + * a0 SMC Function ID, OPTEE_SMC_GET_NOTIF_IT + * a1-6 Not used + * a7 Hypervisor Client ID register + * + * Normal return register usage: + * a0 OPTEE_SMC_RETURN_OK + * a1 Bit[7:0]: Number of pending interrupt carried in a1..a5 + * Bit[8]: OPTEE_SMC_NOTIF_IT_PENDING if other interrupt(s) are pending + * Bit[9]: OPTEE_SMC_NOTIF_ASYNC_PENDING if an threaded event is pending + * Bit[10]: OPTEE_SMC_NOTIF_DO_BOTTOM_HALF if retrieved bottom half notif + * Bit[15:11]: Reserved for furture use, MBZ + * Bit[31:16]: Pending interrupt line value if a1 & 0xFF >= 1 + * a2 Bit[15:0]: Pending interrupt line value if a1 & 0xFF >= 2 + * Bit[31:16]: Pending interrupt line value if a1 & 0xFF >= 3 + * a3 Bit[15:0]: Pending interrupt line value if a1 & 0xFF >= 4 + * Bit[31:16]: Pending interrupt line value if a1 & 0xFF == 5 + * a4-7 Preserved + * + * Not supported return register usage: + * a0 OPTEE_SMC_RETURN_ENOTAVAIL + * a1-7 Preserved + */ +#define OPTEE_SMC_NOTIF_IT_COUNT_MASK GENMASK(7, 0) +#define OPTEE_SMC_NOTIF_IT_PENDING BIT(8) +#define OPTEE_SMC_NOTIF_VALUE_PENDING BIT(9) +#define OPTEE_SMC_NOTIF_DO_BOTTOM_HALF BIT(10) + +#define OPTEE_SMC_FUNCID_GET_NOTIF_IT 20 +#define OPTEE_SMC_GET_NOTIF_IT \ + OPTEE_SMC_FAST_CALL_VAL(OPTEE_SMC_FUNCID_GET_NOTIF_IT) + +/* + * Configure an interrupt notification event + * + * It is expected that this function is called from an interrupt handler + * in normal world. + * + * Call requests usage: + * a0 SMC Function ID, OPTEE_SMC_CONFIGURE_NOTIF_IT + * a1 Interrupt identifier value + * a2 Bit[0]: 1 to configure interrupt mask with a3[bit 0], else 0 + * Bit[31:1] Reserved for future use, MBZ + * a3 Bit[0]: 1 to mask the interrupt, 0 to unmask (applies if a2[bit 0]=1) + * Bit[31:1] Reserved for future use, MBZ + * a4-6 Reserved for furture use, MBZ + * a7 Hypervisor Client ID register + * + * Normal return register usage: + * a0 OPTEE_SMC_RETURN_OK + * a1-7 Preserved + * + * Not supported return register usage: + * a0 OPTEE_SMC_RETURN_ENOTAVAIL + * a1-7 Preserved + * + * Invalid command with provided arguments return usage: + * a0 OPTEE_SMC_RETURN_EBADCMD + * a1-7 Preserved + */ +#define OPTEE_SMC_NOTIF_CONFIG_MASK BIT(0) + +#define OPTEE_SMC_FUNCID_CONFIGURE_NOTIF_IT 21 +#define OPTEE_SMC_CONFIGURE_NOTIF_IT \ + OPTEE_SMC_FAST_CALL_VAL(OPTEE_SMC_FUNCID_CONFIGURE_NOTIF_IT) + /* * Resume from RPC (for example after processing a foreign interrupt) * diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c index a1c1fa1a9c28..9f4fdd28f04a 100644 --- a/drivers/tee/optee/smc_abi.c +++ b/drivers/tee/optee/smc_abi.c @@ -977,6 +977,71 @@ static int optee_smc_stop_async_notif(struct tee_context *ctx) * 5. Asynchronous notification */ +static void config_notif_it(optee_invoke_fn *invoke_fn, u32 it_value, + u32 op_mask, u32 val_mask) +{ + struct arm_smccc_res res = { }; + + invoke_fn(OPTEE_SMC_CONFIGURE_NOTIF_IT, it_value, op_mask, val_mask, + 0, 0, 0, 0, &res); +} + +static void optee_it_irq_mask(struct irq_data *d) +{ + struct optee *optee = d->domain->host_data; + + config_notif_it(optee->smc.invoke_fn, d->hwirq, OPTEE_SMC_NOTIF_CONFIG_MASK, + OPTEE_SMC_NOTIF_CONFIG_MASK); +} + +static void optee_it_irq_unmask(struct irq_data *d) +{ + struct optee *optee = d->domain->host_data; + + config_notif_it(optee->smc.invoke_fn, d->hwirq, OPTEE_SMC_NOTIF_CONFIG_MASK, 0); +} + +static struct irq_chip optee_it_irq_chip = { + .name = "optee-it", + .irq_mask = optee_it_irq_mask, + .irq_unmask = optee_it_irq_unmask, +}; + +static int optee_it_alloc(struct irq_domain *d, unsigned int virq, + unsigned int nr_irqs, void *data) +{ + struct irq_fwspec *fwspec = data; + irq_hw_number_t hwirq; + + hwirq = fwspec->param[0]; + + irq_domain_set_hwirq_and_chip(d, virq, hwirq, &optee_it_irq_chip, d->host_data); + + return 0; +} + +static const struct irq_domain_ops optee_it_irq_domain_ops = { + .alloc = optee_it_alloc, + .free = irq_domain_free_irqs_common, +}; + +static int optee_irq_domain_init(struct platform_device *pdev, + struct optee *optee, u_int max_it) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + + optee->smc.domain = irq_domain_add_linear(np, max_it, + &optee_it_irq_domain_ops, + optee); + if (!optee->smc.domain) { + dev_err(dev, "Unable to add irq domain\n"); + return -ENOMEM; + } + + return 0; +} + static u32 get_async_notif_value(optee_invoke_fn *invoke_fn, bool *value_valid, bool *value_pending) { @@ -991,6 +1056,60 @@ static u32 get_async_notif_value(optee_invoke_fn *invoke_fn, bool *value_valid, return res.a1; } +static void forward_irq(struct optee *optee, unsigned int id) +{ + if (generic_handle_domain_irq(optee->smc.domain, id)) { + pr_err("No consumer for optee irq %u, it will be masked\n", id); + config_notif_it(optee->smc.invoke_fn, id, + OPTEE_SMC_NOTIF_CONFIG_MASK, + OPTEE_SMC_NOTIF_CONFIG_MASK); + } +} + +static void retrieve_pending_irqs(struct optee *optee, bool *async_value_pending, + bool *do_bottom_half) + +{ + struct arm_smccc_res res; + bool it_pending; + ssize_t cnt; + const unsigned int lsb_mask = GENMASK(15, 0); + const unsigned int msb_shift = 16; + + *async_value_pending = false; + *do_bottom_half = false; + + do { + optee->smc.invoke_fn(OPTEE_SMC_GET_NOTIF_IT, 0, 0, 0, 0, 0, 0, 0, &res); + + if (res.a0) + return; + + if (res.a1 & OPTEE_SMC_NOTIF_DO_BOTTOM_HALF) + *do_bottom_half = true; + + it_pending = res.a1 & OPTEE_SMC_NOTIF_IT_PENDING; + cnt = res.a1 & OPTEE_SMC_NOTIF_IT_COUNT_MASK; + if (cnt > 5 || (!cnt && it_pending)) { + WARN_ONCE(0, "Unexpected interrupt notif count %zi\n", cnt); + break; + } + + if (--cnt >= 0) + forward_irq(optee, res.a1 >> msb_shift); + if (--cnt >= 0) + forward_irq(optee, res.a2 & lsb_mask); + if (--cnt >= 0) + forward_irq(optee, res.a2 >> msb_shift); + if (--cnt >= 0) + forward_irq(optee, res.a3 & lsb_mask); + if (--cnt >= 0) + forward_irq(optee, res.a3 >> msb_shift); + } while (it_pending); + + *async_value_pending = res.a1 & OPTEE_SMC_NOTIF_VALUE_PENDING; +} + static irqreturn_t notif_irq_handler(int irq, void *dev_id) { struct optee *optee = dev_id; @@ -999,9 +1118,14 @@ static irqreturn_t notif_irq_handler(int irq, void *dev_id) bool value_pending; u32 value; - do { - value = get_async_notif_value(optee->smc.invoke_fn, - &value_valid, &value_pending); + if (optee->smc.sec_caps & OPTEE_SMC_SEC_CAP_IT_NOTIF) + retrieve_pending_irqs(optee, &value_pending, &do_bottom_half); + else + value_pending = true; + + while (value_pending) { + value = get_async_notif_value(optee->smc.invoke_fn, &value_valid, + &value_pending); if (!value_valid) break; @@ -1009,10 +1133,11 @@ static irqreturn_t notif_irq_handler(int irq, void *dev_id) do_bottom_half = true; else optee_notif_send(optee, value); - } while (value_pending); + }; if (do_bottom_half) return IRQ_WAKE_THREAD; + return IRQ_HANDLED; } @@ -1048,6 +1173,9 @@ static void optee_smc_notif_uninit_irq(struct optee *optee) free_irq(optee->smc.notif_irq, optee); irq_dispose_mapping(optee->smc.notif_irq); } + + if (optee->smc.sec_caps & OPTEE_SMC_SEC_CAP_IT_NOTIF) + irq_domain_remove(optee->smc.domain); } } @@ -1187,13 +1315,14 @@ static bool optee_msg_api_revision_is_compatible(optee_invoke_fn *invoke_fn) static bool optee_msg_exchange_capabilities(optee_invoke_fn *invoke_fn, u32 *sec_caps, u32 *max_notif_value, + u32 *max_notif_it, unsigned int *rpc_param_count) { union { struct arm_smccc_res smccc; struct optee_smc_exchange_capabilities_result result; } res; - u32 a1 = 0; + u32 a1 = OPTEE_SMC_SEC_CAP_IT_NOTIF; /* * TODO This isn't enough to tell if it's UP system (from kernel @@ -1219,6 +1348,12 @@ static bool optee_msg_exchange_capabilities(optee_invoke_fn *invoke_fn, else *rpc_param_count = 0; + if (*sec_caps & OPTEE_SMC_SEC_CAP_IT_NOTIF) + *max_notif_it = (res.result.data & OPTEE_SMC_SEC_CAP_MAX_NOTIF_IT_MASK) >> + OPTEE_SMC_SEC_CAP_MAX_NOTIF_IT_SHIFT; + else + *max_notif_it = 0; + return true; } @@ -1364,6 +1499,7 @@ static int optee_probe(struct platform_device *pdev) struct tee_device *teedev; struct tee_context *ctx; u32 max_notif_value; + u32 max_notif_it; u32 arg_cache_flags; u32 sec_caps; int rc; @@ -1385,7 +1521,7 @@ static int optee_probe(struct platform_device *pdev) } if (!optee_msg_exchange_capabilities(invoke_fn, &sec_caps, - &max_notif_value, + &max_notif_value, &max_notif_it, &rpc_param_count)) { pr_warn("capabilities mismatch\n"); return -EINVAL; @@ -1506,6 +1642,16 @@ static int optee_probe(struct platform_device *pdev) irq_dispose_mapping(irq); goto err_notif_uninit; } + + if (sec_caps & OPTEE_SMC_SEC_CAP_IT_NOTIF) { + rc = optee_irq_domain_init(pdev, optee, max_notif_it); + if (rc) { + free_irq(optee->smc.notif_irq, optee); + irq_dispose_mapping(irq); + goto err_notif_uninit; + } + } + enable_async_notif(optee->smc.invoke_fn); pr_info("Asynchronous notifications enabled\n"); } 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: 47661 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2085636wrn; Tue, 24 Jan 2023 03:06:15 -0800 (PST) X-Google-Smtp-Source: AK7set+lg5HB9ee5HHs4SKHh5Cy80mZ0MFjJ5TXWK4qEtyw8coeq+LEXl66LvkvNzVjPwtj5HIu8 X-Received: by 2002:a17:90b:1b4a:b0:22b:f93b:b5c0 with SMTP id nv10-20020a17090b1b4a00b0022bf93bb5c0mr537089pjb.44.1674558375590; Tue, 24 Jan 2023 03:06:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674558375; cv=none; d=google.com; s=arc-20160816; b=pCR1eK2/Uuv8leTbtO6NVnEu24oMBqn0DGyYHNv6+G3TANuoW86ylhrwB4ditxnpAL CIJKKgAwPq888psvjL4fQT0HMJbhGKP3Q2o+3TP0lsHQshnWOTonaoLnc1zpnsjQ/3d7 C4HDM05DDyJ94V4rZujHF+4/FFJvo3yjTedFE16B2L9k7sfN6cYzjfSQgBM66aYcsV4i PHWyCM1IHadBE5m7zhyKJgdhjisemxN1APzHwll98yUN29X6TlDwchNEFuYJThB9xuhI Ury5zFm8E3APGy+Bw7fxr6pjI4UwxrPxSvZhGUGkGUXF2i2ABQXVs1P2yMCaqmskox+I fozA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=sBOLFWe1r0zJ4kO4grZGmkZTRU8J2jIvTtXC1Hd0AlY=; b=klBZizLNBSaNZVlB4+NcG/JRiHE/wbou53yCFW+fsNJ6JWvGDX+JJQt6vCPGFw2ZNv VoMLHbVOMkBRrMPUdM3Q5WJzJ9ZQllLZDItO6zVwa6XX3wsSDosixiakFCGZ4ZjOr6GT 8Ptsui+82oWtjFxaSYaNEpsHVv3lcriAoYQOE/qvTkx1DKfCcxajWWgjDmcudSyYbNhz yocZKimUHw6HS/w8jyPgcMDHdV8gzPoxKYVDN3/GPylIK8+rWqichxBiQH1N8XGMtAAh mSsy5d+w5VPQHy1Im5VPNmOy7rjRdFD7WlsY1+LZLW5RkM3KLtBqn+8vIxhdFhaskXj4 2xXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vr4X8ZIK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t12-20020a63954c000000b004d83b011d4bsi1790311pgn.617.2023.01.24.03.06.03; Tue, 24 Jan 2023 03:06:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vr4X8ZIK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S233751AbjAXK5I (ORCPT + 99 others); Tue, 24 Jan 2023 05:57:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233491AbjAXK47 (ORCPT ); Tue, 24 Jan 2023 05:56:59 -0500 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D4F2EC45 for ; Tue, 24 Jan 2023 02:56:57 -0800 (PST) Received: by mail-wr1-x42b.google.com with SMTP id n7so13466230wrx.5 for ; Tue, 24 Jan 2023 02:56:57 -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=MKXkCEwkmcDg2Rpx1QcuOU8yGF8mpQY2jeue1pi4K7k6DaVCojEOmCBcIkk8nWeDDv LnB2+6ygexD5JgrSuiS3KqlQGc/zHsH7Sc3ClAJN2LNpEGfKqvWVljZw6rvlv/ab9PyD 41LMs8ceV7ovxP5lINmyUct64BT+qkMPAVCgQNBV2O/yeXJqanSBo0EEnwFGPsK8TA4q eCfKYcRUlW/LXxZGJQrYRq5e6yt6b4cpdjQAr6A7IL/trkYmAPLVa6FiLaGy/zBFZcp3 nQwo2HSS0OKfBu++375ePbgGrFWFCsWDo3mz71A5LSR2rEUA5/kj95foQDX5EcyoPouM P0Qw== X-Gm-Message-State: AFqh2krCkSbV60Q/dAnLsYfR7AaZrO2nXE/u5KWD7LphDb8xc9pTG4zR ROYw7IBmpzt6f3+pYURN1k6zbDAJHzY4++3f 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-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755901723594280748?= X-GMAIL-MSGID: =?utf-8?q?1755901723594280748?= 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: