From nobody Mon Sep 16 19:37:03 2024 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=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1707654689; cv=none; d=zohomail.com; s=zohoarc; b=UpOp17fiY+nuHLR927lsNyxkLscz2MIeebVStXknQam1GjZMYkxFqCdg4qyKwvY7IKba4pfJ7NLg7mKFN2e1kUQlRyXebKKw4tPMZmZpyepvNcVaAknYBCFBsMFZI7O2skD4gQzd3SgP4D4FNmtdF65T+ZRCfxuA++NThuy0fv8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1707654689; h=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=pvaBXP4PFiT2dcejnJLN9mND3zL3ZZ+CtEPeaRkzu60=; b=llUMRNgSR8zIfWX0txVQY3y4TbPz3k2Kqo5ZIPtywwUdGSyHyg+aD18cjh+QdKIszV0pCV2mRCI9un4sCQjWlvb+KEj5jsDO/s9gbUwQR9lqCsTG8JMjQEa80kVEqTPgVaxMG4HVhbPJvLcGVcy//H/ovZD62IDfi7cS0es9s3k= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1707654689640281.50954699914485; Sun, 11 Feb 2024 04:31:29 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZ8xl-0006BN-Rv; Sun, 11 Feb 2024 07:29:37 -0500 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 1rZ8xh-00068Q-G3 for qemu-devel@nongnu.org; Sun, 11 Feb 2024 07:29:33 -0500 Received: from sin.source.kernel.org ([145.40.73.55]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZ8xe-0006FF-2m for qemu-devel@nongnu.org; Sun, 11 Feb 2024 07:29:33 -0500 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 49E15CE0D97; Sun, 11 Feb 2024 12:29:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 364B5C433C7; Sun, 11 Feb 2024 12:29:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707654558; bh=RjBu0t65VIh4q8pCxLppdwA9o9NQdQjXfzNg8fayLiM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qEcpqCye13fuQNok2LJXe6eOfvH3Ast1l72+wEEKe/guCNkZAS6z1EGFBmr+MwTKc I0oAXcXZLos9epK7+DymOhZVsRbcvkJgxBq8ddVC29J2PJBvBZZa6uCXhdgoEH5YdV WA/cSRjk1j2IK6n2j2naYo+hz9S8jRlYGW/SHdTvBGQtoWYLKvex+v0EyMJd+Mqhsc MIhi1NdUySel+oYIxNWXN5Y4OndS3YfvCqR38G4YaNPZEyyjO8lTA6I8hTW8xluX0Q YuGjiyqD/v8czRzv9wSH1qy05BscExmbTX/L3o/dQS0GErt0L87StjRSMfLvUZNMr+ +3QL2wXjU2bbA== From: deller@kernel.org To: qemu-devel@nongnu.org Cc: Richard Henderson , Sven Schnelle , Jason Wang , Helge Deller Subject: [PULL 03/12] hw/pci-host/astro: Avoid aborting on access failure Date: Sun, 11 Feb 2024 13:29:00 +0100 Message-ID: <20240211122909.5807-4-deller@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240211122909.5807-1-deller@kernel.org> References: <20240211122909.5807-1-deller@kernel.org> 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=145.40.73.55; envelope-from=deller@kernel.org; helo=sin.source.kernel.org X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.677, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1707654690313100001 Content-Type: text/plain; charset="utf-8" From: Helge Deller Instead of stopping the emulation, report a MEMTX_DECODE_ERROR if the OS tries to access non-existent registers. Signed-off-by: Helge Deller Reviewed-by: Richard Henderson --- hw/pci-host/astro.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/hw/pci-host/astro.c b/hw/pci-host/astro.c index 37d271118c..96d655f5fb 100644 --- a/hw/pci-host/astro.c +++ b/hw/pci-host/astro.c @@ -122,10 +122,6 @@ static MemTxResult elroy_chip_read_with_attrs(void *op= aque, hwaddr addr, case 0x0800: /* IOSAPIC_REG_SELECT */ val =3D s->iosapic_reg_select; break; - case 0x0808: - val =3D UINT64_MAX; /* XXX: tbc. */ - g_assert_not_reached(); - break; case 0x0810: /* IOSAPIC_REG_WINDOW */ switch (s->iosapic_reg_select) { case 0x01: /* IOSAPIC_REG_VERSION */ @@ -135,15 +131,15 @@ static MemTxResult elroy_chip_read_with_attrs(void *o= paque, hwaddr addr, if (s->iosapic_reg_select < ARRAY_SIZE(s->iosapic_reg)) { val =3D s->iosapic_reg[s->iosapic_reg_select]; } else { - trace_iosapic_reg_read(s->iosapic_reg_select, size, val); - g_assert_not_reached(); + val =3D 0; + ret =3D MEMTX_DECODE_ERROR; } } trace_iosapic_reg_read(s->iosapic_reg_select, size, val); break; default: - trace_elroy_read(addr, size, val); - g_assert_not_reached(); + val =3D 0; + ret =3D MEMTX_DECODE_ERROR; } trace_elroy_read(addr, size, val); =20 @@ -191,7 +187,7 @@ static MemTxResult elroy_chip_write_with_attrs(void *op= aque, hwaddr addr, if (s->iosapic_reg_select < ARRAY_SIZE(s->iosapic_reg)) { s->iosapic_reg[s->iosapic_reg_select] =3D val; } else { - g_assert_not_reached(); + return MEMTX_DECODE_ERROR; } break; case 0x0840: /* IOSAPIC_REG_EOI */ @@ -204,7 +200,7 @@ static MemTxResult elroy_chip_write_with_attrs(void *op= aque, hwaddr addr, } break; default: - g_assert_not_reached(); + return MEMTX_DECODE_ERROR; } return MEMTX_OK; } @@ -594,8 +590,8 @@ static MemTxResult astro_chip_read_with_attrs(void *opa= que, hwaddr addr, #undef EMPTY_PORT =20 default: - trace_astro_chip_read(addr, size, val); - g_assert_not_reached(); + val =3D 0; + ret =3D MEMTX_DECODE_ERROR; } =20 /* for 32-bit accesses mask return value */ @@ -610,6 +606,7 @@ static MemTxResult astro_chip_write_with_attrs(void *op= aque, hwaddr addr, uint64_t val, unsigned size, MemTxAttrs attrs) { + MemTxResult ret =3D MEMTX_OK; AstroState *s =3D opaque; =20 trace_astro_chip_write(addr, size, val); @@ -686,11 +683,9 @@ static MemTxResult astro_chip_write_with_attrs(void *o= paque, hwaddr addr, #undef EMPTY_PORT =20 default: - /* Controlled by astro_chip_mem_valid above. */ - trace_astro_chip_write(addr, size, val); - g_assert_not_reached(); + ret =3D MEMTX_DECODE_ERROR; } - return MEMTX_OK; + return ret; } =20 static const MemoryRegionOps astro_chip_ops =3D { --=20 2.43.0