From nobody Fri Apr 3 16:19:07 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1774356195; cv=none; d=zohomail.com; s=zohoarc; b=b6fPGvvh34LNgFodKSIZLBt6Y8h2e8Zxnle0xlfwLz4t+GnmbdgluGiLrOZZvkMTxJY5siq5TrUS0Z0WDM9VQfGZJigl71sXQpB1Hxxil2fW2pzEZ6pk7d7qygWtqT8eSGd5AEiTuVl/o1j1n0v0c9Z5VBk+aQQd2d5I7LrlhKo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774356195; 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=6gBa5K3V+qtZR6QTegkT3r6LkmYR3YJXebqVw6dgpDc=; b=HsdeHLQS7Hk5Z8K278Q/MfXDzQwXLr6cPLt302i9brrBBZHeNzKELmQdKWDrv4YqF6bDU4XJK+CO/6SWO6auKVXISqXppEDWbufA4gnfdzD8V0ASxSmok5AYMvPZ80mVHyuGZrZlHuG3VhSvpx0/WzFMfAfnkt4ZXKoeeh5z+CU= ARC-Authentication-Results: i=1; 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1774356195126216.15178844648528; Tue, 24 Mar 2026 05:43:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w515R-00081L-Op; Tue, 24 Mar 2026 08:42:21 -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 1w515E-0007y7-Qp for qemu-devel@nongnu.org; Tue, 24 Mar 2026 08:42:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w5159-0001SK-8B for qemu-devel@nongnu.org; Tue, 24 Mar 2026 08:42:08 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-190-27Rh2pjsMPaNbQ11HZxkQA-1; Tue, 24 Mar 2026 08:41:50 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4580F1955E80; Tue, 24 Mar 2026 12:41:49 +0000 (UTC) Received: from corto.redhat.com (unknown [10.45.224.24]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CE4351955D71; Tue, 24 Mar 2026 12:41:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774356113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6gBa5K3V+qtZR6QTegkT3r6LkmYR3YJXebqVw6dgpDc=; b=Vz8HGyZ1oq4WR9IWRnNkqpFmTTQeYMtae9ZFxjZVdnm3PoQ2VnhhuFudWnch6iFWk50OG5 2bZ8WvQL452itLqhQMiiwsXde8xdQvgn9qjY3lddbcS0hwUU3lMwCG3BJMMDDzY8EV0PX+ knwR0ZlYzR9u9f25xvSew+Ma76/NVHU= X-MC-Unique: 27Rh2pjsMPaNbQ11HZxkQA-1 X-Mimecast-MFC-AGG-ID: 27Rh2pjsMPaNbQ11HZxkQA_1774356109 From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Jamin Lin Subject: [PULL 4/5] hw/ssi/aspeed_smc: Convert mem ops to read/write_with_attrs for error handling Date: Tue, 24 Mar 2026 13:41:30 +0100 Message-ID: <20260324124131.1053711-5-clg@redhat.com> In-Reply-To: <20260324124131.1053711-1-clg@redhat.com> References: <20260324124131.1053711-1-clg@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=170.10.133.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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 @redhat.com) X-ZM-MESSAGEID: 1774356196365158500 Error conditions (invalid flash mode, unwritable flash) now return MEMTX_ERROR instead of silently succeeding or returning undefined values. This allows the memory subsystem to properly propagate transaction errors to the guest, improving QEMU reliability. Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3335 Reviewed-by: Jamin Lin Link: https://lore.kernel.org/qemu-devel/20260323125545.577653-2-clg@redhat= .com Signed-off-by: C=C3=A9dric Le Goater --- hw/ssi/aspeed_smc.c | 49 ++++++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index b9d5ecba2929..f0deeea996c3 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -493,17 +493,18 @@ static void aspeed_smc_flash_setup(AspeedSMCFlash *fl= , uint32_t addr) } } =20 -static uint64_t aspeed_smc_flash_read(void *opaque, hwaddr addr, unsigned = size) +static MemTxResult aspeed_smc_flash_read(void *opaque, hwaddr addr, + uint64_t *data, unsigned size, MemTxAttrs= attrs) { AspeedSMCFlash *fl =3D opaque; AspeedSMCState *s =3D fl->controller; - uint64_t ret =3D 0; int i; =20 + *data =3D 0; switch (aspeed_smc_flash_mode(fl)) { case CTRL_USERMODE: for (i =3D 0; i < size; i++) { - ret |=3D (uint64_t) ssi_transfer(s->spi, 0x0) << (8 * i); + *data |=3D (uint64_t) ssi_transfer(s->spi, 0x0) << (8 * i); } break; case CTRL_READMODE: @@ -512,18 +513,19 @@ static uint64_t aspeed_smc_flash_read(void *opaque, h= waddr addr, unsigned size) aspeed_smc_flash_setup(fl, addr); =20 for (i =3D 0; i < size; i++) { - ret |=3D (uint64_t) ssi_transfer(s->spi, 0x0) << (8 * i); + *data |=3D (uint64_t) ssi_transfer(s->spi, 0x0) << (8 * i); } =20 aspeed_smc_flash_unselect(fl); break; default: aspeed_smc_error("invalid flash mode %d", aspeed_smc_flash_mode(fl= )); + return MEMTX_ERROR; } =20 - trace_aspeed_smc_flash_read(fl->cs, addr, size, ret, + trace_aspeed_smc_flash_read(fl->cs, addr, size, *data, aspeed_smc_flash_mode(fl)); - return ret; + return MEMTX_OK; } =20 /* @@ -624,8 +626,8 @@ static bool aspeed_smc_do_snoop(AspeedSMCFlash *fl, ui= nt64_t data, return false; } =20 -static void aspeed_smc_flash_write(void *opaque, hwaddr addr, uint64_t dat= a, - unsigned size) +static MemTxResult aspeed_smc_flash_write(void *opaque, hwaddr addr, + uint64_t data, unsigned size, MemTxAttr= s attrs) { AspeedSMCFlash *fl =3D opaque; AspeedSMCState *s =3D fl->controller; @@ -636,7 +638,7 @@ static void aspeed_smc_flash_write(void *opaque, hwaddr= addr, uint64_t data, =20 if (!aspeed_smc_is_writable(fl)) { aspeed_smc_error("flash is not writable at 0x%" HWADDR_PRIx, addr); - return; + return MEMTX_ERROR; } =20 switch (aspeed_smc_flash_mode(fl)) { @@ -661,12 +663,15 @@ static void aspeed_smc_flash_write(void *opaque, hwad= dr addr, uint64_t data, break; default: aspeed_smc_error("invalid flash mode %d", aspeed_smc_flash_mode(fl= )); + return MEMTX_ERROR; } + + return MEMTX_OK; } =20 static const MemoryRegionOps aspeed_smc_flash_ops =3D { - .read =3D aspeed_smc_flash_read, - .write =3D aspeed_smc_flash_write, + .read_with_attrs =3D aspeed_smc_flash_read, + .write_with_attrs =3D aspeed_smc_flash_write, .endianness =3D DEVICE_LITTLE_ENDIAN, .valid =3D { .min_access_size =3D 1, @@ -754,7 +759,8 @@ static void aspeed_smc_reset(DeviceState *d) s->snoop_dummies =3D 0; } =20 -static uint64_t aspeed_smc_read(void *opaque, hwaddr addr, unsigned int si= ze) +static MemTxResult aspeed_smc_read(void *opaque, hwaddr addr, uint64_t *da= ta, + unsigned int size, MemTxAttrs attrs) { AspeedSMCState *s =3D ASPEED_SMC(opaque); AspeedSMCClass *asc =3D ASPEED_SMC_GET_CLASS(opaque); @@ -782,12 +788,13 @@ static uint64_t aspeed_smc_read(void *opaque, hwaddr = addr, unsigned int size) =20 trace_aspeed_smc_read(addr << 2, size, s->regs[addr]); =20 - return s->regs[addr]; + *data =3D s->regs[addr]; } else { qemu_log_mask(LOG_UNIMP, "%s: not implemented: 0x%" HWADDR_PRIx "\= n", __func__, addr); - return -1; + *data =3D -1; } + return MEMTX_OK; } =20 static uint8_t aspeed_smc_hclk_divisor(uint8_t hclk_mask) @@ -1108,8 +1115,8 @@ static void aspeed_2600_smc_dma_ctrl(AspeedSMCState *= s, uint32_t dma_ctrl) s->regs[R_DMA_CTRL] &=3D ~(DMA_CTRL_REQUEST | DMA_CTRL_GRANT); } =20 -static void aspeed_smc_write(void *opaque, hwaddr addr, uint64_t data, - unsigned int size) +static MemTxResult aspeed_smc_write(void *opaque, hwaddr addr, uint64_t da= ta, + unsigned int size, MemTxAttrs attrs) { AspeedSMCState *s =3D ASPEED_SMC(opaque); AspeedSMCClass *asc =3D ASPEED_SMC_GET_CLASS(s); @@ -1159,13 +1166,13 @@ static void aspeed_smc_write(void *opaque, hwaddr a= ddr, uint64_t data, } else { qemu_log_mask(LOG_UNIMP, "%s: not implemented: 0x%" HWADDR_PRIx "\= n", __func__, addr); - return; } + return MEMTX_OK; } =20 static const MemoryRegionOps aspeed_smc_ops =3D { - .read =3D aspeed_smc_read, - .write =3D aspeed_smc_write, + .read_with_attrs =3D aspeed_smc_read, + .write_with_attrs =3D aspeed_smc_write, .endianness =3D DEVICE_LITTLE_ENDIAN, }; =20 @@ -2007,8 +2014,8 @@ static const uint32_t aspeed_2700_fmc_resets[ASPEED_S= MC_R_MAX] =3D { }; =20 static const MemoryRegionOps aspeed_2700_smc_flash_ops =3D { - .read =3D aspeed_smc_flash_read, - .write =3D aspeed_smc_flash_write, + .read_with_attrs =3D aspeed_smc_flash_read, + .write_with_attrs =3D aspeed_smc_flash_write, .endianness =3D DEVICE_LITTLE_ENDIAN, .valid =3D { .min_access_size =3D 1, --=20 2.53.0