hw/misc/aspeed_hace: Extract SG-mode hash buffer setup into helper function

To improve code readability and maintainability of do_hash_operation(), this
commit introduces a new helper function: hash_prepare_sg_iov().

This function handles scatter-gather (SG) mode setup, including SG list
parsing, address mapping, and optional accumulation mode support with
padding detection.

No functional changes are introduced.

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Link: https://lore.kernel.org/qemu-devel/20250515081008.583578-6-jamin_lin@aspeedtech.com
Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
Jamin Lin 2025-05-15 16:09:37 +08:00 committed by Cédric Le Goater
parent 7328c48b57
commit 0b7dd5f991

View file

@ -167,6 +167,67 @@ static int hash_prepare_direct_iov(AspeedHACEState *s, struct iovec *iov)
return iov_idx; 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 = 0;
uint32_t sg_addr;
uint32_t src;
int iov_idx;
hwaddr plen;
void *haddr;
for (iov_idx = 0; !(len & SG_LIST_LEN_LAST); iov_idx++) {
if (iov_idx == ASPEED_HACE_MAX_SG) {
qemu_log_mask(LOG_GUEST_ERROR,
"%s: Failed to set end of sg list marker\n",
__func__);
return -1;
}
src = s->regs[R_HASH_SRC] + (iov_idx * SG_LIST_ENTRY_SIZE);
len = address_space_ldl_le(&s->dram_as, src,
MEMTXATTRS_UNSPECIFIED, NULL);
sg_addr = address_space_ldl_le(&s->dram_as, src + SG_LIST_LEN_SIZE,
MEMTXATTRS_UNSPECIFIED, NULL);
sg_addr &= SG_LIST_ADDR_MASK;
plen = len & SG_LIST_LEN_MASK;
haddr = address_space_map(&s->dram_as, sg_addr, &plen, false,
MEMTXATTRS_UNSPECIFIED);
if (haddr == NULL) {
qemu_log_mask(LOG_GUEST_ERROR,
"%s: Unable to map address, sg_addr=0x%x, "
"plen=0x%" HWADDR_PRIx "\n",
__func__, sg_addr, plen);
return -1;
}
iov[iov_idx].iov_base = haddr;
if (acc_mode) {
s->total_req_len += plen;
if (has_padding(s, &iov[iov_idx], plen, &total_msg_len,
&pad_offset)) {
/* Padding being present indicates the final request */
*acc_final_request = true;
iov[iov_idx].iov_len = pad_offset;
} else {
iov[iov_idx].iov_len = plen;
}
} else {
iov[iov_idx].iov_len = plen;
}
}
return iov_idx;
}
static void do_hash_operation(AspeedHACEState *s, int algo, bool sg_mode, static void do_hash_operation(AspeedHACEState *s, int algo, bool sg_mode,
bool acc_mode) bool acc_mode)
{ {
@ -174,15 +235,8 @@ static void do_hash_operation(AspeedHACEState *s, int algo, bool sg_mode,
struct iovec iov[ASPEED_HACE_MAX_SG]; struct iovec iov[ASPEED_HACE_MAX_SG];
bool acc_final_request = false; bool acc_final_request = false;
Error *local_err = NULL; Error *local_err = NULL;
uint32_t total_msg_len;
size_t digest_len = 0; size_t digest_len = 0;
uint32_t sg_addr = 0; int iov_idx = -1;
uint32_t pad_offset;
int iov_idx = 0;
uint32_t len = 0;
uint32_t src = 0;
void *haddr;
hwaddr plen;
if (acc_mode && s->hash_ctx == NULL) { if (acc_mode && s->hash_ctx == NULL) {
s->hash_ctx = qcrypto_hash_new(algo, &local_err); s->hash_ctx = qcrypto_hash_new(algo, &local_err);
@ -196,46 +250,7 @@ static void do_hash_operation(AspeedHACEState *s, int algo, bool sg_mode,
/* Prepares the iov for hashing operations based on the selected mode */ /* Prepares the iov for hashing operations based on the selected mode */
if (sg_mode) { if (sg_mode) {
for (iov_idx = 0; !(len & SG_LIST_LEN_LAST); iov_idx++) { iov_idx = hash_prepare_sg_iov(s, iov, acc_mode, &acc_final_request);
if (iov_idx == ASPEED_HACE_MAX_SG) {
qemu_log_mask(LOG_GUEST_ERROR,
"aspeed_hace: guest failed to set end of sg list marker\n");
break;
}
src = s->regs[R_HASH_SRC] + (iov_idx * SG_LIST_ENTRY_SIZE);
len = address_space_ldl_le(&s->dram_as, src,
MEMTXATTRS_UNSPECIFIED, NULL);
sg_addr = address_space_ldl_le(&s->dram_as, src + SG_LIST_LEN_SIZE,
MEMTXATTRS_UNSPECIFIED, NULL);
sg_addr &= SG_LIST_ADDR_MASK;
plen = len & SG_LIST_LEN_MASK;
haddr = address_space_map(&s->dram_as, sg_addr, &plen, false,
MEMTXATTRS_UNSPECIFIED);
if (haddr == NULL) {
qemu_log_mask(LOG_GUEST_ERROR,
"%s: qcrypto failed\n", __func__);
return;
}
iov[iov_idx].iov_base = haddr;
if (acc_mode) {
s->total_req_len += plen;
if (has_padding(s, &iov[iov_idx], plen, &total_msg_len,
&pad_offset)) {
/* Padding being present indicates the final request */
acc_final_request = true;
iov[iov_idx].iov_len = pad_offset;
} else {
iov[iov_idx].iov_len = plen;
}
} else {
iov[iov_idx].iov_len = plen;
}
}
} else { } else {
iov_idx = hash_prepare_direct_iov(s, iov); iov_idx = hash_prepare_direct_iov(s, iov);
} }