From patchwork Sat Jan 13 05:57:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 1886320 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=Uwjiqwg0; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TBnmG2w9cz1yQ5 for ; Sat, 13 Jan 2024 16:59:26 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rOX1j-0007RO-Qt; Sat, 13 Jan 2024 00:57:51 -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 1rOX1i-0007R8-TK for qemu-devel@nongnu.org; Sat, 13 Jan 2024 00:57:50 -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 1rOX1h-00086D-AP for qemu-devel@nongnu.org; Sat, 13 Jan 2024 00:57:50 -0500 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id C7887CE259A; Sat, 13 Jan 2024 05:57:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 109F0C433C7; Sat, 13 Jan 2024 05:57:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705125466; bh=HMscmGeaFXpMMw/G897fJ5R4jD8hIiSvdjBj8a9jRtE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Uwjiqwg09U/PqwY7smY4eO93K3GyciKXFTHut7sBWTTGTPj0W0o7sFVFX4Kr81Mfm ZKRTWQ/+qg9i7RpgvshhBZSobRNsu9hwQCTvWVkBuUdwDA0ZtJvlEeu1HU5QnHO1wz V63nY/xKHF3FLOAZgAJ9oZgbuWfEX8AROPf81pgeaDEFzk/Lx64g/hJgcxYuZuZ3CH UrYcav/ddIilunr4AQJ0I57mWiHnAnXXyhKKfotWl1vRlJxNrctFBycNXLdu1dM319 qxS46aaAo9+htfYg5WXyMlZiK1KzP9/fxbhu+JjKmNKW27jlFOn5ot3TTfOE4M7ml4 h8vSzCTYzzp+g== From: deller@kernel.org To: qemu-devel@nongnu.org Cc: Helge Deller , Richard Henderson Subject: [PULL 09/10] target/hppa: Fix IOR and ISR on error in probe Date: Sat, 13 Jan 2024 06:57:27 +0100 Message-ID: <20240113055729.4480-10-deller@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240113055729.4480-1-deller@kernel.org> References: <20240113055729.4480-1-deller@kernel.org> MIME-Version: 1.0 Received-SPF: pass client-ip=145.40.73.55; envelope-from=deller@kernel.org; helo=sin.source.kernel.org X-Spam_score_int: -64 X-Spam_score: -6.5 X-Spam_bar: ------ X-Spam_report: (-6.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.09, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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_ulong addr, excp = hppa_get_physical_address(env, addr, mmu_idx, 0, &phys, &prot, NULL); if (excp >= 0) { - if (env->psw & PSW_Q) { - /* ??? Needs tweaking for hppa64. */ - env->cr[CR_IOR] = addr; - env->cr[CR_ISR] = addr >> 32; - } + hppa_set_ior_and_isr(env, addr, MMU_IDX_MMU_DISABLED(mmu_idx)); if (excp == EXCP_DTLB_MISS) { excp = EXCP_NA_DTLB_MISS; }