From patchwork Wed Mar 22 13:22:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Etienne Carriere X-Patchwork-Id: 13184041 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 0CAAAC6FD1F for ; Wed, 22 Mar 2023 13:23:24 +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=DRBNNhurP0ow8ZAWOe6/vATN7g/SaBvhuTmGv6+NpOE=; b=17lm5OTIEb1KVd Qh1fc3ZDIprKzAqvXPP8zA0D4QMcKls9pqjrROgqNgMzq2opU0v+Rt3YvSoOu55T8TwePcN4IaZca IBx5mH0rjdtjZt2Kghy9qxN0F1092KKPQvTWG9GuA8mP5/at26aHd68HNiqebx9LHNay/aSiP10Zc NR/7cucN6JmvZ0zWtnC5ghzcigANe9uz3abYt0mZRxaz0hcx8hNVZrpjnXcOqZ5Tn92AdfvMO3DZF jnuLX3SmYziFJ+qpQWS0vEnPkq82QUoSUc9+BEoKmbEV9rcIYS7MSNLNC6+sOHg20ADbOtI7GElJ1 fzQw8rOYXWFd9CPOG0MA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1peyQ4-00G5ij-2t; Wed, 22 Mar 2023 13:22:24 +0000 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1peyQ2-00G5gu-0X for linux-arm-kernel@lists.infradead.org; Wed, 22 Mar 2023 13:22:23 +0000 Received: by mail-wr1-x42c.google.com with SMTP id l12so17049243wrm.10 for ; Wed, 22 Mar 2023 06:22:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679491337; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=/th2kVXqjdns9liPbOqVpfvQOOnugD39HQJSOA9ztTc=; b=pL+wBj+0z0up+rhipjI0mF/YWlGkhnUhxRFWlY0VrM8H7RGDLDT8NVnvtrXDbH/qxv oo8f5XZ2oLFdtUPxLOGq060KNa3KYV2DSyxyZfy+ORtuvas/UPvb1GWgR1hPwrvFXk/c w/NIYwsSO7Ab57meYQ8MVZT2yRw0h34ldBlFpK7PjyR1NHijNHtS1lrjMNWfQwC+LeUP sOAPDYNYf+Kzg7Oq56SCLOV81q2eYa6ciqlw6dCS4ijHvbXkvq4qEGYM1A1Rgm7SLXon 9fjtSqjfMQGGE0MGk40DgOsqDW72WAhgo0SVJ1CRkRYVabLNrgmHcv2usdKMLDsUk0Sv TMHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679491337; 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=/th2kVXqjdns9liPbOqVpfvQOOnugD39HQJSOA9ztTc=; b=jVYeaIzfafLteDpIOU5UsdcnOGrSmGpnAHwUbaW5WUfbhBLJH1UUc6D3I1PxDXkkaS yQcIptRAirRmVK4EdFkw4GF5o8BK+HjksU3ln4t+Qy8CtiwB8pkotDmqDElYqVq457F6 XWHWQNNWCgMLV1/9IEFbqJ1g7tW1aqclhXTziSuEvRxXz32JdQ1tz18kX67ng3O4VC0l 2hmcSzcVEp8tIO9xhWIRU3hj0ufaMCq3ny6Ot5HWwktHpU2VIHnd7kEaMxHFkLPlBPzL OSBUkE1AghvBDMrJRbOMXa+bDxu/SzqYCrquYQQ7hBIO4NChn8Orrd9RQr+cfhqk3edy YrrQ== X-Gm-Message-State: AO0yUKU/8DSxlQxYJ1FQcGkjJ0LJIHVtCyx7GIIaBYEOYvTgVztPwLZf jlUWocwDShfz0P0E9tk5icg1uw== X-Google-Smtp-Source: AK7set86MU4ZYUAdrbcE61ulD+05sFsSTTWYsqJ/0JpKmJYJ93tqt8VQJ3y810OcoH+0SaOGq9k8uw== X-Received: by 2002:adf:e405:0:b0:2cf:efa5:f505 with SMTP id g5-20020adfe405000000b002cfefa5f505mr5453463wrm.43.1679491337429; Wed, 22 Mar 2023 06:22:17 -0700 (PDT) Received: from lmecxl1178.lme.st.com ([2a04:cec0:1013:81e9:8520:c2b5:32d0:9bd9]) by smtp.gmail.com with ESMTPSA id b15-20020adfe30f000000b002c706c754fesm13867142wrj.32.2023.03.22.06.22.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 06:22:17 -0700 (PDT) From: Etienne Carriere To: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, op-tee@lists.trustedfirmware.org, Rob Herring , Krzysztof Kozlowski , Sumit Garg , Jens Wiklander , Etienne Carriere Subject: [PATCH v6 1/2] dt-bindings: optee driver interrupt can be a per-cpu interrupt Date: Wed, 22 Mar 2023 14:22:11 +0100 Message-Id: <20230322132212.3646972-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-20230322_062222_227162_AA9BC415 X-CRM114-Status: GOOD ( 11.65 ) 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 Reviewed-by: Sumit Garg --- No change since v5 No change since v4 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 Wed Mar 22 13:22:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Etienne Carriere X-Patchwork-Id: 13184042 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 217BBC6FD1C for ; Wed, 22 Mar 2023 13:23:28 +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=L35ex9teRecl5IdPZkYfQCAOyNNPWj3Nu5PhvEzpGSI=; b=hrH8jSa+8j3DBO U3+qe+AYYt154eph8p6gF1gNltg+K8FxPvJysKQ8hk6YrtGLxsUzoSSnFaxFPkXejhB9e7e5R7pKK 4cgCbW/RVWDXh2J90HwOEUVu/GoqlIM2QiIiljBIXDkFFLm3oJHWA6JjBn/MCOS+xNjjjUKQaowsF HjDiTvc9w1pzcenqhGOBlybi9irJv+BkXq7sm7QGNOVST/Hc/H/CHFiV9G6HWgc0+vsbIboLCER8B kzwDW5577xtcleSAgDmb3i8+bnmcQsMUPWM8EM6wB+5zo8shUiO+p8FTVOYBKT3S0DGS0/KoZLRfg Yg6NcdCVBzpSh7qzhrKg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1peyQD-00G5lj-0g; Wed, 22 Mar 2023 13:22:33 +0000 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1peyQ2-00G5hD-1e for linux-arm-kernel@lists.infradead.org; Wed, 22 Mar 2023 13:22:24 +0000 Received: by mail-wr1-x434.google.com with SMTP id h17so17044245wrt.8 for ; Wed, 22 Mar 2023 06:22:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679491338; 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=ENfXvmOGL5vIB8CbuQoa7P0A6qSNAoya8SLjspFiA/w=; b=Cy9+IQSovjf0UhzGuT+GvAHgM+t21Cz1V84/2G6thvVeQJ+5LnO8ISSu6TYZJyfISA Ov3Mkbx+FPTa4TQOjuhVTh5ugLAByjYt6dCM/dNCIgqyd5gDioo9Ga0ON8MDVMND9z6I vGkE9ZJSXH9Nhkz8EXMeVkxl8Ffa9po6T/wo89f8C0RphZqHNVQzB3RZFaJ3XQkISnCh yQwNltw1TsDSmdr6WvmVtiJoPfUM46Vncj+qP1qmwLYwFAozINx0Q3iGHAdGfKUg7Dee FHK+y+CXnceyL8ErmZoCaLSkutdh1EPUw+uYM/1sgByWGgEBdiHxAZDN+CW3uCRdc57L 98sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679491338; 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=ENfXvmOGL5vIB8CbuQoa7P0A6qSNAoya8SLjspFiA/w=; b=iJIROeq2MSnBUh11uSFK1m/Il9nozDZVF8iabOU8ljrrQtOwD1x/Ykki9QLeto7vdQ j7W7f9CXtxSh+qhmTsqUVFy2FUTLJt58JRFl1QFLjpJDE4Nps73LZhFxjyeHU0LbnB5V m4IIzcPZFbBjBJ0AGwqPdgPmFcgnVsLb7Gev/PiI9MObLdHRIJ66mmk0H1Cm+3KohECQ ViYV6K1CBVg9dfMFQl/4BD9v2RdaBs0m0hmi2MHY0cXFS8oF8tW/0FimJdmKKa1MJYEF Q0Qwsnvk0iMc2WTeVrbRkdmagxS5POTVzVTg+WmtYnIhfnQCukEjbhy35aU8Uxmptkf5 dRGg== X-Gm-Message-State: AO0yUKWuOrAR8sJIWpTZIjel9Bv5FOxlubOHtm6QDLwfy2z7LSAqHZuh OFT7XmfRwbsRlUOswJOKb3nKhw== X-Google-Smtp-Source: AK7set/DeUiHYzqELuLUmycuvSEbjgaVaMiklVNIAkai6QIXqhnCQeoqS4vHo2Hbgcrz1TOma1gAOw== X-Received: by 2002:adf:ea42:0:b0:2d2:39d3:ce78 with SMTP id j2-20020adfea42000000b002d239d3ce78mr5093853wrn.10.1679491338464; Wed, 22 Mar 2023 06:22:18 -0700 (PDT) Received: from lmecxl1178.lme.st.com ([2a04:cec0:1013:81e9:8520:c2b5:32d0:9bd9]) by smtp.gmail.com with ESMTPSA id b15-20020adfe30f000000b002c706c754fesm13867142wrj.32.2023.03.22.06.22.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 06:22:18 -0700 (PDT) From: Etienne Carriere To: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, op-tee@lists.trustedfirmware.org, Rob Herring , Krzysztof Kozlowski , Sumit Garg , Jens Wiklander , Etienne Carriere , Marc Zyngier , Alexandre Torgue Subject: [PATCH v6 2/2] optee: add per cpu asynchronous notification Date: Wed, 22 Mar 2023 14:22:12 +0100 Message-Id: <20230322132212.3646972-2-etienne.carriere@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230322132212.3646972-1-etienne.carriere@linaro.org> References: <20230322132212.3646972-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-20230322_062222_546906_B9E04E0C X-CRM114-Status: GOOD ( 25.49 ) 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 on which Linux optee driver will query some pending events. 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 and there are spare PPI lines. Cc: Jens Wiklander Cc: Sumit Garg Cc: Marc Zyngier Co-developed-by: Alexandre Torgue Signed-off-by: Alexandre Torgue Signed-off-by: Etienne Carriere Reviewed-by: Sumit Garg --- Changes since v5: - Removed spurious __percpu attributes reported by kernel test robot (https://lore.kernel.org/lkml/202303190039.RsU7kCIu-lkp@intel.com/). Changes since v4: - Used cpuhp_setup_state()/cpuhp_remove_state() to enable/disable the per-cpu interrupt and let CPU hotplug also manage it. - Added a call to destroy_workqueue() that was missing in uninit_pcpu_irq(). - Rephrased commit message. 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 | 24 ++++++ drivers/tee/optee/smc_abi.c | 122 +++++++++++++++++++++++++++++- 2 files changed, 142 insertions(+), 4 deletions(-) diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h index 04ae58892608..6129d43dd354 100644 --- a/drivers/tee/optee/optee_private.h +++ b/drivers/tee/optee/optee_private.h @@ -94,11 +94,35 @@ 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 + * @notif_cpuhp_state CPU hotplug state assigned for pcpu interrupt management + */ 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; + unsigned int notif_cpuhp_state; }; /** diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c index a1c1fa1a9c28..de7ac9a46354 100644 --- a/drivers/tee/optee/smc_abi.c +++ b/drivers/tee/optee/smc_abi.c @@ -52,6 +52,23 @@ */ #define OPTEE_MIN_STATIC_POOL_ALIGN 9 /* 512 bytes aligned */ +/* SMC ABI considers at most a single TEE firmware */ +static unsigned int pcpu_irq_num; + +static int optee_cpuhp_enable_pcpu_irq(unsigned int cpu) +{ + enable_percpu_irq(pcpu_irq_num, IRQ_TYPE_NONE); + + return 0; +} + +static int optee_cpuhp_disable_pcpu_irq(unsigned int cpu) +{ + disable_percpu_irq(pcpu_irq_num); + + return 0; +} + /* * 1. Convert between struct tee_param and struct optee_msg_param * @@ -991,9 +1008,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 +1032,13 @@ 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) +{ + struct optee *optee = dev_id; + + return irq_handler(optee); +} + static irqreturn_t notif_irq_thread_fn(int irq, void *dev_id) { struct optee *optee = dev_id; @@ -1025,7 +1048,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 +1063,103 @@ 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 *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, rc; + + optee_pcpu = alloc_percpu(struct optee_pcpu); + if (!optee_pcpu) + return -ENOMEM; + + for_each_present_cpu(cpu) + per_cpu_ptr(optee_pcpu, cpu)->optee = optee; + + rc = request_percpu_irq(irq, notif_pcpu_irq_handler, + "optee_pcpu_notification", optee_pcpu); + if (rc) + goto err_free_pcpu; + + 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; + + pcpu_irq_num = irq; + rc = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "optee/pcpu-notif:starting", + optee_cpuhp_enable_pcpu_irq, + optee_cpuhp_disable_pcpu_irq); + if (!rc) + rc = -EINVAL; + if (rc < 0) + goto err_free_pcpu_irq; + + optee->smc.notif_cpuhp_state = rc; + + return 0; + +err_free_pcpu_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) +{ + cpuhp_remove_state(optee->smc.notif_cpuhp_state); + + destroy_workqueue(optee->smc.notif_pcpu_wq); + + 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); } }