From nobody Sat Nov 15 22:24:46 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=1747117798; cv=none; d=zohomail.com; s=zohoarc; b=m8Ip+8iBTdDDR5Bsrj5zVDvU1idr7dnXdO16vKzEoBxro0SanBuJ20FsVQpzFcpB2BhB03fq42znRbph8d7fWzxGlKUIdDilgNwNEsfpAY7jEukaQjmbXU82iqOLAErlCnAG9P2Dtl/ZuD45NvUrnmrm4UoVqER1J4Yy/uJ00Ic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747117798; 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=4kPGix99Im5Hg5H8aZ8wIu5iNL/zHTNeuHO/5gWksKU=; b=ZeGVhP/dD4muBNkMr00xuSHR4cVhwj2XI8evS8ORgbZuDnUJvdc0CNr1SU24IydEgEzE4yNTFoijz4dYwuABAKVNGbpZ1l1ReLOyrwmmGIddvhHf11Qy2GynTXvlpvRv/xGYLhqtQHkiK9PEO3vvL1t+kD7jprVx9KJ6yTslViA= 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 1747117798865235.4660634841283; Mon, 12 May 2025 23:29:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEj95-0002Ih-MQ; Tue, 13 May 2025 02:29:43 -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 1uEj91-0002FU-LA; Tue, 13 May 2025 02:29:40 -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 1uEj8y-0001lC-UC; Tue, 13 May 2025 02:29:39 -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:02 +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:02 +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 02/25] hw/misc/aspeed_hace: Improve readability and consistency in variable naming Date: Tue, 13 May 2025 14:28:32 +0800 Message-ID: <20250513062901.2256865-3-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: 1747117801130116600 Content-Type: text/plain; charset="utf-8" Currently, users define multiple local variables within different if-statem= ents. To improve readability and maintain consistency in variable naming, rename = the variables accordingly. Introduced "sg_addr" to clearly indicate the scatter-gather mode buffer add= ress. Signed-off-by: Jamin Lin --- hw/misc/aspeed_hace.c | 67 +++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/hw/misc/aspeed_hace.c b/hw/misc/aspeed_hace.c index 9263739ea6..6be94963bc 100644 --- a/hw/misc/aspeed_hace.c +++ b/hw/misc/aspeed_hace.c @@ -145,15 +145,19 @@ static bool has_padding(AspeedHACEState *s, struct io= vec *iov, static void do_hash_operation(AspeedHACEState *s, int algo, bool sg_mode, bool acc_mode) { + g_autofree uint8_t *digest_buf =3D NULL; struct iovec iov[ASPEED_HACE_MAX_SG]; + bool acc_final_request =3D false; + Error *local_err =3D NULL; uint32_t total_msg_len; - uint32_t pad_offset; - g_autofree uint8_t *digest_buf =3D NULL; size_t digest_len =3D 0; - bool sg_acc_mode_final_request =3D false; - int i; + 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; - Error *local_err =3D NULL; + hwaddr plen; =20 if (acc_mode && s->hash_ctx =3D=3D NULL) { s->hash_ctx =3D qcrypto_hash_new(algo, &local_err); @@ -166,74 +170,69 @@ static void do_hash_operation(AspeedHACEState *s, int= algo, bool sg_mode, } =20 if (sg_mode) { - uint32_t len =3D 0; - - for (i =3D 0; !(len & SG_LIST_LEN_LAST); i++) { - uint32_t addr, src; - hwaddr plen; - - if (i =3D=3D ASPEED_HACE_MAX_SG) { + 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; } =20 - src =3D s->regs[R_HASH_SRC] + (i * SG_LIST_ENTRY_SIZE); + src =3D s->regs[R_HASH_SRC] + (iov_idx * SG_LIST_ENTRY_SIZE); =20 len =3D address_space_ldl_le(&s->dram_as, src, MEMTXATTRS_UNSPECIFIED, NULL); =20 - addr =3D address_space_ldl_le(&s->dram_as, src + SG_LIST_LEN_S= IZE, - MEMTXATTRS_UNSPECIFIED, NULL); - addr &=3D SG_LIST_ADDR_MASK; + 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; =20 plen =3D len & SG_LIST_LEN_MASK; - haddr =3D address_space_map(&s->dram_as, addr, &plen, false, + 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[i].iov_base =3D haddr; + iov[iov_idx].iov_base =3D haddr; if (acc_mode) { s->total_req_len +=3D plen; =20 - if (has_padding(s, &iov[i], plen, &total_msg_len, + if (has_padding(s, &iov[iov_idx], plen, &total_msg_len, &pad_offset)) { /* Padding being present indicates the final request */ - sg_acc_mode_final_request =3D true; - iov[i].iov_len =3D pad_offset; + acc_final_request =3D true; + iov[iov_idx].iov_len =3D pad_offset; } else { - iov[i].iov_len =3D plen; + iov[iov_idx].iov_len =3D plen; } } else { - iov[i].iov_len =3D plen; + iov[iov_idx].iov_len =3D plen; } } } else { - hwaddr len =3D s->regs[R_HASH_SRC_LEN]; + plen =3D s->regs[R_HASH_SRC_LEN]; =20 haddr =3D address_space_map(&s->dram_as, s->regs[R_HASH_SRC], - &len, false, MEMTXATTRS_UNSPECIFIED); + &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 len; - i =3D 1; + iov[0].iov_len =3D plen; + iov_idx =3D 1; } =20 if (acc_mode) { - if (qcrypto_hash_updatev(s->hash_ctx, iov, i, &local_err) < 0) { + if (qcrypto_hash_updatev(s->hash_ctx, iov, iov_idx, &local_err) < = 0) { qemu_log_mask(LOG_GUEST_ERROR, "qcrypto hash update failed : %= s", error_get_pretty(local_err)); error_free(local_err); return; } =20 - if (sg_acc_mode_final_request) { + if (acc_final_request) { if (qcrypto_hash_finalize_bytes(s->hash_ctx, &digest_buf, &digest_len, &local_err)) { qemu_log_mask(LOG_GUEST_ERROR, @@ -248,7 +247,7 @@ static void do_hash_operation(AspeedHACEState *s, int a= lgo, bool sg_mode, s->hash_ctx =3D NULL; s->total_req_len =3D 0; } - } else if (qcrypto_hash_bytesv(algo, iov, i, &digest_buf, + } else if (qcrypto_hash_bytesv(algo, iov, iov_idx, &digest_buf, &digest_len, &local_err) < 0) { qemu_log_mask(LOG_GUEST_ERROR, "qcrypto hash bytesv failed : %s", error_get_pretty(local_err)); @@ -263,10 +262,10 @@ static void do_hash_operation(AspeedHACEState *s, int= algo, bool sg_mode, "aspeed_hace: address space write failed\n"); } =20 - for (; i > 0; i--) { - address_space_unmap(&s->dram_as, iov[i - 1].iov_base, - iov[i - 1].iov_len, false, - iov[i - 1].iov_len); + for (; iov_idx > 0; iov_idx--) { + address_space_unmap(&s->dram_as, iov[iov_idx - 1].iov_base, + iov[iov_idx - 1].iov_len, false, + iov[iov_idx - 1].iov_len); } =20 /* --=20 2.43.0