From patchwork Sun Jul 9 13:59:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 700845 Delivered-To: patch@linaro.org Received: by 2002:adf:fcc5:0:0:0:0:0 with SMTP id f5csp4742723wrs; Sun, 9 Jul 2023 07:05:42 -0700 (PDT) X-Google-Smtp-Source: APBJJlEQU9Atx7z30ArKCi11obV5K37rv4SfcqKtHUK0B2IO2DotAUJtP94+0CEIK2DgrjtXN4+P X-Received: by 2002:a05:620a:2684:b0:767:15d6:a276 with SMTP id c4-20020a05620a268400b0076715d6a276mr10600473qkp.29.1688911542221; Sun, 09 Jul 2023 07:05:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688911542; cv=none; d=google.com; s=arc-20160816; b=M1YbR28TQdlSdtgrg6edXFpzzhSMd3d2heNe6HEQfqIMAQcptiTNsdfcHU8ADk+NPr cr8KYslT4zhjsbc0gaK27foCFLtc636RAaEYiIO7FbXrN+vuj6r5xBFdestHzHxHnOBr EAhZKF2wmPJtCXXUgfiS0zcETtpYvYHr/KNqQ+W9BTI7TuIJ/vb9op74Dxg8VqzTubXF QRzlaC+3bN7AOJyG+3QpJ2ZFKRXKqya8kQTN5shmG/q7mAv1TXRYTDV7RGrTQ+FXRBq3 eXW6wv6B2aRFNgIlzEW4iwJ4oXiKSZ/flqy26QRXSNPZ7sPOpkJpQpeUhdTP1Xg5gYje +65Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=muoNLx2OrRgCzPDttQEHoOl2grqT5w0p62Pb+0kehUU=; fh=i1mkeM7bD/ppus3C3v+92ltBBCUUU0zBXrpbYjAjHqE=; b=WPlM4R+fav4n/Cd2x2HiNkenn2lDFr8avN6gZBVcGazVVBKi5BOwe9sUmkkWdZFO1W ILAnLD7hJ2jvci50jQ4iLGUiKVI5tn0xlW+SivXoU7ZNwmGtlPr4puFTrFLFTvOvPDB7 c6v+SDA5MScE9Bu73FgGSi35Tda7LL2kCutvAkr8QN7TW/C39IU2PuWdHhAFXYWpG3H8 +7Gw13Q3hXIjOjJLC7sLMY4qkZEQrglzP+whhO7d0O1d37/Vct3oL/aMe3beYKKGmQPM gYaQX1MQT7ywkNgM3EyFPu2jVFkGb9B0fpDv1Zy9yTM3mjz6+O7OHcmh7zO2vJ+8jH4U YyGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LpwQbET2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v22-20020a05620a441600b00767cf98a27asi474979qkp.391.2023.07.09.07.05.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 09 Jul 2023 07:05:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LpwQbET2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qIUxu-0000ve-TN; Sun, 09 Jul 2023 10:00:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qIUxY-0000Tf-UZ for qemu-devel@nongnu.org; Sun, 09 Jul 2023 10:00:23 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qIUxW-0000ef-6B for qemu-devel@nongnu.org; Sun, 09 Jul 2023 10:00:20 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3142970df44so3380040f8f.3 for ; Sun, 09 Jul 2023 07:00:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688911214; x=1691503214; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=muoNLx2OrRgCzPDttQEHoOl2grqT5w0p62Pb+0kehUU=; b=LpwQbET2QueCCB9bLH6Mpj1qA3yIApEX6mQ61Jd3c4ViJXtkaMxwo53UU8FoKy3y5d ifi7WIWDkRMDUvGBxJ4vCqYr+y35SdkSIi5pLUMXUtbdKOgeSSPN1MNMugYtc9QmHdXZ mCNzA5EhfjIp3w8KvS8FJdsJB/rHcgvnDcf/4E5X1wU36depjUtBFVoo3Lioodgxhngu yUZSbKIpwfCL8oJpCW2mpFFn9CPOTcVxCmtp5o9qM3l7eetrOU4LCWM+8mSICBRiQ94y 8Nb6nx/yZqDoPu23S6dmGw5Z6t+rC7wMNw1xos9VWW9GoTZ5oquUaXw41wXd4CQtfcIJ cYMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688911214; x=1691503214; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=muoNLx2OrRgCzPDttQEHoOl2grqT5w0p62Pb+0kehUU=; b=SHJLeGZCEKVRtBrpQuPZCePSfq4yszHrArAUcUc50O9wMbSaWwuJYvLqTnuZG5fh7r f6Q7wAJgdfxz3ikCO+ogIFbaGu4LvNelDjyA4KtDXRUQGOIEdri0GXP75DBRKJw7PJJL Gy6Trrq6P5T/SKJWLw+JJJQzDD/m80K6FNQHTuxPVhQAXz3NjY1Pcw06ilQDsbekA6G+ wtHK/jqe/gfEExE+CgHN1b4uJNz/426gdBXDC8JjBbHPW27y6RzYxq9Dd2HHJOTVNAXe Z0z31O8GsKDpg48vIOZH/7XblOMUczAK0PSQ/2Qx0BOOwGbdMbWt/W+cFTMS+TwkN2cc PThA== X-Gm-Message-State: ABy/qLYqFYQdNnXAlNTg7QpoWkV6GoIh5CFyDKlR2S+5g/iL+ZE9jWc4 0BqGurLbySmbVVdZp/Y1KM8lZ/mPo+AAZx9fXnRBuQ== X-Received: by 2002:a5d:5911:0:b0:315:8fc0:9155 with SMTP id v17-20020a5d5911000000b003158fc09155mr3235875wrd.44.1688911213927; Sun, 09 Jul 2023 07:00:13 -0700 (PDT) Received: from stoup.. ([148.252.133.210]) by smtp.gmail.com with ESMTPSA id v18-20020a5d6792000000b003063a92bbf5sm9239422wru.70.2023.07.09.07.00.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Jul 2023 07:00:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 31/37] target/riscv: Use aesdec_IMC Date: Sun, 9 Jul 2023 14:59:39 +0100 Message-Id: <20230709135945.250311-32-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230709135945.250311-1-richard.henderson@linaro.org> References: <20230709135945.250311-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=richard.henderson@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This implements the AES64IM instruction. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/riscv/crypto_helper.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/target/riscv/crypto_helper.c b/target/riscv/crypto_helper.c index e61f7fe1e5..505166ce5a 100644 --- a/target/riscv/crypto_helper.c +++ b/target/riscv/crypto_helper.c @@ -272,17 +272,12 @@ target_ulong HELPER(aes64ks1i)(target_ulong rs1, target_ulong rnum) target_ulong HELPER(aes64im)(target_ulong rs1) { - uint64_t RS1 = rs1; - uint32_t col_0 = RS1 & 0xFFFFFFFF; - uint32_t col_1 = RS1 >> 32; - target_ulong result; + AESState t; - col_0 = AES_INVMIXCOLUMN(col_0); - col_1 = AES_INVMIXCOLUMN(col_1); - - result = ((uint64_t)col_1 << 32) | col_0; - - return result; + t.d[HOST_BIG_ENDIAN] = rs1; + t.d[!HOST_BIG_ENDIAN] = 0; + aesdec_IMC(&t, &t, false); + return t.d[HOST_BIG_ENDIAN]; } target_ulong HELPER(sm4ed)(target_ulong rs1, target_ulong rs2,