From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a17:505:bc8:b0:1be9:327d:8ee3 with SMTP id pe8csp1691131njb; Thu, 15 May 2025 01:11:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUl6yNZJWx7qpkUvdx5HDk827VvKKs2oaJQ1o4Jqx4NcUqpnoLlrdxFrOke+PBgd84sSCuErIEmdp0+AA==@linaro.org X-Google-Smtp-Source: AGHT+IFqOCHgLAayyM2Y2mKrR2iKqTPqqY4ikj8aNaZ2435Po2C8lpQF8JFPbTDpEI4yQBuwrLJk X-Received: by 2002:a05:6214:519b:b0:6e6:6c39:cb71 with SMTP id 6a1803df08f44-6f896ef6c59mr88677776d6.45.1747296686434; Thu, 15 May 2025 01:11:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747296686; cv=none; d=google.com; s=arc-20240605; b=eiavt8AL17MPdbbuWZDVyo1lh13zl6qlvzGLv6dD4uDnUl3hr9rL55IwtC5X/6wODR vOZeSislaO8tuM61cHZoOMzqbcAFAfxyD81HUqTewGcEG8ZhYR0NO74ClWRqozln67QJ 5BRaEYH3eQrwrnWf3zsHjQ15ocwo7ujDnLRYb6grKjwYSg9RbAa4jmneLt+w+WCZyfCz miceRvAcHiYfotAkDQ1w15f2EW4nWkbIzr0D+iy9e+jPIwetgtSKtWki6ufH81nHZvC9 Gi8piitCT/2GJibAFRdpd/JjDPeb1gqFkxBKOfn6cMREzzvBSGyDAURc8kGcPrDPmm8F B3mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:from:reply-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; bh=V/me/UF1CQriit9GnU0VNyL+PailNiTnAVcjse4lq18=; fh=XVCbtZt0NlM3WRi/g+G2SrIUzl8hrRaPGDpFr//3vj8=; b=LcjSuomQrHzG/EBjfhD/Kc2R3dZIuPp10LjNVaboPdrGE6m0X8g9Y4JqFP3u3yO3Ah 3eSzpVNnbL/Kx37OrVSbYZjKNUH16bTvJql814J1bqLlbVgkxn3DrOhqRyKa58VaEC+g XYbf7u6PxU+nQPBh8TIybKebG2vm6Q/DkLPHkp4rDmcP3EaXVJSHchmB0vs/q5I0Uej+ ubXdD94duOEkIDWSYj+AwRR0HOnz7p+vQEk3HHuqy/rZxHhj8KFHpoSlTik/n+Co7t+f ZrX9jBIAR3rdam3kFWasTH8EyTXX9TE1h+C/plzkfzKKrwnfvMTFl4MuuCS0LIVpjbzG CPzg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f6e3a42e50si151165216d6.227.2025.05.15.01.11.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 01:11:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nongnu.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFTg3-0003VS-4D; Thu, 15 May 2025 04:10:54 -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 1uFTfm-000336-MA; Thu, 15 May 2025 04:10:36 -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 1uFTfj-00010V-Sw; Thu, 15 May 2025 04:10:33 -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; Thu, 15 May 2025 16:10:09 +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; Thu, 15 May 2025 16:10:09 +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 v3 04/28] hw/misc/aspeed_hace: Extract direct mode hash buffer setup into helper function Date: Thu, 15 May 2025 16:09:36 +0800 Message-ID: <20250515081008.583578-5-jamin_lin@aspeedtech.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515081008.583578-1-jamin_lin@aspeedtech.com> References: <20250515081008.583578-1-jamin_lin@aspeedtech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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+alex.bennee=linaro.org@nongnu.org Sender: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: apX/Kl+wdQhy To improve code readability and maintainability of do_hash_operation(), this commit introduces a new helper function: hash_prepare_direct_iov(). This function encapsulates the logic for setting up the I/O vector (iov) in direct mode (non-scatter-gather). No functional changes are introduced. Signed-off-by: Jamin Lin --- hw/misc/aspeed_hace.c | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/hw/misc/aspeed_hace.c b/hw/misc/aspeed_hace.c index 1256926d22..42c6f29f82 100644 --- a/hw/misc/aspeed_hace.c +++ b/hw/misc/aspeed_hace.c @@ -142,6 +142,31 @@ static bool has_padding(AspeedHACEState *s, struct iovec *iov, return false; } +static int hash_prepare_direct_iov(AspeedHACEState *s, struct iovec *iov) +{ + uint32_t src; + void *haddr; + hwaddr plen; + int iov_idx; + + plen = s->regs[R_HASH_SRC_LEN]; + src = s->regs[R_HASH_SRC]; + haddr = address_space_map(&s->dram_as, src, &plen, false, + MEMTXATTRS_UNSPECIFIED); + if (haddr == NULL) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Unable to map address, addr=0x%x, " + "plen=0x%" HWADDR_PRIx "\n", + __func__, src, plen); + return -1; + } + + iov[0].iov_base = haddr; + iov[0].iov_len = plen; + iov_idx = 1; + + return iov_idx; +} static void do_hash_operation(AspeedHACEState *s, int algo, bool sg_mode, bool acc_mode) { @@ -169,6 +194,7 @@ static void do_hash_operation(AspeedHACEState *s, int algo, bool sg_mode, } } + /* Prepares the iov for hashing operations based on the selected mode */ if (sg_mode) { for (iov_idx = 0; !(len & SG_LIST_LEN_LAST); iov_idx++) { if (iov_idx == ASPEED_HACE_MAX_SG) { @@ -211,17 +237,13 @@ static void do_hash_operation(AspeedHACEState *s, int algo, bool sg_mode, } } } else { - plen = s->regs[R_HASH_SRC_LEN]; + iov_idx = hash_prepare_direct_iov(s, iov); + } - haddr = address_space_map(&s->dram_as, s->regs[R_HASH_SRC], - &plen, false, MEMTXATTRS_UNSPECIFIED); - if (haddr == NULL) { - qemu_log_mask(LOG_GUEST_ERROR, "%s: qcrypto failed\n", __func__); - return; - } - iov[0].iov_base = haddr; - iov[0].iov_len = plen; - iov_idx = 1; + if (iov_idx <= 0) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Failed to prepare iov\n", __func__); + return; } if (acc_mode) { -- 2.43.0