From patchwork Fri Mar 1 13:29:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Romanov X-Patchwork-Id: 208841 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2097:b0:108:e6aa:91d0 with SMTP id gs23csp1079345dyb; Fri, 1 Mar 2024 05:34:36 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVGBUp7TwGBmE6pMkZEvHtNFlDula7agk4LkBEIlCZDTm30XFyPCME0xJr7DGJ0PVBZIizscZ4lC50Cd/FDC2h+Utj1Kg== X-Google-Smtp-Source: AGHT+IFAYwb1T9AaQ8Cp+EOspOKUZ2IpluLOL+/HOFwSu33iFEIEvBF27gxvH1qZ7wTbhTGVZWda X-Received: by 2002:a17:902:d491:b0:1d8:ab27:d76c with SMTP id c17-20020a170902d49100b001d8ab27d76cmr1886019plg.51.1709300076649; Fri, 01 Mar 2024 05:34:36 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709300076; cv=pass; d=google.com; s=arc-20160816; b=aqm3i2sBJhpqxKdG0sVxpHFG57ZwbzLphR/2SG5rnAuvscgukMKQxKytVnZGroIdwh SpODAQcYWpvFlkP5HGXGveGOYiITH9pIxahhBq9J2D2e0NXlYZzg8KJCTljLa9XWQJeY T1i/FPy7bl664Df60MYDqXuya2cB43E6FiSUD2k77od2Ozp48/SNkcR5rBZ0vJWNQLng 49jC+ryaY1a5BzBh9CztdC5FnIHMcLMk97cK9JuP6Flzgl+W7oy6EW+Ln+Q+7//8kqiN XGwilyoWZVmupTiVRd3KCXKKDrEHMn/B/XXB3oqqUNZaNLBKmMAkXLooqdDm8bzz1Y11 Clpg== ARC-Message-Signature: i=2; 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=79TdGOty6YNXA9n2qQuukaYq/6PaX4J0aZnDKrMLGuA=; fh=7+QqR+U+m0B5ryyywou1kgMZVOfT/GgVHz0ZH2Lvlxg=; b=HfSCO377mpiFQU6pill0nlfCvvcYuoHTAbs7gVsjmo+4sOgeTKwGDCkJYJ3ZPFvgYr Bp2eT7zJ3LGWeA1pGtkTVpvLxPVb3vy8vDoyZBp2KCG6POPjCJsHsCm4TloDM+VhRUf/ PKdmO4TDOubnzyZCngTz3R8vP74d1NlgFrDYVnnUx9rWkrp3UoSmQjhfXHP5uRHvMBC5 pkg7x8PNhg7ru6V49bPVqlJ04yntu3MNvc8zQIfl4x0RGvkRmiRezsrfZFTxQJ1a7jKu fSyDQWDbyevY7hTl216/izpehYMJoLCi+/q6xQGkQmdcfXIjmc5T30iE8t0b/dl9+If4 0y/w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@salutedevices.com header.s=mail header.b=hEpJ1u0Q; arc=pass (i=1 spf=pass spfdomain=salutedevices.com dkim=pass dkdomain=salutedevices.com dmarc=pass fromdomain=salutedevices.com); spf=pass (google.com: domain of linux-kernel+bounces-88480-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88480-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=salutedevices.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id b14-20020a170903228e00b001db61ef0514si3707216plh.85.2024.03.01.05.34.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 05:34:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-88480-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@salutedevices.com header.s=mail header.b=hEpJ1u0Q; arc=pass (i=1 spf=pass spfdomain=salutedevices.com dkim=pass dkdomain=salutedevices.com dmarc=pass fromdomain=salutedevices.com); spf=pass (google.com: domain of linux-kernel+bounces-88480-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88480-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE 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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 37722289EA5 for ; Fri, 1 Mar 2024 13:34:36 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 995DB76042; Fri, 1 Mar 2024 13:30:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b="hEpJ1u0Q" Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) (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 5FBEB73189; Fri, 1 Mar 2024 13:30:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.89.224.132 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709299821; cv=none; b=QJFvX6P4ZUEOLyyOT4+LI+o9MMPL+M4e+xIegz7OZrKtBBH/HUzbxLBGmTVWef3Vzg5GtvZ/14TOId2EHtfhqw2ulFDo/h7z7XBl+h3hojTGpTh7wWcjZt4l0I1RVaXLzSRXSbVDRayRM9TZQM46At3aVIgJlr74Ot8k3stbT20= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709299821; c=relaxed/simple; bh=zVGtBoKbSKToAgzf7OoyhmsHTmmcTp3XfAxEtHSSyrQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=C7xgpATJTzHid8wmy7G71Y6zOXKjurHaMKIvOtJG/TPEN60LoH64Ubsm9CUX6U0t80jveLtzYkyLhespDxZiqkY7CnhYuYZAl3gp2FRsQBtqGmFGn++LnSpQr8a+s36xEdYsXRcoEfraoAa+61TQmg3ME38I0dNPpvxZROMexTY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=salutedevices.com; spf=pass smtp.mailfrom=salutedevices.com; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b=hEpJ1u0Q; arc=none smtp.client-ip=45.89.224.132 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=salutedevices.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=salutedevices.com Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 9E4D31200EE; Fri, 1 Mar 2024 16:30:17 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 9E4D31200EE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1709299817; bh=79TdGOty6YNXA9n2qQuukaYq/6PaX4J0aZnDKrMLGuA=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=hEpJ1u0Q+cKbR6lXhk/7kCgJGjxj9ITeTYIyDqpt3iHZaaDV8f3zGUBZTnDysmM9b yu2pCGvU6HJBJFChLadNJISGS1C4FFRPgvH1x+RfK53YoYrZkf7qBE+SuwkLNjgTFQ a4lwZnT3L+MaP05rv5NGeR1sQFhK/8Y6YXIaE3tGyVgapkojCWBF+v/bOvdnN4lvbZ aK6UJ9waY8d5eYxveUiffPm+aptw0BLLKdDk0Uhcff09512Q42Ev89HRG7tYkgY/Oe qp6B/yAcd7ueyfBeB20Vg0QOmZmbhK+d8Dwy2A4lGA/DyxYllLvBMMPYmZCy9gqw3N ZqwSojD9wVF6A== 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; Fri, 1 Mar 2024 16:30:17 +0300 (MSK) Received: from user-A520M-DS3H.sigma.sbrf.ru (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; Fri, 1 Mar 2024 16:30:17 +0300 From: Alexey Romanov To: , , , , , , , , , , CC: , , , , , , Alexey Romanov Subject: [PATCH v5 13/21] drivers: crypto: meson: use fallback for 192-bit keys Date: Fri, 1 Mar 2024 16:29:28 +0300 Message-ID: <20240301132936.621238-14-avromanov@salutedevices.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240301132936.621238-1-avromanov@salutedevices.com> References: <20240301132936.621238-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-m01.sberdevices.ru (172.16.192.107) 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: 183875 [Feb 29 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}, 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/02/29 19:21:00 #23899999 X-KSMG-AntiVirus-Status: Clean, skipped X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792331037133890732 X-GMAIL-MSGID: 1792331037133890732 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 698868fe2502..3057a5ab3acf 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 c3cec58cf443..e841ce25de67 100644 --- a/drivers/crypto/amlogic/amlogic-gxl-core.c +++ b/drivers/crypto/amlogic/amlogic-gxl-core.c @@ -291,6 +291,7 @@ static const struct meson_pdata meson_gxl_pdata = { .setup_desc_cnt = 3, .hasher_supported = false, .reverse_keyiv = true, + .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 de11e174f03d..01913daf1bf4 100644 --- a/drivers/crypto/amlogic/amlogic-gxl.h +++ b/drivers/crypto/amlogic/amlogic-gxl.h @@ -98,6 +98,7 @@ struct meson_flow { * @reg_status: offset to status register * @setup_desc_cnt: number of setup descriptor to configure. * @hasher_supported: indecates whether hasher is supported. + * @support_192bit_key: indicates whether platform support AES 192-bit key */ struct meson_pdata { u32 descs_reg; @@ -105,6 +106,7 @@ struct meson_pdata { u32 setup_desc_cnt; bool hasher_supported; bool reverse_keyiv; + bool support_192bit_key; }; /*