From patchwork Sun Jul 10 12:19:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 12912528 X-Patchwork-Delegate: herbert@gondor.apana.org.au 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6117BC433EF for ; Sun, 10 Jul 2022 12:19:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229573AbiGJMTV (ORCPT ); Sun, 10 Jul 2022 08:19:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229545AbiGJMTU (ORCPT ); Sun, 10 Jul 2022 08:19:20 -0400 Received: from smtp.smtpout.orange.fr (smtp04.smtpout.orange.fr [80.12.242.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0914FFFA for ; Sun, 10 Jul 2022 05:19:19 -0700 (PDT) Received: from pop-os.home ([90.11.190.129]) by smtp.orange.fr with ESMTPA id AVu5o1GQSAym2AVu6od0Os; Sun, 10 Jul 2022 14:19:17 +0200 X-ME-Helo: pop-os.home X-ME-Auth: YWZlNiIxYWMyZDliZWIzOTcwYTEyYzlhMmU3ZiQ1M2U2MzfzZDfyZTMxZTBkMTYyNDBjNDJlZmQ3ZQ== X-ME-Date: Sun, 10 Jul 2022 14:19:17 +0200 X-ME-IP: 90.11.190.129 From: Christophe JAILLET To: Boris Brezillon , Arnaud Ebalard , Srujana Challa , Herbert Xu , "David S. Miller" Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , linux-crypto@vger.kernel.org Subject: [PATCH 1/3] crypto: octeontx2: Simplify bitmap declaration Date: Sun, 10 Jul 2022 14:19:12 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org 'OTX2_CPT_ENGS_BITMASK_LEN' is only used to allocate a bitmap. In order to simplify the code, remove OTX2_CPT_ENGS_BITMASK_LEN and use DECLARE_BITMAP to declare the 'bits' bitmap. Signed-off-by: Christophe JAILLET --- drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.h b/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.h index e69320a54b5d..7c503e44a286 100644 --- a/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.h +++ b/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.h @@ -26,8 +26,6 @@ /* Maximum number of supported engines/cores on OcteonTX2/CN10K platform */ #define OTX2_CPT_MAX_ENGINES 144 -#define OTX2_CPT_ENGS_BITMASK_LEN BITS_TO_LONGS(OTX2_CPT_MAX_ENGINES) - #define OTX2_CPT_UCODE_SZ (64 * 1024) /* Microcode types */ @@ -48,7 +46,7 @@ enum otx2_cpt_ucode_type { }; struct otx2_cpt_bitmap { - unsigned long bits[OTX2_CPT_ENGS_BITMASK_LEN]; + DECLARE_BITMAP(bits, OTX2_CPT_MAX_ENGINES); int size; }; From patchwork Sun Jul 10 12:19:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 12912529 X-Patchwork-Delegate: herbert@gondor.apana.org.au 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B65AC43334 for ; Sun, 10 Jul 2022 12:19:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229587AbiGJMTd (ORCPT ); Sun, 10 Jul 2022 08:19:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229590AbiGJMTb (ORCPT ); Sun, 10 Jul 2022 08:19:31 -0400 Received: from smtp.smtpout.orange.fr (smtp09.smtpout.orange.fr [80.12.242.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C927EE3A for ; Sun, 10 Jul 2022 05:19:28 -0700 (PDT) Received: from pop-os.home ([90.11.190.129]) by smtp.orange.fr with ESMTPA id AVuGokWd9dl7zAVuGohTTG; Sun, 10 Jul 2022 14:19:27 +0200 X-ME-Helo: pop-os.home X-ME-Auth: YWZlNiIxYWMyZDliZWIzOTcwYTEyYzlhMmU3ZiQ1M2U2MzfzZDfyZTMxZTBkMTYyNDBjNDJlZmQ3ZQ== X-ME-Date: Sun, 10 Jul 2022 14:19:27 +0200 X-ME-IP: 90.11.190.129 From: Christophe JAILLET To: Boris Brezillon , Arnaud Ebalard , Srujana Challa , Herbert Xu , "David S. Miller" Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , linux-crypto@vger.kernel.org Subject: [PATCH 2/3] crypto: octeontx2: Use the bitmap API to allocate bitmaps Date: Sun, 10 Jul 2022 14:19:23 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Use bitmap_zalloc()/bitmap_free() instead of hand-writing them. It is less verbose and it improves the semantic. Signed-off-by: Christophe JAILLET --- drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c b/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c index f10050fead16..a28a310090e9 100644 --- a/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c +++ b/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c @@ -1351,7 +1351,7 @@ void otx2_cpt_cleanup_eng_grps(struct pci_dev *pdev, for (i = 0; i < OTX2_CPT_MAX_ENGINE_GROUPS; i++) { grp = &eng_grps->grp[i]; for (j = 0; j < OTX2_CPT_MAX_ETYPES_PER_GRP; j++) { - kfree(grp->engs[j].bmap); + bitmap_free(grp->engs[j].bmap); grp->engs[j].bmap = NULL; } } @@ -1387,9 +1387,8 @@ int otx2_cpt_init_eng_grps(struct pci_dev *pdev, grp->idx = i; for (j = 0; j < OTX2_CPT_MAX_ETYPES_PER_GRP; j++) { - grp->engs[j].bmap = - kcalloc(BITS_TO_LONGS(eng_grps->engs_num), - sizeof(long), GFP_KERNEL); + grp->engs[j].bmap = bitmap_zalloc(eng_grps->engs_num, + GFP_KERNEL); if (!grp->engs[j].bmap) { ret = -ENOMEM; goto cleanup_eng_grps; From patchwork Sun Jul 10 12:19:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 12912530 X-Patchwork-Delegate: herbert@gondor.apana.org.au 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7BF11C43334 for ; Sun, 10 Jul 2022 12:19:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229595AbiGJMTl (ORCPT ); Sun, 10 Jul 2022 08:19:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229450AbiGJMTk (ORCPT ); Sun, 10 Jul 2022 08:19:40 -0400 Received: from smtp.smtpout.orange.fr (smtp05.smtpout.orange.fr [80.12.242.127]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5062AB64 for ; Sun, 10 Jul 2022 05:19:39 -0700 (PDT) Received: from pop-os.home ([90.11.190.129]) by smtp.orange.fr with ESMTPA id AVuQotAaQ6rrEAVuQoiB3Q; Sun, 10 Jul 2022 14:19:37 +0200 X-ME-Helo: pop-os.home X-ME-Auth: YWZlNiIxYWMyZDliZWIzOTcwYTEyYzlhMmU3ZiQ1M2U2MzfzZDfyZTMxZTBkMTYyNDBjNDJlZmQ3ZQ== X-ME-Date: Sun, 10 Jul 2022 14:19:37 +0200 X-ME-IP: 90.11.190.129 From: Christophe JAILLET To: Boris Brezillon , Arnaud Ebalard , Srujana Challa , Herbert Xu , "David S. Miller" Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , linux-crypto@vger.kernel.org Subject: [PATCH 3/3] crypto: octeontx2: Avoid some useless memory initialization Date: Sun, 10 Jul 2022 14:19:33 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org In otx2_cpt_eng_grp_info(), 'tmp_bmap' is zero'ed at each iteration in the first 'for' loop. Signed-off-by: Christophe JAILLET --- drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c b/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c index a28a310090e9..b14a8f6dae63 100644 --- a/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c +++ b/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c @@ -848,7 +848,7 @@ static int eng_grp_update_masks(struct device *dev, struct otx2_cpt_eng_grp_info *eng_grp) { struct otx2_cpt_engs_rsvd *engs, *mirrored_engs; - struct otx2_cpt_bitmap tmp_bmap = { {0} }; + struct otx2_cpt_bitmap tmp_bmap; int i, j, cnt, max_cnt; int bit;