From nobody Wed Sep 23 00:43:30 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=aspeedtech.com); dmarc=pass(p=quarantine dis=none) header.from=aspeedtech.com ARC-Seal: i=2; a=rsa-sha256; t=1784014223; cv=pass; d=zohomail.com; s=zohoarc; b=TNIuhB16sj1T6HFhEVvDTXWsQ3SMkjVJxrlWFvZav43PGhlkjHuw4f2yrfAHtFVRJVlLgMoKl+J4puOTS/AM6tnCqepj+ey4S/M3wYLpzrDcrHUETWBBCTS6Vz3pnsmJnAsYAlkuBOwNDzxLAKwudh4GkdrhLdI0l1FlimvUG8Y= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784014223; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=K8w9MhG11Sg/3XvS5/wrYdwpT8uCxyGYK1UPeCsrLm0=; b=Xt+pF2sPnMviRYnqALO9tEvYC+/cpREbjHHe/9iI0laIWOwmI0zf/GYYCG1Hjl15jpr8AwcPwx7t3n7C4rYTxYZHqCug2SP65mCzRre3bbG+nn4Y239Uf+EIHKyl9cLb+5Lh1xIZ90uTbAHvnUDIvZvb33oxffqfBOOWHLW4qFw= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=aspeedtech.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 178401422317620.50676165756522; Tue, 14 Jul 2026 00:30:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wjXZy-0005n2-V6; Tue, 14 Jul 2026 03:29:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wjXZy-0005mf-Bs; Tue, 14 Jul 2026 03:29:22 -0400 Received: from mail-japaneastazlp170130007.outbound.protection.outlook.com ([2a01:111:f403:c405::7] helo=TYDPR03CU002.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wjXZw-0006VZ-H3; Tue, 14 Jul 2026 03:29:22 -0400 Received: from TYZPR06MB4980.apcprd06.prod.outlook.com (2603:1096:400:1cc::10) by SEZPR06MB6117.apcprd06.prod.outlook.com (2603:1096:101:f3::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.202.18; Tue, 14 Jul 2026 07:29:07 +0000 Received: from TYZPR06MB4980.apcprd06.prod.outlook.com ([fe80::ea8a:7cb7:4822:2fb3]) by TYZPR06MB4980.apcprd06.prod.outlook.com ([fe80::ea8a:7cb7:4822:2fb3%6]) with mapi id 15.21.0202.014; Tue, 14 Jul 2026 07:29:07 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uuwk1DMbckP6lQ6y+J5RnmvWguTCEupZSxbsWy2eSjL9txPCHBEMrFGGHS3EZUEbWeGV0Bw1kLDyzcW+BMVaZhGXnh0fITwyz5HJCS/LXrIjyLs4rWwCuaj+tvTP7aQXRMbAUiyQrk+kir6pV2nDJD97q4E9WLCVPnQJda1YmuoUIzO43q7VpMTG2JAfTmH6D4ZQGwGd5SIvhBTQNcUnUAF1a6qSaXf9fTE36qYOnlyX3nOqN8C8yfpEGEjMq67/REH618YrZk5hh7QpLGoZ+m2EJrd3AQ2uLkFDIODMU7EvDjW3CUTUoZSnQxkeENqkp7/IJpN0qihKmStyjPC3CQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=K8w9MhG11Sg/3XvS5/wrYdwpT8uCxyGYK1UPeCsrLm0=; b=VVwTtkK6nJZFqYMfpTUFzC4lJIwQer4cvJd13jdMjCn22lmCixnMdgtd9pUXX3EeswY43Ffje8WCilHOcIn/0wh4v+6XfmK/fkOF/EpwEPrV8KTYTouc7vFaxzdtnbMMK2d4L1FmXjL+oUsRhREupTTtO+qPHXvlOyID03365IiSMc0I2mBzEgrUtRSClGVe+v1pboqKf0NhUSBMzBtgD9MpVRmkvCTMWJpoAU14MuhjFngfiPdEHDrHF1maZng20DnXVDvb2v3ZGWOvH1Xkrph4nSr5HV/yxk1bPplIsQV0pwCIyfXabnBFfrLKvUFeVygH5REBpBptYOlY9iJjUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=aspeedtech.com; dmarc=pass action=none header.from=aspeedtech.com; dkim=pass header.d=aspeedtech.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aspeedtech.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=K8w9MhG11Sg/3XvS5/wrYdwpT8uCxyGYK1UPeCsrLm0=; b=g2Ms/S6vKrWvcgMVwNeeI9SlrbAEbvLWuWpWyO4nsYndH1Nx1l89bthLiXJpQfYn9HLlY4D7aB57gXh5AQj/tG7frolkG/npi2CVg6cW3smOAaP/9Ya8dSen33VbigCxijurs9gK22YV2SYoMrHtPdfpANy2VfJIHkIRB/Mq6K1XYKZN+od6qRpRPfE4E+hKJB35EGZltLDjIC8vj3wKnQQ3lvKnsw9iIPZEypHGBv5OvM+LI6cvDLDj/gKWGKLixJM6Ktr/qkVCjsZf5hV+hjsx+/8rQkXoKA++vQsZ/bnwCvY/IM7O5OrJ/+fiysxOlIiyQNtYn7sqRom5yEwAlQ== From: Jamin Lin To: =?iso-8859-1?Q?Daniel_P=2E_Berrang=E9?= , =?iso-8859-1?Q?C=E9dric_Le_Goater?= , Peter Maydell , Steven Lee , Troy Lee , Kane Chen , Andrew Jeffery , Joel Stanley , Eric Blake , Markus Armbruster , Fabiano Rosas , Laurent Vivier , Paolo Bonzini , "open list:All patches CC here" , "open list:ASPEED BMCs" CC: Jamin Lin , Troy Lee Subject: [PATCH v1 04/15] hw/misc/aspeed_hace: Support the CTR mode for the crypto command Thread-Topic: [PATCH v1 04/15] hw/misc/aspeed_hace: Support the CTR mode for the crypto command Thread-Index: AQHdE2J0ntHAR2TdNUOCTUkdS2OGrQ== Date: Tue, 14 Jul 2026 07:29:07 +0000 Message-ID: <20260714072900.3023742-5-jamin_lin@aspeedtech.com> References: <20260714072900.3023742-1-jamin_lin@aspeedtech.com> In-Reply-To: <20260714072900.3023742-1-jamin_lin@aspeedtech.com> Accept-Language: zh-TW, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=aspeedtech.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: TYZPR06MB4980:EE_|SEZPR06MB6117:EE_ x-ms-office365-filtering-correlation-id: c42894c5-c2b9-479a-f092-08dee1799714 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230040|366016|23010399003|7416014|376014|1800799024|921020|38070700021|3023799007|18002099003|22082099003|56012099006; x-microsoft-antispam-message-info: kgUye6yvR1OC5PrWzuu3jaDF1mwTKgeZ4xm7kg2w0i+z2Dx4E83t4elyd0dhEKKLnc9DTOvWCmf2k290E6VQgD+VE8jbM+RF0hV9zf5UkE6uuMw2qTOQw6E9xjlljx6JKjt4HsBcQF1V0T4UI+k7FX6QAHD6ytOB6295Gc7PgyCkJwR6NSJuZ7ecMad7Kei5cPGT3T39qJFZHO8EZ0JIa3tRpYLAb74kTZydseEktL8/F/pSy3mStXv98+CwjK3NvaI0hSsXH/FwE5rhUXTX/bhzgpo88nqOM8JXHlMcKLhn+wJJsxqf5yh38GgabYN3YiumkiUlJcqJcBbjipCLuKhILixdUSTsKo5CaGJ9UO3jOUVJz/2ArJyKkamVAWL2Liq65zpRAURJfPqC1ZX6ownJsk2UHIq3czsb8QmhW2SnAzfFzKbCpW3P60EwNIqGT96uK2GpWQT0KEv/KqgEO88NFZKMHRwUT0+/zpkmJGMypN9mvmSoKehI4m6/2lNLEVAsC39U8mZNMK61T5X3/4i86+tbhilMz8uBZGG63teADGYZ/L8omR1H5nvGAXodZzEK/TNtRJYrxKVuq5BxDpMcunSWcP7BpoXbQA2vxRezeWPFpnjq0FlplsNjcQVzXt4cjxa0XqpstqLZrWyUCc4SXtsOIY48Oy9rgfV8rBEng1BaIRYOLbYwDwSv4PXLzikBSzrARYpKuNkgdXJGjPFsM3dKR2vQIU4/KoY6TKqJXK7QIYlX1qFP0211rqrZ x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TYZPR06MB4980.apcprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(23010399003)(7416014)(376014)(1800799024)(921020)(38070700021)(3023799007)(18002099003)(22082099003)(56012099006); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?c+TLNhodiyTZ43zeWiZrK9eD3S9tLQ5FcoQxHtf+gqzyrMsk4g1Lfu6qe9?= =?iso-8859-1?Q?kOu6Na+KomiIj/Iu63AxBpveW6cO8QD/p1EcqxXbPlqOEwppWxOsxRJLAy?= =?iso-8859-1?Q?mzrPhfxF+iFByxUQr2wg6ZkUUXs5GpeLpCgLFQwRgrpgmOY3WCAYFRM1iM?= =?iso-8859-1?Q?O9gJSMXCM2wZ4adGByZX2MHDU3WKm1RGnAOFD0N38mpaXGvf0OSRaA3h12?= =?iso-8859-1?Q?F/qgp5aKX7HVlTiOx1qac2mnF6pHAclw2Q/p4fld8dUi5gTmkp4E0D4mWV?= =?iso-8859-1?Q?PJvEEUaRiQ9N68ssgcuffh1f9Xbce59OXHZjsNi/8Z1vlJuKjPDm0yjjr8?= =?iso-8859-1?Q?2eSmErgO/Oo0/Yqvnr12jy2oGdURyTj4eNeO+DgGsN/bPZCagTu3VQJKVw?= =?iso-8859-1?Q?c2TJ+JsprI6Tgu76AIgJvN6NsIPoEKP2oMuovndia79fEHqvgn/RDSNzkk?= =?iso-8859-1?Q?d4HtoE5ZHbpDjoc4d7k61Iv6Ex2aujYeUhb9yfG3Og07c7FY3TzJEhf4bo?= =?iso-8859-1?Q?wjGvHcvhcEt0UcYsnkmxz37K49S9/SpXjaICdEhX4rOz8YH2G+M0+S4Poq?= =?iso-8859-1?Q?SIOgOiAYQQLnjQSM9bUDJrlPC0YUNglWxV+U+o7nbFAtljKgAOpF8As28k?= =?iso-8859-1?Q?+HVz/z8HmyR4ixjtgEpk2sY5hcc3uMR8jJKGwBrtbKy5FMZn4CwQKQ+DpL?= =?iso-8859-1?Q?loPJveMd5Mr4fyMAHS4UFvj13WvnAXUcZ9aWNKLJcXzQrRX19ZK+GBHisX?= =?iso-8859-1?Q?b/96hPZuHPjKGyrI9yPFzZQ/bdml7iZ+TGnRlWwvSlpPmFsH7iuySAMfYy?= =?iso-8859-1?Q?xW3meNyWLO75cU4hr7vopnZv5a/NWknpOx/b5r1qyCUoy4HfLCLMoqb+wi?= =?iso-8859-1?Q?CFP26ziMAs0DMo+DK8Yh2vYT2PeGm5a7teXz9ZHuaOfSLGFLahF8+Nh1U8?= =?iso-8859-1?Q?t51nitc0G9Di85vDqKV+40a9AXzABlDRZzJOino4t+ZuZRN9GSRt6VItWw?= =?iso-8859-1?Q?7CEge3UOemdF6gS0dJyAnxkjJPD9pSJ1Q1Szjk1ptT5rZBNOW/WyYxoU5U?= =?iso-8859-1?Q?iMzATrX9TMXINkx7jA85tuygHemnoi/jQ4yr8PGCK8aUTiqe4UpPVFHDNc?= =?iso-8859-1?Q?FC3Xev1VW5cXkW51Jvd9i9eNwWBNtrN2KVfc6GCNuXNjGwGDLb3Ust9MQm?= =?iso-8859-1?Q?5iF3hDaFCfGhN6QWlHQi1lhAy2nJ3AE1QCQtbM2bkFDUbIpWtHYTQVI/Bv?= =?iso-8859-1?Q?roc+fqWV6a54bK7wJ4kjMxbTRBzc1oaoCjPywuQGzCVpIGEpFWkAVyG5Bz?= =?iso-8859-1?Q?4o82mxe5kDqAVb6EO9xY2R/0sPdxCtJ/0mObqS/eLD0tJW+TRmvUhhgjSw?= =?iso-8859-1?Q?47FkdBnZoEkWwd96JBDPRW8RJD/OlY3XiOrb2gjDRjfZBwpTl7gXJvNyvW?= =?iso-8859-1?Q?czR2UPPlNicKRYiiT5g7mqLhWl169KKxyRdMX/M2vML571j/A+gEEHD0Tc?= =?iso-8859-1?Q?8bpW3xeCz4qEXLB2PzkEou5pX8vrd/P+V6Mv4GnD6xAf9df2L2CzvCtmtd?= =?iso-8859-1?Q?KgnCsifYC7qXTdc26ZnsmrjzlF0mCvdBig/1qJir7VmtMjZjoXoktUH99L?= =?iso-8859-1?Q?cuNDm6fsEjUJVVth2mNx5FHz8uyMyPXAj0W/i5IGJNujdubZ9OEIIMHCJ2?= =?iso-8859-1?Q?KAFJDYPFO9Yni61kfYtMg8hayW5gxR8V7PErnWRcBA70QAdfRD0M2KYzeS?= =?iso-8859-1?Q?gA0Mt4KMIpFxpzh/rjiOHx/U5b2BlT201BvtFWHwpWSiBs1eOffi3T8vAT?= =?iso-8859-1?Q?xRLGXGzGXQ=3D=3D?= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Exchange-RoutingPolicyChecked: GPbLJZEBHw8agm2bjkEdqLLFcMVjnRhsuzQ57+cPgN1DSWeH/bnzrIkBy3oGz/bdetrN7L06ROceCYA6T8FWVdAdmLq0hM91Ov7lMKYdMYQIMkCTqMmLTtIOMz4MDpELVaL3tn5ZrfRYrxG+TEmIJjBpd0xgAgQrJmKHtuwv1z37cBJNCUFoZtquZe0JHBvl9ODyrArMwy5rxrQjzAXDHHDYhdjOEzFY+8dwWJye6jKrHVB8sQIGioD/yajxoi8E3LsKjd4BINV0a1t+Rxj7xieqG5G6oLNauSk6fAqNo2PWgbvL7c2E6YGKx7SQEqpZei2KUQxw2Fvv/tXzmJfr1Q== X-OriginatorOrg: aspeedtech.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TYZPR06MB4980.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c42894c5-c2b9-479a-f092-08dee1799714 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Jul 2026 07:29:07.4804 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 43d4aa98-e35b-4575-8939-080e90d5a249 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: CUEFZBDkfMRh2VpVtD40ksROYxKOinKyH72V57AdFVOg9rxOFkVTHi8q8N0RglJbaiGc4VWT+j0DJu8OBGItfMC/5CQVqYMu4kEdYfkRPBU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEZPR06MB6117 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a01:111:f403:c405::7; envelope-from=jamin_lin@aspeedtech.com; helo=TYDPR03CU002.outbound.protection.outlook.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 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @aspeedtech.com) X-ZM-MESSAGEID: 1784014224797158500 Content-Type: text/plain; charset="utf-8" The AST2600, AST1030 and later crypto engines add AES/DES/3DES CTR mode (HACE10[6:4] =3D 0b100) on top of the ECB/CBC modes shared with the AST2500. Decode the CTR selection, round the working buffers up to a whole block so the stream-like final block is still processed a block at a time, and write the counter advanced by the number of blocks consumed back to the context buffer so the driver can continue across requests. Signed-off-by: Jamin Lin --- hw/misc/aspeed_hace.c | 50 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/hw/misc/aspeed_hace.c b/hw/misc/aspeed_hace.c index 59eb1aeae3..b7a7c0b7ff 100644 --- a/hw/misc/aspeed_hace.c +++ b/hw/misc/aspeed_hace.c @@ -42,6 +42,7 @@ #define CRYPT_CMD_OP_MODE_MASK (0x7 << 4) #define CRYPT_CMD_ECB (0x0 << 4) #define CRYPT_CMD_CBC (0x1 << 4) +#define CRYPT_CMD_CTR (0x4 << 4) /* AES key length HACE10[3:2] */ #define CRYPT_CMD_AES_KEY_LEN_MASK (0x3 << 2) #define CRYPT_CMD_AES256 (0x2 << 2) @@ -589,6 +590,9 @@ static bool crypt_decode_cmd(uint32_t cmd, QCryptoCiphe= rAlgo *alg, case CRYPT_CMD_CBC: *mode =3D QCRYPTO_CIPHER_MODE_CBC; break; + case CRYPT_CMD_CTR: + *mode =3D QCRYPTO_CIPHER_MODE_CTR; + break; default: return false; } @@ -652,6 +656,22 @@ static bool crypt_prepare_sg(AspeedHACEState *s, uint6= 4_t addr, return copied =3D=3D len; } =20 +/* + * Add @add to the big-endian counter block @ctr (@len bytes) in place, so= the + * CTR mode counter can be advanced by the number of blocks just consumed. + */ +static void crypt_be_add(uint8_t *ctr, size_t len, uint64_t add) +{ + size_t i =3D len; + + while (i > 0 && add) { + i--; + add +=3D ctr[i]; + ctr[i] =3D add & 0xff; + add >>=3D 8; + } +} + /* * Perform an AES/DES/3DES ECB/CBC operation. The source and destination a= re * either single contiguous buffers (direct access mode) or scatter-gather @@ -677,6 +697,7 @@ static void do_crypt_operation(AspeedHACEState *s, uint= 32_t cmd) uint64_t dst_addr; size_t iv_offset; size_t blocklen; + size_t buf_len; size_t keylen; bool status; =20 @@ -722,8 +743,14 @@ static void do_crypt_operation(AspeedHACEState *s, uin= t32_t cmd) return; } =20 - src_buf =3D g_malloc0(len); - dst_buf =3D g_malloc0(len); + /* + * Round the working buffers up to a whole block. Block modes are alre= ady + * block-aligned; the stream-like CTR mode may leave a partial final b= lock + * that the engine still processes a full block at a time. + */ + buf_len =3D QEMU_ALIGN_UP(len, blocklen); + src_buf =3D g_malloc0(buf_len); + dst_buf =3D g_malloc0(buf_len); =20 /* Gather the source into the bounce buffer, per the selected mode. */ src_addr =3D s->regs[R_CRYPT_SRC]; @@ -744,7 +771,7 @@ static void do_crypt_operation(AspeedHACEState *s, uint= 32_t cmd) } =20 if (encrypt) { - if (qcrypto_cipher_encrypt(cipher, src_buf, dst_buf, len, + if (qcrypto_cipher_encrypt(cipher, src_buf, dst_buf, buf_len, &local_err) < 0) { qemu_log_mask(LOG_GUEST_ERROR, "%s: encrypt failed: %s\n", __func__, error_get_pretty(local_err)); @@ -752,7 +779,7 @@ static void do_crypt_operation(AspeedHACEState *s, uint= 32_t cmd) return; } } else { - if (qcrypto_cipher_decrypt(cipher, src_buf, dst_buf, len, + if (qcrypto_cipher_decrypt(cipher, src_buf, dst_buf, buf_len, &local_err) < 0) { qemu_log_mask(LOG_GUEST_ERROR, "%s: decrypt failed: %s\n", __func__, error_get_pretty(local_err)); @@ -785,13 +812,26 @@ static void do_crypt_operation(AspeedHACEState *s, ui= nt32_t cmd) * output when encrypting, or of the input when decrypting. Write = it * back as the IV for the next request. */ - next_iv =3D (encrypt ? dst_buf : src_buf) + len - blocklen; + next_iv =3D (encrypt ? dst_buf : src_buf) + buf_len - blocklen; if (address_space_write(&s->dram_as, ctx_addr + iv_offset, MEMTXATTRS_UNSPECIFIED, next_iv, blocklen)= ) { qemu_log_mask(LOG_GUEST_ERROR, "%s: Failed to write IV, addr=3D0x%" HWADDR_PRIx= "\n", __func__, ctx_addr + iv_offset); } + } else if (mode =3D=3D QCRYPTO_CIPHER_MODE_CTR) { + /* + * CTR chains on the counter, which advances by one per block. Add= the + * number of blocks processed (buf_len / blocklen) and write it ba= ck. + */ + crypt_be_add(ctx + iv_offset, blocklen, buf_len / blocklen); + if (address_space_write(&s->dram_as, ctx_addr + iv_offset, + MEMTXATTRS_UNSPECIFIED, ctx + iv_offset, + blocklen)) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Failed to write IV, addr=3D0x%" HWADDR_PRIx= "\n", + __func__, ctx_addr + iv_offset); + } } } =20 --=20 2.43.0