From patchwork Mon Feb 13 09:58:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Etienne Carriere X-Patchwork-Id: 13138129 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 5C05AC636CC for ; Mon, 13 Feb 2023 09:59:47 +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: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:In-Reply-To:References: List-Owner; bh=jFlWuL089n/gE/1fi6Ux/e9iFGA3O3IruFNhLZMSbRc=; b=eOaQ1eWEjNM1gh 6zCmrM7v9GlNzY510QBkil3OCVkSTqDq7KSCXaDPp1pjemJ86YqqutJeD5Hdm912N0WWzBYGxKOMM sybJmKmCc3Y4426uS1yWS1nYrVs5B+jTvrZiy/91jmWjf7DSY4ZDizG2AKVe9AIu05MsSUu0pgnNQ RbGBoY4odU/Vjzxv/LZdxkfTvh9ps2oGWhrgbeuxxmP6Z72CAgb1KUas6DB2TBi5nh08kJLRUWHQH U5xefzDa6/Q2DfLClFVPdWKFbiTrzDV2Rwu/sufScSXPK96Zb8Tp+4XckbP2cTcKqeyJeJ5QhVOmJ ZkUbnwlz8lG5EYWaDyXg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pRVbj-00E05f-2i; Mon, 13 Feb 2023 09:58:47 +0000 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pRVbf-00E04l-Ml for linux-arm-kernel@lists.infradead.org; Mon, 13 Feb 2023 09:58:45 +0000 Received: by mail-wr1-x431.google.com with SMTP id o15so8197166wrc.9 for ; Mon, 13 Feb 2023 01:58:41 -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=AjMgJb2ixqUEs/67uyolQpFmh3OuMlDckhQRKi1L98Y=; b=FQ3xp3hicKBpobKBfqxwNCK/02CxQJ4R62mNhManClSG5NsgKmfTBQmkwem8t4Efey /IOe4ONZV2ruScKfjdGU6/zXVVvYxkpHQm72M/Tb84GkmUAo2DrgycyLTJ20gg6jwmEq kdzvHtIdLhdWwc1I8dHjy8FOkGpoDz2SZ+cMsClIXd1EtabqpFn5jXO9bjAzLaVEMWRT 30pVh/hGjpAG9UkkrPZHlbbDmXbubZsNYa756NiKvEpfbvmFKw+nvXuGnu6lmgtiMNtY lHlpyRlHbxQR+Sge/GUrQndhvgZG9T4uf/aU9LTLRC327SLFwSkVQNxOrYSU9BGwwplw y3Aw== 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=AjMgJb2ixqUEs/67uyolQpFmh3OuMlDckhQRKi1L98Y=; b=TE/VxwTE3/3xM6lnVo0WBLg6dMkc9iHgyjfMA2W9c6j0d0mQmBwTYCS7K7cemE6kUX IBMySdfSt0Fuo6A+DQqH/XnBYJYrDrRCy4Y7Hxeca0KUmICCCbzN0QECXEUYK0crlwyu mA8FFg8YClV87R8OK1xSJNDUhZ+GsTpLClDSDlIbIM1KmEMLKdVAMr3rmPwVfcJaCaG/ jv0F48fKK8AT1kHY0mhGM7yh+fkOIOThZu7lfgPezr3XpO99EC2mI+SjdNgwIHGwNifo XvpQuaYZw/IPRwWyw7Wtc4wh9UhckkKkD69uLHkiQl7ANBOIu4u/EO0KItVQMyJ7YYVv r/EQ== X-Gm-Message-State: AO0yUKW8cIb/xgMwP3MsL02bO0RiHlFRH3MlInq5n75nDB49mGvEMnVs KKzbMVfw02MmBw3Ly09y+BvRYg== X-Google-Smtp-Source: AK7set+uYZsTqtSq+FM6NZkfE+ORgajvmR481WMnarK85nUaHLkfcGcszRKZzvQkouZpmDWlLi7bSw== X-Received: by 2002:adf:fcc1:0:b0:2c3:f78f:518f with SMTP id f1-20020adffcc1000000b002c3f78f518fmr17853836wrs.39.1676282320814; Mon, 13 Feb 2023 01:58:40 -0800 (PST) Received: from lmecxl1178.lme.st.com ([80.215.89.243]) by smtp.gmail.com with ESMTPSA id k21-20020a05600c1c9500b003dd1c45a7b0sm14105801wms.23.2023.02.13.01.58.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 01:58:40 -0800 (PST) From: Etienne Carriere To: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Sumit Garg , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org, Jens Wiklander , Etienne Carriere Subject: [PATCH v4 1/2] dt-bindings: optee driver interrupt can be a per-cpu interrupt Date: Mon, 13 Feb 2023 10:58:28 +0100 Message-Id: <20230213095829.42911-1-etienne.carriere@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230213_015843_788429_81CF928A X-CRM114-Status: GOOD ( 11.38 ) 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 Explicit in optee firmware device tree bindings that the interrupt used by optee driver for async notification can be a peripheral interrupt or a per-cpu interrupt. Signed-off-by: Etienne Carriere --- Changes since v3: - Patch added in this v4 to address review comments. --- .../devicetree/bindings/arm/firmware/linaro,optee-tz.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.yaml b/Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.yaml index d4dc0749f9fd..5d033570b57b 100644 --- a/Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.yaml +++ b/Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.yaml @@ -28,7 +28,8 @@ properties: maxItems: 1 description: | This interrupt which is used to signal an event by the secure world - software is expected to be edge-triggered. + software is expected to be either a per-cpu interrupt or an + edge-triggered peripheral interrupt. method: enum: [smc, hvc] From patchwork Mon Feb 13 09:58:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Etienne Carriere X-Patchwork-Id: 13138130 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 349C2C636D4 for ; Mon, 13 Feb 2023 09:59:49 +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=5DrSm/Z5RAABDgPC+keMNx0YvUUhs66O3ns1cAyz2rA=; b=fagZwwIdQVy3uA 4/qmF+TFL/S4murxiGi77F/RxOV2TWCGQYlmaQ4GQm2q+hr23LkTq7SU8gX2gHCf4ldQj1MgiVMrC lUJZ6LtRumvgUAF74Trb3AVs++CiBUt9pz9XdEvS82nzSzslrzDmmrxLTnNs0oiG0v+RFzQE4CCkC jiNaFwMX8Hvauopjmbd2b+hTuIsibtsWeUUE4lv+lRpYig8tgA1F1XkkLGqLi1gG9zVlpuC3L7GbR ZVHVZoAeBuSIamt1kCTDbFuUbdIwuG5MmJ6MbTjrnOVIY48KNZT21yHl2JBce1jy6Ip//qfSLVq+K hRkNmnKgx7t+Pm5r3O4w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pRVbq-00E07Z-Sl; Mon, 13 Feb 2023 09:58:55 +0000 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pRVbg-00E04o-LE for linux-arm-kernel@lists.infradead.org; Mon, 13 Feb 2023 09:58:47 +0000 Received: by mail-wm1-x331.google.com with SMTP id o36so8297820wms.1 for ; Mon, 13 Feb 2023 01:58:43 -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=Wh+/knBj/EM1Bbx/gTGM9Sa9YSP8qWOprwPefMlvOGs=; b=YqJecM2gVD9EEZ9dfo8mb8B8iTe+rrguu4n8AKVq7UcNW5iv4GyFHSmop9YAt09iGa /g4e9bLOVTgQhrL20hGMiqftGOWR7BSTXdduLzeEnWrhiMVjQoK6VcdCGcvHi8RcFFP1 7SH416stGSkjSKggSknrZg1Gu/rfc//28AazMd1zehPwveV1tirEadSXSHwage5ttbA2 w7hKz2DU8SCKy6I2CfS/SqkixOQND9cE2P+5E65S1dI8JMa1GegTOiZcHyKNfWk+PIIp mBW8P/Ouk7uBhLOcQyYpajwfBy4m+CsWQdb7ZLJU7VJq86HDdnHxy/n9Ajs2ub+3YBYV kcdw== 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=Wh+/knBj/EM1Bbx/gTGM9Sa9YSP8qWOprwPefMlvOGs=; b=CsJSHMUSLuV8gfkp8ussxwpf0Ti29b6pdUjNwP7ujt/dExAkJ5LPGAB8i8OR7uaASV AMqxH0Pghi2FnUvm+VkYMWc9Q6C1Cg5a86/jpl+c0+nm/xtcLC0G7yu5YqSHivpyX1Ei 7+YwQmxSN+zEe4jUgyxNysqp6dgrPWvEltnkJrJ7F3cfJlmYxbaUzI1SuJSIJ9nl4MWR it0uRmbxc0LjYAS161seIvdGE4w7h5qpR8XQSxwCx4VOIA671WKX6OG2u/X9oND5pkQz jcxvSFQ17P2GuhXGrsQI7NtnsM+ITKsWTxItT2FjD8s1C+ZnDAWBiNzBVRW61g5MHFaY A+XA== X-Gm-Message-State: AO0yUKUsTcHXJfQap/apDkzwxgeQUm/v0ruNHpdI2Jhp0De4BSWPWxRo I/TKfDZjDot55Sd6jPeufwpVlA== X-Google-Smtp-Source: AK7set+S1vNTC8u+GNbosXBhFYtV9vJR4MwGNhreFGeZW6wOVfBk4Ld2nfnt6BE9xIaImCI5C8U1/g== X-Received: by 2002:a05:600c:1609:b0:3dc:53a2:2690 with SMTP id m9-20020a05600c160900b003dc53a22690mr18222308wmn.7.1676282321988; Mon, 13 Feb 2023 01:58:41 -0800 (PST) Received: from lmecxl1178.lme.st.com ([80.215.89.243]) by smtp.gmail.com with ESMTPSA id k21-20020a05600c1c9500b003dd1c45a7b0sm14105801wms.23.2023.02.13.01.58.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 01:58:41 -0800 (PST) From: Etienne Carriere To: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Sumit Garg , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org, Jens Wiklander , Etienne Carriere , Marc Zyngier , Alexandre Torgue Subject: [PATCH v4 2/2] optee: add per cpu asynchronous notification Date: Mon, 13 Feb 2023 10:58:29 +0100 Message-Id: <20230213095829.42911-2-etienne.carriere@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230213095829.42911-1-etienne.carriere@linaro.org> References: <20230213095829.42911-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-20230213_015844_717324_15A02A24 X-CRM114-Status: GOOD ( 23.11 ) 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 use of per-cpu irq for optee asynchronous notification. Existing optee async notif implementation allows OP-TEE world to raise an interrupt for which Linux optee driver will query pending events bound to waiting tasks in Linux world or threaded bottom half tasks to be invoked in TEE world. This change allows the signaling interrupt to be a per-cpu interrupt as with Arm GIC PPIs. Using a PPI instead of an SPI is useful when no GIC lines are provisioned in the chip design for OP-TEE async notifications. Instead of using an unused GIC SPI for a specific platform, optee can use a common GIC PPI across platforms. Cc: Jens Wiklander Cc: Sumit Garg Cc: Marc Zyngier Co-developed-by: Alexandre Torgue Signed-off-by: Alexandre Torgue Signed-off-by: Etienne Carriere --- Changes since v3: - Fixed typo in commit message. - Added few words in commit message about why we do this change. - Appended a 2nd commit to the series for request DT bindings update. Changes since v2: - Irq and per-cpu irq no more share the primary same handler function but have a common irq_handler() helper function. - Removed useless spinlocks. - Wrapped lines > 80 char. Changes since v1: - Fixed missing __percpu attribute reported by kernel test robot. - Rephrased commit message and added Cc tags. --- drivers/tee/optee/optee_private.h | 22 +++++++ drivers/tee/optee/smc_abi.c | 97 +++++++++++++++++++++++++++++-- 2 files changed, 115 insertions(+), 4 deletions(-) diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h index 04ae58892608..e5bd3548691f 100644 --- a/drivers/tee/optee/optee_private.h +++ b/drivers/tee/optee/optee_private.h @@ -94,11 +94,33 @@ struct optee_supp { struct completion reqs_c; }; +/* + * struct optee_pcpu - per cpu notif private struct passed to work functions + * @optee optee device reference + */ +struct optee_pcpu { + struct optee *optee; +}; + +/* + * 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 + * @optee_pcpu per_cpu optee instance for per cpu work or NULL + * @notif_pcpu_wq workqueue for per cpu aynchronous notification or NULL + * @notif_pcpu_work work for per cpu asynchronous notification + */ struct optee_smc { optee_invoke_fn *invoke_fn; void *memremaped_shm; u32 sec_caps; unsigned int notif_irq; + struct optee_pcpu __percpu *optee_pcpu; + struct workqueue_struct *notif_pcpu_wq; + struct work_struct notif_pcpu_work; }; /** diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c index a1c1fa1a9c28..eff35f66399e 100644 --- a/drivers/tee/optee/smc_abi.c +++ b/drivers/tee/optee/smc_abi.c @@ -991,9 +991,8 @@ static u32 get_async_notif_value(optee_invoke_fn *invoke_fn, bool *value_valid, return res.a1; } -static irqreturn_t notif_irq_handler(int irq, void *dev_id) +static irqreturn_t irq_handler(struct optee *optee) { - struct optee *optee = dev_id; bool do_bottom_half = false; bool value_valid; bool value_pending; @@ -1016,6 +1015,11 @@ static irqreturn_t notif_irq_handler(int irq, void *dev_id) return IRQ_HANDLED; } +static irqreturn_t notif_irq_handler(int irq, void *dev_id) +{ + return irq_handler((struct optee *)dev_id); +} + static irqreturn_t notif_irq_thread_fn(int irq, void *dev_id) { struct optee *optee = dev_id; @@ -1025,7 +1029,7 @@ static irqreturn_t notif_irq_thread_fn(int irq, void *dev_id) return IRQ_HANDLED; } -static int optee_smc_notif_init_irq(struct optee *optee, u_int irq) +static int init_irq(struct optee *optee, u_int irq) { int rc; @@ -1040,12 +1044,97 @@ static int optee_smc_notif_init_irq(struct optee *optee, u_int irq) return 0; } +static irqreturn_t notif_pcpu_irq_handler(int irq, void *dev_id) +{ + struct optee_pcpu __percpu *pcpu = (struct optee_pcpu *)dev_id; + struct optee *optee = pcpu->optee; + + if (irq_handler(optee) == IRQ_WAKE_THREAD) + queue_work(optee->smc.notif_pcpu_wq, + &optee->smc.notif_pcpu_work); + + return IRQ_HANDLED; +} + +static void notif_pcpu_irq_work_fn(struct work_struct *work) +{ + struct optee_smc *optee_smc = container_of(work, struct optee_smc, + notif_pcpu_work); + struct optee *optee = container_of(optee_smc, struct optee, smc); + + optee_smc_do_bottom_half(optee->ctx); +} + +static int init_pcpu_irq(struct optee *optee, u_int irq) +{ + struct optee_pcpu __percpu *optee_pcpu; + int cpu; + int rc; + + optee_pcpu = alloc_percpu(struct optee_pcpu); + if (!optee_pcpu) + return -ENOMEM; + + for_each_present_cpu(cpu) { + struct optee_pcpu __percpu *p = per_cpu_ptr(optee_pcpu, cpu); + + p->optee = optee; + } + + rc = request_percpu_irq(irq, notif_pcpu_irq_handler, + "optee_pcpu_notification", optee_pcpu); + if (rc) + goto err_free_pcpu; + + enable_percpu_irq(irq, 0); + + INIT_WORK(&optee->smc.notif_pcpu_work, notif_pcpu_irq_work_fn); + optee->smc.notif_pcpu_wq = create_workqueue("optee_pcpu_notification"); + if (!optee->smc.notif_pcpu_wq) { + rc = -EINVAL; + goto err_free_pcpu_irq; + } + + optee->smc.optee_pcpu = optee_pcpu; + optee->smc.notif_irq = irq; + + return 0; + +err_free_pcpu_irq: + disable_percpu_irq(irq); + free_percpu_irq(irq, optee_pcpu); +err_free_pcpu: + free_percpu(optee_pcpu); + + return rc; +} + +static int optee_smc_notif_init_irq(struct optee *optee, u_int irq) +{ + if (irq_is_percpu_devid(irq)) + return init_pcpu_irq(optee, irq); + else + return init_irq(optee, irq); +} + +static void uninit_pcpu_irq(struct optee *optee) +{ + disable_percpu_irq(optee->smc.notif_irq); + + free_percpu_irq(optee->smc.notif_irq, optee->smc.optee_pcpu); + free_percpu(optee->smc.optee_pcpu); +} + static void optee_smc_notif_uninit_irq(struct optee *optee) { if (optee->smc.sec_caps & OPTEE_SMC_SEC_CAP_ASYNC_NOTIF) { optee_smc_stop_async_notif(optee->ctx); if (optee->smc.notif_irq) { - free_irq(optee->smc.notif_irq, optee); + if (irq_is_percpu_devid(optee->smc.notif_irq)) + uninit_pcpu_irq(optee); + else + free_irq(optee->smc.notif_irq, optee); + irq_dispose_mapping(optee->smc.notif_irq); } }