From mboxrd@z Thu Jan 1 00:00:00 1970 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 9F536C48297 for ; Mon, 12 Feb 2024 17:12:43 +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-Type: Content-Transfer-Encoding:Reply-To:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:References:Cc:To:Subject: From:MIME-Version:Date:Message-ID:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=tWVXlP1uSLGx25B1Ce4w8MkTE9ehhv8QOBa00yOaZQo=; b=NpE7EXqBiYdOn0YhiJMkLvPppN KeA2NYxFsdi0L1kOaLYlHEFC/MyGISYRdh0+p+XPXkxZHozXoQR2WPdafeWQusqVAWoFfkQPfWq2Y D+ObzwQ5V0tjV2ZkSdo9gUFCIoxliKnesD3lMS65zFGydIBjGl0SFVjN2lShasBt/Y4+49XQCbEFu fP5NhEf4P3k1FkTaibmg2kd+B9IYv3anc//IQtstO7dGqQKqxlsEXNvd6TxhSsKUmyj5zgl8cw8ZP J8UETDi+j3MshTRzGuF/PHRyEPUBuSjI/ox7SIcnVqimyQ8MagaIzm6XVDHeVWoKW0S6vT6zcFscn ubrpqiGg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rZZr4-00000006NNV-1zGE; Mon, 12 Feb 2024 17:12:30 +0000 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rZZr1-00000006NLU-32Yz for linux-arm-kernel@lists.infradead.org; Mon, 12 Feb 2024 17:12:29 +0000 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-33b8441198cso527497f8f.2 for ; Mon, 12 Feb 2024 09:12:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707757946; x=1708362746; darn=lists.infradead.org; h=content-transfer-encoding:in-reply-to:organization:autocrypt :references:cc:to:content-language:subject:reply-to:from:user-agent :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=iUFMEG6hGBzuP2fzIahueVya06V53CR/t4OXacspNes=; b=RhOl9fgotg1n6XLqlxgGG8Ejhu+SZIhR+1FNutALrxpwhIVrMVaPyY0DGh8qWHmvuo 0w2O5ovNDDTdT02VnVhhiiakmxz07Uuh1ooJXTPHEUqjMu+AhEM9fRxRF2V5qNJQ1zlj TcHRDrHYaqKZulltnMuBx9KP0dJC5pDfRC1bHB3CN+lb2838T6hegltr6XasJnY5FXbE BnBuKY95hJcqTWbO1qAb4neK+FZ9tgLW1wxuR4GSZ+9FEWdtFcma6vRnBh5ySEoJjU0C /P9XV9jFmoH1w9VCvfqv66soAWH6KEMgnWb6YvhYPFK9jc1GI1nkt7K/6z/oMH5G51QI 8rOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707757946; x=1708362746; h=content-transfer-encoding:in-reply-to:organization:autocrypt :references:cc:to:content-language:subject:reply-to:from:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=iUFMEG6hGBzuP2fzIahueVya06V53CR/t4OXacspNes=; b=mqTWWx2egFQSqG0Zx9mQ/zfrtj41o872Drrt5lJIPXDWdtxYOUSj0cvpYfowk+KdhZ rnubIX9qhQVKVViPmhcaIbbwGDdiMruouzm0B5d3SjJyk7fnjZl9OVDd8onin0rczfzQ jLqsq+KMt1Gyd3wdk+d7N69aiq8FO8+1je3iT7l0hYRZQFCLoz7SuSm9coPYID2X3W4j kvi0Pxvn307gnHfMMFLTuIpxTac+wOO1I+l7TbctC8Elj+kYKMwmW0FmzJP8NJ1oyYgw feyKBJ9tIE/UXSKk7/MjRhTAg4ufSemWssHvOtZhBZ7a2zOSBy21Hn34ssEqkUnuYlna /ywg== X-Forwarded-Encrypted: i=1; AJvYcCU4lyJkMYzbUHyMCKNI5yeEakjKngErX82d0pROPE87MUZicobo4wqFcf2RhIAs1FC+N2uWdKfBhNmfsBLCX09u9p9Rb9IuJTyg7vsRs3W+azyfbXI= X-Gm-Message-State: AOJu0YzH6d6eunRPaLSmPQFZ2NcEbuEd7vxRH73ghYFoQ3W5JqlPhHW9 UF2cg+nRHeAZOeb9q/7mCwBhJMoFxP4poJOjZ/jUxGg5Wqg8tWdardVaLQV14zM= X-Google-Smtp-Source: AGHT+IF80oet3+jgmg4XyhbsJscfa5G5KkD3HA66bmXt2O3MdIyzgC6cND7cNxRofYyR830vEIsnnw== X-Received: by 2002:a05:6000:10cd:b0:33b:81cc:bd15 with SMTP id b13-20020a05600010cd00b0033b81ccbd15mr2220900wrx.37.1707757946194; Mon, 12 Feb 2024 09:12:26 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXDdDcd20fH/8E8P+RgtCFJF0xrUYhLzUi1gaCNtVU75oqSCnEJfs+GvUqsM7neB109DSgxsdBtqbPHogpb4zHvUephGeASkCSkHIYPcRw64CZuvJBejvJXm9MNIh5KlVf/XnLoVeGBjwgb3xWjjFas1pyWMckAJSxHwKQefVFvXzb4MiQrbD5qPoX+d4xAZhbXteU8pxCKD7GnY/v6I3XQYS1HezEoJV2XZCzDL3ypPCHJUtWi02zzYZj1NKlrHiKRlTzvqRzCf+fAPU7t5B9/r8qsoz403zvK04DuaEZui8cw8SqIf7vUxSZ63tTcLwiNI2Q5E+1XXVIKq+63a7nPU9aUWjqEeF9rh7ceLlhM9k5Ci4oPfrkafUtyDBX8m/giDdwqVn21JUKbrG7jDw86OzW26yOyDDWGbdN2zhEQ/iLHvQa2kIHz5yAGq+0NwFdObkEtBLZaMo7JSTVJBlPKGQ49Cm0HkIw/nbWEQHJ7V6Rl0oTliUEU85rRl73k2eBxxHooy5O/jwHufmYv2mDWb79ay3p74u9pTmY+bqsvJWDB8kiCq8BWOGW41uHNgCQcthzraa9V593G3n4VT0APuE5dooZn1zq5 Received: from ?IPV6:2a01:e0a:982:cbb0:fcee:f026:296d:135f? ([2a01:e0a:982:cbb0:fcee:f026:296d:135f]) by smtp.gmail.com with ESMTPSA id ck13-20020a5d5e8d000000b0033b684d6d5csm7440536wrb.20.2024.02.12.09.12.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 12 Feb 2024 09:12:25 -0800 (PST) Message-ID: <09b4656d-a16c-4ae9-b1be-4320e093b974@linaro.org> Date: Mon, 12 Feb 2024 18:12:25 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: neil.armstrong@linaro.org Subject: Re: [PATCH v4 07/20] drivers: crypto: meson: move algs definition and cipher API to cipher.c Content-Language: en-US, fr To: Alexey Romanov , clabbe@baylibre.com, herbert@gondor.apana.org.au, davem@davemloft.net, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, khilman@baylibre.com, jbrunet@baylibre.com, martin.blumenstingl@googlemail.com, vadim.fedorenko@linux.dev Cc: linux-crypto@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@salutedevices.com References: <20240212135108.549755-1-avromanov@salutedevices.com> <20240212135108.549755-8-avromanov@salutedevices.com> Autocrypt: addr=neil.armstrong@linaro.org; keydata= xsBNBE1ZBs8BCAD78xVLsXPwV/2qQx2FaO/7mhWL0Qodw8UcQJnkrWmgTFRobtTWxuRx8WWP GTjuhvbleoQ5Cxjr+v+1ARGCH46MxFP5DwauzPekwJUD5QKZlaw/bURTLmS2id5wWi3lqVH4 BVF2WzvGyyeV1o4RTCYDnZ9VLLylJ9bneEaIs/7cjCEbipGGFlfIML3sfqnIvMAxIMZrvcl9 qPV2k+KQ7q+aXavU5W+yLNn7QtXUB530Zlk/d2ETgzQ5FLYYnUDAaRl+8JUTjc0CNOTpCeik 80TZcE6f8M76Xa6yU8VcNko94Ck7iB4vj70q76P/J7kt98hklrr85/3NU3oti3nrIHmHABEB AAHNKk5laWwgQXJtc3Ryb25nIDxuZWlsLmFybXN0cm9uZ0BsaW5hcm8ub3JnPsLAkQQTAQoA OwIbIwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgBYhBInsPQWERiF0UPIoSBaat7Gkz/iuBQJk Q5wSAhkBAAoJEBaat7Gkz/iuyhMIANiD94qDtUTJRfEW6GwXmtKWwl/mvqQtaTtZID2dos04 YqBbshiJbejgVJjy+HODcNUIKBB3PSLaln4ltdsV73SBcwUNdzebfKspAQunCM22Mn6FBIxQ GizsMLcP/0FX4en9NaKGfK6ZdKK6kN1GR9YffMJd2P08EO8mHowmSRe/ExAODhAs9W7XXExw UNCY4pVJyRPpEhv373vvff60bHxc1k/FF9WaPscMt7hlkbFLUs85kHtQAmr8pV5Hy9ezsSRa GzJmiVclkPc2BY592IGBXRDQ38urXeM4nfhhvqA50b/nAEXc6FzqgXqDkEIwR66/Gbp0t3+r yQzpKRyQif3OwE0ETVkGzwEIALyKDN/OGURaHBVzwjgYq+ZtifvekdrSNl8TIDH8g1xicBYp QTbPn6bbSZbdvfeQPNCcD4/EhXZuhQXMcoJsQQQnO4vwVULmPGgtGf8PVc7dxKOeta+qUh6+ SRh3vIcAUFHDT3f/Zdspz+e2E0hPV2hiSvICLk11qO6cyJE13zeNFoeY3ggrKY+IzbFomIZY 4yG6xI99NIPEVE9lNBXBKIlewIyVlkOaYvJWSV+p5gdJXOvScNN1epm5YHmf9aE2ZjnqZGoM Mtsyw18YoX9BqMFInxqYQQ3j/HpVgTSvmo5ea5qQDDUaCsaTf8UeDcwYOtgI8iL4oHcsGtUX oUk33HEAEQEAAcLAXwQYAQIACQUCTVkGzwIbDAAKCRAWmrexpM/4rrXiB/sGbkQ6itMrAIfn M7IbRuiSZS1unlySUVYu3SD6YBYnNi3G5EpbwfBNuT3H8//rVvtOFK4OD8cRYkxXRQmTvqa3 3eDIHu/zr1HMKErm+2SD6PO9umRef8V82o2oaCLvf4WeIssFjwB0b6a12opuRP7yo3E3gTCS KmbUuLv1CtxKQF+fUV1cVaTPMyT25Od+RC1K+iOR0F54oUJvJeq7fUzbn/KdlhA8XPGzwGRy 4zcsPWvwnXgfe5tk680fEKZVwOZKIEuJC3v+/yZpQzDvGYJvbyix0lHnrCzq43WefRHI5XTT QbM0WUIBIcGmq38+OgUsMYu4NzLu7uZFAcmp6h8g Organization: Linaro Developer Services In-Reply-To: <20240212135108.549755-8-avromanov@salutedevices.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240212_091227_840991_65FF5CA3 X-CRM114-Status: GOOD ( 20.48 ) 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: , Reply-To: neil.armstrong@linaro.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 12/02/2024 14:50, Alexey Romanov wrote: > Because that is proper place for them. In particular, > it takes less of exported symbol between compiling entities. > > Signed-off-by: Alexey Romanov > --- > drivers/crypto/amlogic/amlogic-gxl-cipher.c | 98 +++++++++++++++-- > drivers/crypto/amlogic/amlogic-gxl-core.c | 110 ++++---------------- > drivers/crypto/amlogic/amlogic-gxl.h | 14 +-- > 3 files changed, 119 insertions(+), 103 deletions(-) > > diff --git a/drivers/crypto/amlogic/amlogic-gxl-cipher.c b/drivers/crypto/amlogic/amlogic-gxl-cipher.c > index dc0b100c5de2..bc3092a8a2c2 100644 > --- a/drivers/crypto/amlogic/amlogic-gxl-cipher.c > +++ b/drivers/crypto/amlogic/amlogic-gxl-cipher.c > @@ -271,7 +271,7 @@ int meson_handle_cipher_request(struct crypto_engine *engine, void *areq) > return 0; > } > > -int meson_skdecrypt(struct skcipher_request *areq) > +static int meson_skdecrypt(struct skcipher_request *areq) > { > struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(areq); > struct meson_cipher_tfm_ctx *op = crypto_skcipher_ctx(tfm); > @@ -289,7 +289,7 @@ int meson_skdecrypt(struct skcipher_request *areq) > return crypto_transfer_skcipher_request_to_engine(engine, areq); > } > > -int meson_skencrypt(struct skcipher_request *areq) > +static int meson_skencrypt(struct skcipher_request *areq) > { > struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(areq); > struct meson_cipher_tfm_ctx *op = crypto_skcipher_ctx(tfm); > @@ -307,7 +307,7 @@ int meson_skencrypt(struct skcipher_request *areq) > return crypto_transfer_skcipher_request_to_engine(engine, areq); > } > > -int meson_cipher_init(struct crypto_tfm *tfm) > +static int meson_cipher_init(struct crypto_tfm *tfm) > { > struct meson_cipher_tfm_ctx *op = crypto_tfm_ctx(tfm); > struct meson_alg_template *algt; > @@ -333,7 +333,7 @@ int meson_cipher_init(struct crypto_tfm *tfm) > return 0; > } > > -void meson_cipher_exit(struct crypto_tfm *tfm) > +static void meson_cipher_exit(struct crypto_tfm *tfm) > { > struct meson_cipher_tfm_ctx *op = crypto_tfm_ctx(tfm); > > @@ -341,8 +341,8 @@ void meson_cipher_exit(struct crypto_tfm *tfm) > crypto_free_skcipher(op->fallback_tfm); > } > > -int meson_aes_setkey(struct crypto_skcipher *tfm, const u8 *key, > - unsigned int keylen) > +static int meson_aes_setkey(struct crypto_skcipher *tfm, const u8 *key, > + unsigned int keylen) > { > struct meson_cipher_tfm_ctx *op = crypto_skcipher_ctx(tfm); > struct meson_dev *mc = op->mc; > @@ -369,3 +369,89 @@ int meson_aes_setkey(struct crypto_skcipher *tfm, const u8 *key, > > return crypto_skcipher_setkey(op->fallback_tfm, key, keylen); > } > + > +static struct meson_alg_template algs[] = { > +{ > + .type = CRYPTO_ALG_TYPE_SKCIPHER, > + .blockmode = MESON_OPMODE_CBC, > + .alg.skcipher.base = { > + .base = { > + .cra_name = "cbc(aes)", > + .cra_driver_name = "cbc-aes-gxl", > + .cra_priority = 400, > + .cra_blocksize = AES_BLOCK_SIZE, > + .cra_flags = CRYPTO_ALG_TYPE_SKCIPHER | > + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY | > + CRYPTO_ALG_NEED_FALLBACK, > + .cra_ctxsize = sizeof(struct meson_cipher_tfm_ctx), > + .cra_module = THIS_MODULE, > + .cra_alignmask = 0xf, > + .cra_init = meson_cipher_init, > + .cra_exit = meson_cipher_exit, > + }, > + .min_keysize = AES_MIN_KEY_SIZE, > + .max_keysize = AES_MAX_KEY_SIZE, > + .ivsize = AES_BLOCK_SIZE, > + .setkey = meson_aes_setkey, > + .encrypt = meson_skencrypt, > + .decrypt = meson_skdecrypt, > + }, > + .alg.skcipher.op = { > + .do_one_request = meson_handle_cipher_request, > + }, > +}, > +{ > + .type = CRYPTO_ALG_TYPE_SKCIPHER, > + .blockmode = MESON_OPMODE_ECB, > + .alg.skcipher.base = { > + .base = { > + .cra_name = "ecb(aes)", > + .cra_driver_name = "ecb-aes-gxl", > + .cra_priority = 400, > + .cra_blocksize = AES_BLOCK_SIZE, > + .cra_flags = CRYPTO_ALG_TYPE_SKCIPHER | > + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY | > + CRYPTO_ALG_NEED_FALLBACK, > + .cra_ctxsize = sizeof(struct meson_cipher_tfm_ctx), > + .cra_module = THIS_MODULE, > + .cra_alignmask = 0xf, > + .cra_init = meson_cipher_init, > + .cra_exit = meson_cipher_exit, > + }, > + .min_keysize = AES_MIN_KEY_SIZE, > + .max_keysize = AES_MAX_KEY_SIZE, > + .setkey = meson_aes_setkey, > + .encrypt = meson_skencrypt, > + .decrypt = meson_skdecrypt, > + }, > + .alg.skcipher.op = { > + .do_one_request = meson_handle_cipher_request, > + }, > +}, > +}; > + > +int meson_cipher_register(struct meson_dev *mc) > +{ > + return meson_register_algs(mc, algs, ARRAY_SIZE(algs)); > +} > + > +void meson_cipher_unregister(struct meson_dev *mc) > +{ > + meson_unregister_algs(mc, algs, ARRAY_SIZE(algs)); > +} > + > +void meson_cipher_debugfs_show(struct seq_file *seq, void *v) > +{ > + int i; > + > + for (i = 0; i < ARRAY_SIZE(algs); i++) { > + seq_printf(seq, "%s %s %lu %lu\n", > + algs[i].alg.skcipher.base.base.cra_driver_name, > + algs[i].alg.skcipher.base.base.cra_name, > +#ifdef CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG > + algs[i].stat_req, algs[i].stat_fb); > +#else > + 0ul, 0ul); > +#endif > + } > +} > diff --git a/drivers/crypto/amlogic/amlogic-gxl-core.c b/drivers/crypto/amlogic/amlogic-gxl-core.c > index f7c60ebffbc3..22ff2768b5e5 100644 > --- a/drivers/crypto/amlogic/amlogic-gxl-core.c > +++ b/drivers/crypto/amlogic/amlogic-gxl-core.c > @@ -65,66 +65,6 @@ static irqreturn_t meson_irq_handler(int irq, void *data) > return IRQ_HANDLED; > } > > -static struct meson_alg_template mc_algs[] = { > -{ > - .type = CRYPTO_ALG_TYPE_SKCIPHER, > - .blockmode = MESON_OPMODE_CBC, > - .alg.skcipher.base = { > - .base = { > - .cra_name = "cbc(aes)", > - .cra_driver_name = "cbc-aes-gxl", > - .cra_priority = 400, > - .cra_blocksize = AES_BLOCK_SIZE, > - .cra_flags = CRYPTO_ALG_TYPE_SKCIPHER | > - CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY | > - CRYPTO_ALG_NEED_FALLBACK, > - .cra_ctxsize = sizeof(struct meson_cipher_tfm_ctx), > - .cra_module = THIS_MODULE, > - .cra_alignmask = 0xf, > - .cra_init = meson_cipher_init, > - .cra_exit = meson_cipher_exit, > - }, > - .min_keysize = AES_MIN_KEY_SIZE, > - .max_keysize = AES_MAX_KEY_SIZE, > - .ivsize = AES_BLOCK_SIZE, > - .setkey = meson_aes_setkey, > - .encrypt = meson_skencrypt, > - .decrypt = meson_skdecrypt, > - }, > - .alg.skcipher.op = { > - .do_one_request = meson_handle_cipher_request, > - }, > -}, > -{ > - .type = CRYPTO_ALG_TYPE_SKCIPHER, > - .blockmode = MESON_OPMODE_ECB, > - .alg.skcipher.base = { > - .base = { > - .cra_name = "ecb(aes)", > - .cra_driver_name = "ecb-aes-gxl", > - .cra_priority = 400, > - .cra_blocksize = AES_BLOCK_SIZE, > - .cra_flags = CRYPTO_ALG_TYPE_SKCIPHER | > - CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY | > - CRYPTO_ALG_NEED_FALLBACK, > - .cra_ctxsize = sizeof(struct meson_cipher_tfm_ctx), > - .cra_module = THIS_MODULE, > - .cra_alignmask = 0xf, > - .cra_init = meson_cipher_init, > - .cra_exit = meson_cipher_exit, > - }, > - .min_keysize = AES_MIN_KEY_SIZE, > - .max_keysize = AES_MAX_KEY_SIZE, > - .setkey = meson_aes_setkey, > - .encrypt = meson_skencrypt, > - .decrypt = meson_skdecrypt, > - }, > - .alg.skcipher.op = { > - .do_one_request = meson_handle_cipher_request, > - }, > -}, > -}; > - > static int meson_debugfs_show(struct seq_file *seq, void *v) > { > struct meson_dev *mc __maybe_unused = seq->private; > @@ -138,20 +78,8 @@ static int meson_debugfs_show(struct seq_file *seq, void *v) > 0ul); > #endif > > - for (i = 0; i < ARRAY_SIZE(mc_algs); i++) { > - switch (mc_algs[i].type) { > - case CRYPTO_ALG_TYPE_SKCIPHER: > - seq_printf(seq, "%s %s %lu %lu\n", > - mc_algs[i].alg.skcipher.base.base.cra_driver_name, > - mc_algs[i].alg.skcipher.base.base.cra_name, > -#ifdef CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG > - mc_algs[i].stat_req, mc_algs[i].stat_fb); > -#else > - 0ul, 0ul); > -#endif > - break; > - } > - } > + meson_cipher_debugfs_show(seq, v); > + > return 0; > } > DEFINE_SHOW_ATTRIBUTE(meson_debugfs); > @@ -228,38 +156,40 @@ static int meson_allocate_chanlist(struct meson_dev *mc) > return err; > } > > -static int meson_register_algs(struct meson_dev *mc) > +int meson_register_algs(struct meson_dev *mc, struct meson_alg_template *algs, > + unsigned int count) > { > int err, i; > > - for (i = 0; i < ARRAY_SIZE(mc_algs); i++) { > - mc_algs[i].mc = mc; > - switch (mc_algs[i].type) { > + for (i = 0; i < count; i++) { > + switch (algs[i].type) { > case CRYPTO_ALG_TYPE_SKCIPHER: > - err = crypto_engine_register_skcipher(&mc_algs[i].alg.skcipher); > + err = crypto_engine_register_skcipher(&algs[i].alg.skcipher); > if (err) { > dev_err(mc->dev, "Fail to register %s\n", > - mc_algs[i].alg.skcipher.base.base.cra_name); > - mc_algs[i].mc = NULL; > + algs[i].alg.skcipher.base.base.cra_name); > + meson_unregister_algs(mc, algs, count); > return err; > } > break; > } > + algs[i].mc = mc; > } > > return 0; > } > > -static void meson_unregister_algs(struct meson_dev *mc) > +void meson_unregister_algs(struct meson_dev *mc, struct meson_alg_template *algs, > + unsigned int count) > { > int i; > > - for (i = 0; i < ARRAY_SIZE(mc_algs); i++) { > - if (!mc_algs[i].mc) > + for (i = 0; i < count; i++) { > + if (!algs[i].mc) > continue; > - switch (mc_algs[i].type) { > + switch (algs[i].type) { > case CRYPTO_ALG_TYPE_SKCIPHER: > - crypto_engine_unregister_skcipher(&mc_algs[i].alg.skcipher); > + crypto_engine_unregister_skcipher(&algs[i].alg.skcipher); > break; > } > } > @@ -318,9 +248,9 @@ static int meson_crypto_probe(struct platform_device *pdev) > if (err) > goto error_flow; > > - err = meson_register_algs(mc); > + err = meson_cipher_register(mc); > if (err) > - goto error_alg; > + goto error_flow; > > if (IS_ENABLED(CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG)) { > struct dentry *dbgfs_dir; > @@ -334,8 +264,6 @@ static int meson_crypto_probe(struct platform_device *pdev) > } > > return 0; > -error_alg: > - meson_unregister_algs(mc); > error_flow: > meson_free_chanlist(mc, mc->flow_cnt - 1); > return err; > @@ -349,7 +277,7 @@ static void meson_crypto_remove(struct platform_device *pdev) > debugfs_remove_recursive(mc->dbgfs_dir); > #endif > > - meson_unregister_algs(mc); > + meson_cipher_unregister(mc); > > meson_free_chanlist(mc, mc->flow_cnt - 1); > } > diff --git a/drivers/crypto/amlogic/amlogic-gxl.h b/drivers/crypto/amlogic/amlogic-gxl.h > index e27908992ae3..0a03e8144977 100644 > --- a/drivers/crypto/amlogic/amlogic-gxl.h > +++ b/drivers/crypto/amlogic/amlogic-gxl.h > @@ -167,10 +167,12 @@ void meson_dma_start(struct meson_dev *mc, int flow); > > int meson_enqueue(struct crypto_async_request *areq, u32 type); > > -int meson_aes_setkey(struct crypto_skcipher *tfm, const u8 *key, > - unsigned int keylen); > -int meson_cipher_init(struct crypto_tfm *tfm); > -void meson_cipher_exit(struct crypto_tfm *tfm); > -int meson_skdecrypt(struct skcipher_request *areq); > -int meson_skencrypt(struct skcipher_request *areq); > +int meson_register_algs(struct meson_dev *mc, struct meson_alg_template *algs, > + unsigned int count); > +void meson_unregister_algs(struct meson_dev *mc, struct meson_alg_template *algs, > + unsigned int count); > + > +int meson_cipher_register(struct meson_dev *mc); > +void meson_cipher_unregister(struct meson_dev *mc); > +void meson_cipher_debugfs_show(struct seq_file *seq, void *v); > int meson_handle_cipher_request(struct crypto_engine *engine, void *areq); Reviewed-by: Neil Armstrong _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel