From patchwork Wed Jan 10 20:11:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Romanov X-Patchwork-Id: 187053 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2411:b0:101:2151:f287 with SMTP id m17csp1034588dyi; Wed, 10 Jan 2024 12:22:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IHi1PKP0nngxx4HXBrtEmPEYJElZ4ANJDwMMBh+hyOX+IPDKTkYQRvABF9X8sukLgLCmmyW X-Received: by 2002:a05:600c:6a87:b0:40e:556c:267 with SMTP id jl7-20020a05600c6a8700b0040e556c0267mr804519wmb.242.1704918127809; Wed, 10 Jan 2024 12:22:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704918127; cv=none; d=google.com; s=arc-20160816; b=GMQ5oq2jUb4lHkfR6Nf+AAzXRt1r/UwD2ORY+DEsuNXKfZELdha+cWMlfcQDHRg9Jv sBb/vRSGdJmbHlQxyiEkS/8kPxgvytqypNaYlwWZ9a6Bo6/Oqm7vkXxSqswa9cyu6ZhQ TDEFZQvlBIbQrd+Z42GQi7HbtjNcD616tAzLChrTbAskBnXLZf3Nev0VgXaYzmfOywVu fV5rG0DhHFoZv87TOJebou5jzygftPoG1YV5GlK2VGbSx4J7fcWS1LFtLWNvYEQElpUm ZrFy+0pNdA4MgEabpodP8wlrwW8hv4W/kxD1IryncEtvww3+E5MDeHLmAwuaShX4kGup wo0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature:dkim-filter; bh=fx6o7fLvKQ4MCqm/kAD36dHHhFI39f0No+Z3vxZ4Tsw=; fh=0p1Kpk55kVc6lC+al+CDnSnq4czU1u1X+MgcW9lnQNo=; b=nYlGCkpi9fYMViAtbCuFQ1OJErS41NQNu5V3H9kqkxUKf8Yu46b8dHJwGndZUTkACk T3elMy4IYxuWohKoylVXfYvKCATzWO+Snvob8cTYaosIWIRIdNYHl1p52q911DLtYkXw 55ViWAsL/tl3LoAyqCIs5KU36N8Vk7uJgD/JgIvxQi7Pkym0Q93neWPsKIf+tfuwi3yx F6mJ8UCF9+qebah8KPrE2Y1YIwMJoVS2N0HtQ5qox9UwTYY76jCgVp4iZa67nvEfKMwA 9RMGgIxOMEg7L1xjWcnSNbfo1NruZSAB52pa+TvEjBSUG3zVVlDUqZd+MYwOFbw6Ot72 egLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@salutedevices.com header.s=mail header.b=Z4UMQth1; spf=pass (google.com: domain of linux-kernel+bounces-22704-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-22704-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=salutedevices.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id d16-20020a170906371000b00a2ac113d678si2121994ejc.358.2024.01.10.12.22.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jan 2024 12:22:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-22704-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@salutedevices.com header.s=mail header.b=Z4UMQth1; spf=pass (google.com: domain of linux-kernel+bounces-22704-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-22704-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=salutedevices.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id C86851F25666 for ; Wed, 10 Jan 2024 20:15:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8781E54BDD; Wed, 10 Jan 2024 20:12:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b="Z4UMQth1" Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 78B304F897; Wed, 10 Jan 2024 20:12:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=salutedevices.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=salutedevices.com Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 216B5100024; Wed, 10 Jan 2024 23:12:38 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 216B5100024 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1704917558; bh=fx6o7fLvKQ4MCqm/kAD36dHHhFI39f0No+Z3vxZ4Tsw=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=Z4UMQth1gSGiKSKnUiuot2I+39K9tTbaXa9LIF8GcGzYH7XpcsavHfHP1fyx17Hy1 Ih/E69HN1HHy4hcK4BbNOGJir5AdUwIR9AcH5Fj3mir9rFGbezVLuSeh/nyJlV+/VU 2zLmcmvSTeu+XMx01k+NSfXZb22mKLLaqphw0mLMmlYB2F2RDltd8GnwlmQasjs8C3 1D7dbAzDDsfGyFtRW+ADcsfvHh/qSWvv7o04U5k9nrMPMn4ABtaYrjpDDjaT7GN6wC pGg6NVKxBYjqeDpZtAqkzhcHAtUJgS6NKy55Y67pHKmLNOfRsTAt/zlIwLURlBBEQ7 AYPVmoHmgRkLA== Received: from smtp.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Wed, 10 Jan 2024 23:12:37 +0300 (MSK) Received: from localhost.localdomain (100.64.160.123) by p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Wed, 10 Jan 2024 23:12:37 +0300 From: Alexey Romanov To: , , , , , , , , , , CC: , , , , , , Alexey Romanov Subject: [PATCH v1 13/24] drivers: crypto: meson: use fallback for 192-bit keys Date: Wed, 10 Jan 2024 23:11:29 +0300 Message-ID: <20240110201216.18016-14-avromanov@salutedevices.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110201216.18016-1-avromanov@salutedevices.com> References: <20240110201216.18016-1-avromanov@salutedevices.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 182544 [Jan 10 2024] X-KSMG-AntiSpam-Version: 6.1.0.3 X-KSMG-AntiSpam-Envelope-From: avromanov@salutedevices.com X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 7 0.3.7 6d6bf5bd8eea7373134f756a2fd73e9456bb7d1a, {Tracking_from_domain_doesnt_match_to}, 127.0.0.199:7.1.2;100.64.160.123:7.1.2;smtp.sberdevices.ru:5.0.1,7.1.1;salutedevices.com:7.1.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1, FromAlignment: s, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2024/01/10 17:01:00 #23071477 X-KSMG-AntiVirus-Status: Clean, skipped X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787736230967357698 X-GMAIL-MSGID: 1787736230967357698 Unforunately, not all Amlogic SoC's have a 192-bit key support for AES algo. In this case, use fallback. Signed-off-by: Alexey Romanov --- drivers/crypto/amlogic/amlogic-gxl-cipher.c | 7 +++++++ drivers/crypto/amlogic/amlogic-gxl-core.c | 1 + drivers/crypto/amlogic/amlogic-gxl.h | 2 ++ 3 files changed, 10 insertions(+) diff --git a/drivers/crypto/amlogic/amlogic-gxl-cipher.c b/drivers/crypto/amlogic/amlogic-gxl-cipher.c index b60b65034b6e..20ef3dfbaeb4 100644 --- a/drivers/crypto/amlogic/amlogic-gxl-cipher.c +++ b/drivers/crypto/amlogic/amlogic-gxl-cipher.c @@ -41,6 +41,13 @@ static bool meson_cipher_need_fallback_sg(struct skcipher_request *areq, static bool meson_cipher_need_fallback(struct skcipher_request *areq) { + struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(areq); + struct meson_cipher_tfm_ctx *op = crypto_skcipher_ctx(tfm); + struct meson_dev *mc = op->mc; + + if (op->keymode == DESC_MODE_AES_192 && !mc->pdata->support_192bit_key) + return true; + if (areq->cryptlen == 0) return true; diff --git a/drivers/crypto/amlogic/amlogic-gxl-core.c b/drivers/crypto/amlogic/amlogic-gxl-core.c index a2bc9299214a..202dd9f73e55 100644 --- a/drivers/crypto/amlogic/amlogic-gxl-core.c +++ b/drivers/crypto/amlogic/amlogic-gxl-core.c @@ -206,6 +206,7 @@ static const struct meson_pdata meson_gxl_pdata = { .descs_reg = 0x0, .status_reg = 0x4, .setup_desc_cnt = 3, + .support_192bit_key = true, }; static const struct of_device_id meson_crypto_of_match_table[] = { diff --git a/drivers/crypto/amlogic/amlogic-gxl.h b/drivers/crypto/amlogic/amlogic-gxl.h index d9336718d813..d4b2468b7e92 100644 --- a/drivers/crypto/amlogic/amlogic-gxl.h +++ b/drivers/crypto/amlogic/amlogic-gxl.h @@ -97,11 +97,13 @@ struct meson_flow { * @reg_descs: offset to descriptors register * @reg_status: offset to status register * @setup_desc_cnt: number of setup descriptor to configure. + * @support_192bit_key: indicates whether platform support AES 192-bit key */ struct meson_pdata { u32 descs_reg; u32 status_reg; u32 setup_desc_cnt; + bool support_192bit_key; }; /*