From nobody Sat Nov 15 22:24:45 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1747117839; cv=none; d=zohomail.com; s=zohoarc; b=m86G/YvQtPCMNbPEA+6Hur1rC0FfD5YARGaabXzNDnokSGP5bSM16EAzysk/SEkVHmJ7l13hASJsPZEVJXB8Y/o15zTtHVXTapWOhOAlxPO2EfS9JVnOWt3ZUJnaSQV91EDv34VIzanvOCdPy0cxIL7wr70UEA1MVdZBTI1xVY0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747117839; 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:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=CFg1lY5UmgzSfDhHpCIrqkRb/0g/8tb+bSiMXdtO//U=; b=WcmZPDxWZy6Ag9xC13aynGdJABmAa6vQxGIZwyFG18Iy2uEkv+Ss+q3k1YPbe4wQpsN7EoplkXe5vqL7m0DjkuKBoj4lBMv/JTb5xMFIaoPTKc4lX6T6iRbWj7BiwIH2InJt0lO1u8Yc4cwXPvlwlZv1rU+IfxvgGQVNOBYeoK4= ARC-Authentication-Results: i=1; mx.zohomail.com; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17471178389562.088626104388709; Mon, 12 May 2025 23:30:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEj9H-0002yK-U7; Tue, 13 May 2025 02:29:55 -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 1uEj9G-0002vS-9B; Tue, 13 May 2025 02:29:54 -0400 Received: from mail.aspeedtech.com ([211.20.114.72] helo=TWMBX01.aspeed.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uEj9E-0001me-Bt; Tue, 13 May 2025 02:29:53 -0400 Received: from TWMBX01.aspeed.com (192.168.0.62) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1748.10; Tue, 13 May 2025 14:29:03 +0800 Received: from mail.aspeedtech.com (192.168.10.10) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server id 15.2.1748.10 via Frontend Transport; Tue, 13 May 2025 14:29:03 +0800 To: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Peter Maydell , Steven Lee , Troy Lee , Andrew Jeffery , "Joel Stanley" , Fabiano Rosas , Laurent Vivier , Paolo Bonzini , "open list:ASPEED BMCs" , "open list:All patches CC here" CC: , Subject: [PATCH v2 04/25] hw/misc/aspeed_hace: Refactor hash buffer setup into helper functions for clarity Date: Tue, 13 May 2025 14:28:34 +0800 Message-ID: <20250513062901.2256865-5-jamin_lin@aspeedtech.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250513062901.2256865-1-jamin_lin@aspeedtech.com> References: <20250513062901.2256865-1-jamin_lin@aspeedtech.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=lists.gnu.org; Received-SPF: pass client-ip=211.20.114.72; envelope-from=jamin_lin@aspeedtech.com; helo=TWMBX01.aspeed.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_FAIL=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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Jamin Lin From: Jamin Lin via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1747117841617019000 Content-Type: text/plain; charset="utf-8" To improve code readability and maintainability, this commit refactors the = hash buffer preparation logic from "do_hash_operation()" into two helper functio= ns: - "hash_prepare_direct_iov()": handles non-scatter-gather (direct) mode. - "hash_prepare_sg_iov()": handles scatter-gather mode with accumulation and padding detection support No functional changes are introduced. Signed-off-by: Jamin Lin --- hw/misc/aspeed_hace.c | 153 ++++++++++++++++++++++++++---------------- 1 file changed, 95 insertions(+), 58 deletions(-) diff --git a/hw/misc/aspeed_hace.c b/hw/misc/aspeed_hace.c index 1256926d22..22eea62693 100644 --- a/hw/misc/aspeed_hace.c +++ b/hw/misc/aspeed_hace.c @@ -142,6 +142,92 @@ static bool has_padding(AspeedHACEState *s, struct iov= ec *iov, return false; } =20 +static int hash_prepare_direct_iov(AspeedHACEState *s, struct iovec *iov) +{ + uint32_t src; + void *haddr; + hwaddr plen; + int iov_idx; + + plen =3D s->regs[R_HASH_SRC_LEN]; + src =3D s->regs[R_HASH_SRC]; + haddr =3D address_space_map(&s->dram_as, src, &plen, false, + MEMTXATTRS_UNSPECIFIED); + if (haddr =3D=3D NULL) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Unable to map address, addr=3D0x%x, " + "plen=3D0x%" HWADDR_PRIx "\n", + __func__, src, plen); + return -1; + } + + iov[0].iov_base =3D haddr; + iov[0].iov_len =3D plen; + iov_idx =3D 1; + + return iov_idx; +} + +static int hash_prepare_sg_iov(AspeedHACEState *s, struct iovec *iov, + bool acc_mode, bool *acc_final_request) +{ + uint32_t total_msg_len; + uint32_t pad_offset; + uint32_t len =3D 0; + uint32_t sg_addr; + uint32_t src; + int iov_idx; + hwaddr plen; + void *haddr; + + for (iov_idx =3D 0; !(len & SG_LIST_LEN_LAST); iov_idx++) { + if (iov_idx =3D=3D ASPEED_HACE_MAX_SG) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Failed to set end of sg list marker\n", + __func__); + return -1; + } + + src =3D s->regs[R_HASH_SRC] + (iov_idx * SG_LIST_ENTRY_SIZE); + + len =3D address_space_ldl_le(&s->dram_as, src, + MEMTXATTRS_UNSPECIFIED, NULL); + sg_addr =3D address_space_ldl_le(&s->dram_as, src + SG_LIST_LEN_SI= ZE, + MEMTXATTRS_UNSPECIFIED, NULL); + sg_addr &=3D SG_LIST_ADDR_MASK; + + plen =3D len & SG_LIST_LEN_MASK; + haddr =3D address_space_map(&s->dram_as, sg_addr, &plen, false, + MEMTXATTRS_UNSPECIFIED); + + if (haddr =3D=3D NULL) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Unable to map address, sg_addr=3D0x%x, " + "plen=3D0x%" HWADDR_PRIx "\n", + __func__, sg_addr, plen); + return -1; + } + + iov[iov_idx].iov_base =3D haddr; + if (acc_mode) { + s->total_req_len +=3D plen; + + if (has_padding(s, &iov[iov_idx], plen, &total_msg_len, + &pad_offset)) { + /* Padding being present indicates the final request */ + *acc_final_request =3D true; + iov[iov_idx].iov_len =3D pad_offset; + } else { + iov[iov_idx].iov_len =3D plen; + } + } else { + iov[iov_idx].iov_len =3D plen; + } + } + + return iov_idx; +} + static void do_hash_operation(AspeedHACEState *s, int algo, bool sg_mode, bool acc_mode) { @@ -149,15 +235,8 @@ static void do_hash_operation(AspeedHACEState *s, int = algo, bool sg_mode, struct iovec iov[ASPEED_HACE_MAX_SG]; bool acc_final_request =3D false; Error *local_err =3D NULL; - uint32_t total_msg_len; size_t digest_len =3D 0; - uint32_t sg_addr =3D 0; - uint32_t pad_offset; - int iov_idx =3D 0; - uint32_t len =3D 0; - uint32_t src =3D 0; - void *haddr; - hwaddr plen; + int iov_idx =3D -1; =20 if (acc_mode && s->hash_ctx =3D=3D NULL) { s->hash_ctx =3D qcrypto_hash_new(algo, &local_err); @@ -169,59 +248,17 @@ static void do_hash_operation(AspeedHACEState *s, int= algo, bool sg_mode, } } =20 + /* Prepares the iov for hashing operations based on the selected mode = */ if (sg_mode) { - for (iov_idx =3D 0; !(len & SG_LIST_LEN_LAST); iov_idx++) { - if (iov_idx =3D=3D ASPEED_HACE_MAX_SG) { - qemu_log_mask(LOG_GUEST_ERROR, - "aspeed_hace: guest failed to set end of sg list m= arker\n"); - break; - } - - src =3D s->regs[R_HASH_SRC] + (iov_idx * SG_LIST_ENTRY_SIZE); - - len =3D address_space_ldl_le(&s->dram_as, src, - MEMTXATTRS_UNSPECIFIED, NULL); - - sg_addr =3D address_space_ldl_le(&s->dram_as, src + SG_LIST_LE= N_SIZE, - MEMTXATTRS_UNSPECIFIED, NULL); - sg_addr &=3D SG_LIST_ADDR_MASK; - - plen =3D len & SG_LIST_LEN_MASK; - haddr =3D address_space_map(&s->dram_as, sg_addr, &plen, false, - MEMTXATTRS_UNSPECIFIED); - if (haddr =3D=3D NULL) { - qemu_log_mask(LOG_GUEST_ERROR, - "%s: qcrypto failed\n", __func__); - return; - } - iov[iov_idx].iov_base =3D haddr; - if (acc_mode) { - s->total_req_len +=3D plen; - - if (has_padding(s, &iov[iov_idx], plen, &total_msg_len, - &pad_offset)) { - /* Padding being present indicates the final request */ - acc_final_request =3D true; - iov[iov_idx].iov_len =3D pad_offset; - } else { - iov[iov_idx].iov_len =3D plen; - } - } else { - iov[iov_idx].iov_len =3D plen; - } - } + iov_idx =3D hash_prepare_sg_iov(s, iov, acc_mode, &acc_final_reque= st); } else { - plen =3D s->regs[R_HASH_SRC_LEN]; + iov_idx =3D hash_prepare_direct_iov(s, iov); + } =20 - haddr =3D address_space_map(&s->dram_as, s->regs[R_HASH_SRC], - &plen, false, MEMTXATTRS_UNSPECIFIED); - if (haddr =3D=3D NULL) { - qemu_log_mask(LOG_GUEST_ERROR, "%s: qcrypto failed\n", __func_= _); - return; - } - iov[0].iov_base =3D haddr; - iov[0].iov_len =3D plen; - iov_idx =3D 1; + if (iov_idx <=3D 0) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Failed to prepare iov\n", __func__); + return; } =20 if (acc_mode) { --=20 2.43.0