From nobody Sat Sep 21 07:26:25 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=1705055469; cv=none; d=zohomail.com; s=zohoarc; b=H5QMbw3rWZDXvpgZAkdxUA4GsGgRvXYqkiCsCdTrLXHJwAO+QnhPd0pkjsXuvtpUfhO/nsjY8yb40yRhv6uufoua/YmDQNuPpQyPTz3V1lGHwvDhFZUhLD9ZCfE33Y/LxlDKzS5dEBAyxezU8a4oAZmtoKojPodxk+HRR90dihU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705055469; 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=hlPmaDUo0y195xPf7R6cPJp2UD8IaUVVVeV8WD03Kw0=; b=ATdAyaqAo3QDwE5ByX1FTc4AW07jv/FrMhAA8G7C3EHquGjuViqG6huSXc2X+O8qqpviYaI+eUk7zJh7ZHfJbTw5mcx6rPNwDduYqYtgl/m+XewJBPfmKIDPVUUjDe3AAq51MwJzziIqzTE1AUJ1GggfyhRpNN8tHL/oyYniFCo= 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 1705055469027280.92218492560323; Fri, 12 Jan 2024 02:31:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rOEnQ-00086n-2k; Fri, 12 Jan 2024 05:29:52 -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 1rOEnK-0007yM-BZ for qemu-devel@nongnu.org; Fri, 12 Jan 2024 05:29:46 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rOEnI-0006Lt-Gz for qemu-devel@nongnu.org; Fri, 12 Jan 2024 05:29:46 -0500 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 8457461D60; Fri, 12 Jan 2024 10:29:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 574F1C43390; Fri, 12 Jan 2024 10:29:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705055383; bh=fXmfWG5wGeCbjGRjAUA62CMUoLzlw1DwHmq/Afn380k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YI/nNX7xLlg+Mt17XK81iQNwEmZGhI4UwDtQAVucfmSSZL4wRSEzAERBshwo20jH2 lw6uZeUubK/Y9j598ozLZOHQE3tA1MZfdHNukbUwW99ZH1cgbQ/k2a7Y/H6XH1KrDt 1Yw09RbEwsVaYOsuLTT/tB7RnRsMEJmof2W3P1MBzmihU33m+M+61NBm7J9Jaxx5oM x4vKAacstAfisMnfKyOTJEPParn/1UrMlRb8TbtECIxOYjtMLuIH0nxws+CpNOSmGC W6/ZV3Vg29NflHtcqRAhJ5Ek1ru4IxnNk+yyUy0qpi5rIPrzuNNMSSjs0aYL76msX6 cnpFNNgCA0Y6w== From: deller@kernel.org To: qemu-devel@nongnu.org Cc: Richard Henderson , Helge Deller Subject: [PATCH v3 9/9] target/hppa: Fix IOR and ISR on error in probe Date: Fri, 12 Jan 2024 11:29:27 +0100 Message-ID: <20240112102927.35406-10-deller@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240112102927.35406-1-deller@kernel.org> References: <20240112102927.35406-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=139.178.84.217; envelope-from=deller@kernel.org; helo=dfw.source.kernel.org X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.467, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_HI=-5, 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: 1705055470469100003 Content-Type: text/plain; charset="utf-8" From: Helge Deller Put correct values (depending on CPU arch) into IOR and ISR on fault. Signed-off-by: Helge Deller Reviewed-by: Richard Henderson --- target/hppa/op_helper.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/target/hppa/op_helper.c b/target/hppa/op_helper.c index 7f607c3afd..ce15469465 100644 --- a/target/hppa/op_helper.c +++ b/target/hppa/op_helper.c @@ -351,11 +351,7 @@ target_ulong HELPER(probe)(CPUHPPAState *env, target_u= long addr, excp =3D hppa_get_physical_address(env, addr, mmu_idx, 0, &phys, &prot, NULL); if (excp >=3D 0) { - if (env->psw & PSW_Q) { - /* ??? Needs tweaking for hppa64. */ - env->cr[CR_IOR] =3D addr; - env->cr[CR_ISR] =3D addr >> 32; - } + hppa_set_ior_and_isr(env, addr, MMU_IDX_MMU_DISABLED(mmu_idx)); if (excp =3D=3D EXCP_DTLB_MISS) { excp =3D EXCP_NA_DTLB_MISS; } --=20 2.43.0