From patchwork Thu Feb 23 22:10:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan McDowell X-Patchwork-Id: 61090 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp575762wrd; Thu, 23 Feb 2023 14:49:50 -0800 (PST) X-Google-Smtp-Source: AK7set8MsB4SGZMAs55aOxU4X1xFwTmXBPCFevpq36D/e+BFG7JAEVBFMCMzjfkppRPFq0wIQ3N0 X-Received: by 2002:a05:6402:11c6:b0:4af:593c:c07f with SMTP id j6-20020a05640211c600b004af593cc07fmr12428271edw.3.1677192590632; Thu, 23 Feb 2023 14:49:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677192590; cv=none; d=google.com; s=arc-20160816; b=U3kKwSFyj8zFIbwWCQDm85jTb6GmBiWeOZiuYt2pqL/aD9TJXw5g1JsMRonbOMSTJn HYoBCKTE9cyeJRg1Dj0pLSgCEHP1VV6aQYKqUm8MdK13cxtwD/XiOQ7+hShmXPLpmrW1 tqrW7+795mn8Q5GFqJTwswfo1Wtko3Ttb32ua0TYrD2nZtKhaKtI2szittLmaNaYiQjA LnDPuxrtazQff+/FYCXZFSALDKpd4GtzJfyzFsrC7AeMjCvgekpqHfdtEMuZ2iq47sXZ AXs444BgvebnmgcjTxP8amCxh4emVJ336NfdbOXJWjG4PXC1I/Bo1dsa2YlzPDw8DgVt 7XUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=OayevMSfxq/5eX7TpSmF0QlP82H2HgfsyAnEkZU+mEc=; b=oz9jEekULu9y9+oj2Rjm6LDZy08dfWLG8/VjEgNoaHhw0kIvAjwAO4pxRJo2i5CY/+ EXBwIRnBbipzbcEsqSdGfvODyEmT5aKqH0F59dHG0DApeo6GgcPRnir0OeNOK2XtouNU xRc/ALP2heW8t+4SCyRsKrpKb5+JraDIT2b+IxRpkMPsqkOG0LgBi4tYVB7E2zGtI5By nwPh/OFKvQt3rY+gxEp0cVgmiwwHvJpuVEH2zj2fKt/hC5YkKXdf/iT6m03OT+T1bE/d SL+tgB/xY5iWFDQ461CpOJhvuw5mdHzV5qWOJzvNjQUxG/5sqfYNCp+MJQLvqP3526/7 2Hyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@earth.li header.s=the header.b=S4GmgWq5; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v23-20020aa7cd57000000b004a235a340ebsi5270561edw.163.2023.02.23.14.49.27; Thu, 23 Feb 2023 14:49:50 -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=fail header.i=@earth.li header.s=the header.b=S4GmgWq5; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229629AbjBWWoH (ORCPT + 99 others); Thu, 23 Feb 2023 17:44:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229665AbjBWWnv (ORCPT ); Thu, 23 Feb 2023 17:43:51 -0500 Received: from the.earth.li (the.earth.li [IPv6:2a00:1098:86:4d:c0ff:ee:15:900d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B38C729E04; Thu, 23 Feb 2023 14:43:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=earth.li; s=the; h=Content-Type:MIME-Version:Message-ID:Subject:Cc:To:From:Date:Sender: Reply-To:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date :Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=OayevMSfxq/5eX7TpSmF0QlP82H2HgfsyAnEkZU+mEc=; b=S 4GmgWq5qCgQofTIzv22+JjJsXXugKSV9oHd74EDUz29uCCD+x27smX83w2au/Pak1aeR7oljs7Mqg 4u4BeLksHOyzJz7omYcjK9tGt/NwmuowgzSTSYrqLTA7I6Gtj0YSw+OZClJgKs27ssmY0ulZf/qSQ L8GCkGLRmutnhsg/SJAORok3iX16wiLk9N7igXf7PSEsWr0MkjW+xg70R6LkcuUkLQXB+KIFOW/Ph lkJv6kaX/1Obz+55c6SFSIG7glMurpxpU33TMAp6i89QRbi2vfQgA9ttNGIxt0Y87dnLHlABckvEu JLANLMVg9c/9pO/kAmZi4QCof0KW0M8wQ==; Received: from [2001:4d48:ad59:1403::17ca] (helo=sevai.o362.us) by the.earth.li with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pVJnR-0047pv-Ji; Thu, 23 Feb 2023 22:10:37 +0000 Date: Thu, 23 Feb 2023 22:10:33 +0000 From: Jonathan McDowell To: Antoine Tenart , Herbert Xu , "David S. Miller" Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] crypto: inside-secure: Raise firmware load failure message to error Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham 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?1758663897873488695?= X-GMAIL-MSGID: =?utf-8?q?1758663897873488695?= At the moment if there is no firmware available for the safexcel driver it will fail to load with a cryptic: crypto-safexcel f2800000.crypto: TRC init: 15360d,80a (48r,256h) crypto-safexcel f2800000.crypto: HW init failed (-2) Raise the logging level of the firmware load failure to err rather than dbg so that it's obvious what the reason for the HW init failure is. Signed-off-by: Jonathan McDowell --- drivers/crypto/inside-secure/safexcel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/inside-secure/safexcel.c b/drivers/crypto/inside-secure/safexcel.c index 6858753af6b3..5e10ab24be3b 100644 --- a/drivers/crypto/inside-secure/safexcel.c +++ b/drivers/crypto/inside-secure/safexcel.c @@ -474,7 +474,7 @@ static int eip197_load_firmwares(struct safexcel_crypto_priv *priv) goto retry_fw; } - dev_dbg(priv->dev, "Firmware load failed.\n"); + dev_err(priv->dev, "Firmware load failed.\n"); return ret; } From patchwork Thu Feb 23 22:11:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan McDowell X-Patchwork-Id: 61089 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp575687wrd; Thu, 23 Feb 2023 14:49:41 -0800 (PST) X-Google-Smtp-Source: AK7set+amU0JG1tKDwDrP/oXtQUKXJpShs2meeDtqEQ1ADyTY7y9HtH3UizfyL3mdTGhur9XM1gi X-Received: by 2002:a17:906:150:b0:894:4341:77d6 with SMTP id 16-20020a170906015000b00894434177d6mr20122947ejh.1.1677192580876; Thu, 23 Feb 2023 14:49:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677192580; cv=none; d=google.com; s=arc-20160816; b=ipzY8b7kzJIA3cDTYK2R1M1OpURzf9jCFmJXIp7p+mFz9IdKnXyspjks/tZo96mzEd kC++KzEIPTUqxxDQ/FdQo5TYvoLqiTM+wTyNHOUmfxXQnfNsqMtAReGbSPmYecTkOCq9 YswZWh5dwU2NM7nVaXBI+HZEP9P4EANBSPV0lq5yzohZe3pY71KmIDGZ+F2SX+dSzRLq YoV2OCEvTkudFtUlBj4vIzdekkxkNO5bT1DdLcyUn4t/OoSAIVAA53OqjK3kVprzsG6w XslzzWAAfUGKazw5e15UuG6Hzv3ok5m+l7MLgSmFzBJppjGWtUqCcUP4piXJ3jLvc6g4 G5MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=QycZbkJqi7Zscv1obsdF2TfLt0izpxXbF1U4b6Hoalo=; b=dS5yYJ7AhS1cfKOpeuxbfyy369mx/3UzrydRyhCfah8prBCVK+vrIHnEtlGSyyj/5J EEAVuX1yqKG+yfNEJuPoDTflu6lxmrtGaSsNAWHR59OAepXSUnb6O7q/fQn2fA5hAz4T foh3bhpAvXUZ7shjseVFb50ldMaubLmclfWUHjarhxCXdm0ZJ/kpMtguQlgv7irV90Ek S+ZTqRo7UKFsrDLAzXdKZhL0uDbbLMmF4tAWAn0Y1+Hv72JuI3Zsz+uL9K7fwmUMtzdv bfATPFkRkX5TjVumpYwwFViIRPN5B0k22WkdqBJ6mi+94WbxwHi2WbfWq0bVExcxMi3E ASVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@earth.li header.s=the header.b=dH4uqJBf; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ka6-20020a170907920600b008e176a55b12si7838328ejb.983.2023.02.23.14.49.17; Thu, 23 Feb 2023 14:49:40 -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=fail header.i=@earth.li header.s=the header.b=dH4uqJBf; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229612AbjBWWms (ORCPT + 99 others); Thu, 23 Feb 2023 17:42:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229452AbjBWWmq (ORCPT ); Thu, 23 Feb 2023 17:42:46 -0500 Received: from the.earth.li (the.earth.li [IPv6:2a00:1098:86:4d:c0ff:ee:15:900d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA6CB5505F; Thu, 23 Feb 2023 14:42:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=earth.li; s=the; h=Content-Type:MIME-Version:Message-ID:Subject:Cc:To:From:Date:Sender: Reply-To:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date :Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=QycZbkJqi7Zscv1obsdF2TfLt0izpxXbF1U4b6Hoalo=; b=d H4uqJBfXzhk7hCGKwFhZzlQu3sajuD+/B6NvA0Tqxt98X7x6N/+CmF5DZpdiAyCymK5N94BbsDj7T kNrS/5ReRp0bYQuO4eeWtOdCtgl2/bu3YCnMLxUn44MyNX84Ejtn96Jwb1vUHATLQdOvxDAoWxycW KCoqRZ3F7888Pf3xXmXyTSb0t4+NFb/xQthSB3HTq3LBUnaKuBRVaaB5VVgvIzxmC+kBZxd4XI6s2 IpgAozJ2DDhtZIK9jMopvgMqKIiWjBd/TdsXJvnucgsFw74aFdSrYcJlsTsxNKgNCWqTdQ82p86xJ iwAdEutrHlNPB9+OuHBiuYuzX1pu8IItQ==; Received: from [2001:4d48:ad59:1403::17ca] (helo=sevai.o362.us) by the.earth.li with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pVJnx-0047rz-S4; Thu, 23 Feb 2023 22:11:09 +0000 Date: Thu, 23 Feb 2023 22:11:05 +0000 From: Jonathan McDowell To: Antoine Tenart , Herbert Xu , "David S. Miller" Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] crypto: inside-secure: Cleanup ring IRQ workqueues on load failure Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham 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?1758663887681554763?= X-GMAIL-MSGID: =?utf-8?q?1758663887681554763?= A failure loading the safexcel driver results in the following warning on boot, because the IRQ affinity has not been correctly cleaned up. Ensure we clean up the affinity and workqueues on a failure to load the driver. crypto-safexcel: probe of f2800000.crypto failed with error -2 ------------[ cut here ]------------ WARNING: CPU: 1 PID: 232 at kernel/irq/manage.c:1913 free_irq+0x300/0x340 Modules linked in: hwmon mdio_i2c crypto_safexcel(+) md5 sha256_generic libsha256 authenc libdes omap_rng rng_core nft_masq nft_nat nft_chain_nat nf_nat nft_ct nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 nf_tables libcrc32c nfnetlink fuse autofs4 CPU: 1 PID: 232 Comm: systemd-udevd Tainted: G W 6.1.6-00002-g9d4898824677 #3 Hardware name: MikroTik RB5009 (DT) pstate: 600000c5 (nZCv daIF -PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : free_irq+0x300/0x340 lr : free_irq+0x2e0/0x340 sp : ffff800008fa3890 x29: ffff800008fa3890 x28: 0000000000000000 x27: 0000000000000000 x26: ffff8000008e6dc0 x25: ffff000009034cac x24: ffff000009034d50 x23: 0000000000000000 x22: 000000000000004a x21: ffff0000093e0d80 x20: ffff000009034c00 x19: ffff00000615fc00 x18: 0000000000000000 x17: 0000000000000000 x16: 0000000000000000 x15: 000075f5c1584c5e x14: 0000000000000017 x13: 0000000000000000 x12: 0000000000000040 x11: ffff000000579b60 x10: ffff000000579b62 x9 : ffff800008bbe370 x8 : ffff000000579dd0 x7 : 0000000000000000 x6 : ffff000000579e18 x5 : ffff000000579da8 x4 : ffff800008ca0000 x3 : ffff800008ca0188 x2 : 0000000013033204 x1 : ffff000009034c00 x0 : ffff8000087eadf0 Call trace: free_irq+0x300/0x340 devm_irq_release+0x14/0x20 devres_release_all+0xa0/0x100 device_unbind_cleanup+0x14/0x60 really_probe+0x198/0x2d4 __driver_probe_device+0x74/0xdc driver_probe_device+0x3c/0x110 __driver_attach+0x8c/0x190 bus_for_each_dev+0x6c/0xc0 driver_attach+0x20/0x30 bus_add_driver+0x148/0x1fc driver_register+0x74/0x120 __platform_driver_register+0x24/0x30 safexcel_init+0x48/0x1000 [crypto_safexcel] do_one_initcall+0x4c/0x1b0 do_init_module+0x44/0x1cc load_module+0x1724/0x1be4 __do_sys_finit_module+0xbc/0x110 __arm64_sys_finit_module+0x1c/0x24 invoke_syscall+0x44/0x110 el0_svc_common.constprop.0+0xc0/0xe0 do_el0_svc+0x20/0x80 el0_svc+0x14/0x4c el0t_64_sync_handler+0xb0/0xb4 el0t_64_sync+0x148/0x14c ---[ end trace 0000000000000000 ]--- Signed-off-by: Jonathan McDowell Cc: stable@vger.kernel.org --- drivers/crypto/inside-secure/safexcel.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/inside-secure/safexcel.c b/drivers/crypto/inside-secure/safexcel.c index 5e10ab24be3b..c7263d84a2e9 100644 --- a/drivers/crypto/inside-secure/safexcel.c +++ b/drivers/crypto/inside-secure/safexcel.c @@ -1684,16 +1684,24 @@ static int safexcel_probe_generic(void *pdev, ret = safexcel_hw_init(priv); if (ret) { dev_err(dev, "HW init failed (%d)\n", ret); - return ret; + goto err_cleanup_rings; } ret = safexcel_register_algorithms(priv); if (ret) { dev_err(dev, "Failed to register algorithms (%d)\n", ret); - return ret; + goto err_cleanup_rings; } return 0; + +err_cleanup_rings: + for (i = 0; i < priv->config.rings; i++) { + irq_set_affinity_hint(priv->ring[i].irq, NULL); + destroy_workqueue(priv->ring[i].workqueue); + } + + return ret; } static void safexcel_hw_reset_rings(struct safexcel_crypto_priv *priv)