From patchwork Thu Jan 4 18:36:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 13511449 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 77CA2C47074 for ; Thu, 4 Jan 2024 18:38:30 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLSaH-0001MS-4o; Thu, 04 Jan 2024 13:36:49 -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 1rLSaC-0001HN-6B for qemu-devel@nongnu.org; Thu, 04 Jan 2024 13:36:44 -0500 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rLSa9-0005EN-QZ for qemu-devel@nongnu.org; Thu, 04 Jan 2024 13:36:43 -0500 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 5AC1D616F9; Thu, 4 Jan 2024 18:36:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89072C433C9; Thu, 4 Jan 2024 18:36:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1704393400; bh=RfMF/F1MWgRkg/cJ7tX1IjaxKfhLcUlRTaP90CvwDNc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ho4F7WPUIxamr2T7Sh2cyXpcMLUjyqb3InGxhX5a2YKTAeDLsa4uz2bx1jto0YpdK CGNqi/1A45keAo6Co2Ksm/bEINHeh6j2TNkQFcIOmEeCTRBRuDfPuBCNQ+W+zkIcOX RxlPf3Wbuf+GzugmAFrHn3XkZhLV/nyAb30RJVkPXo+at3elBksYQdrWor2i0fSSX/ H/bt/GTLw/tH9bTeUhzf5pMTJI0P8FXPgYwEID4G3kjkWjdWvlHVsS4rNZsLQ/gvTy UEI4Ez4MnGOg59zeuNXa7/v+8Kxm/PZnRuz9or8Q+fuArw4YPmZOOyOIfaMy0zIOvx m2EDibn9s9/7w== From: deller@kernel.org To: qemu-devel@nongnu.org Cc: Michael Tokarev , Bruno Haible , Richard Henderson , "Nelson H . F . Beebe" , Helge Deller Subject: [PATCH 4/9] target/hppa: Fix PDC address translation on PA2.0 with PSW.W=0 Date: Thu, 4 Jan 2024 19:36:23 +0100 Message-ID: <20240104183628.101366-5-deller@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240104183628.101366-1-deller@kernel.org> References: <20240104183628.101366-1-deller@kernel.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2604:1380:4641:c500::1; envelope-from=deller@kernel.org; helo=dfw.source.kernel.org X-Spam_score_int: -70 X-Spam_score: -7.1 X-Spam_bar: ------- X-Spam_report: (-7.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.691, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Helge Deller Fix the address translation for PDC space on PA2.0 if PSW.W=0. Basically, for any address in the 32-bit PDC range from 0xf0000000 to 0xf1000000 keep the lower 32-bits and just set the upper 32-bits to 0xfffffff0. This mapping fixes the emulated power button in PDC space for 32- and 64-bit machines and is how the physical C3700 machine seems to map PDC. Signed-off-by: Helge Deller --- target/hppa/mem_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c index 08abd1a9f9..011b192406 100644 --- a/target/hppa/mem_helper.c +++ b/target/hppa/mem_helper.c @@ -56,7 +56,7 @@ hwaddr hppa_abs_to_phys_pa2_w0(vaddr addr) addr = (int32_t)addr; } else { /* PDC address space */ - addr &= MAKE_64BIT_MASK(0, 24); + addr = (uint32_t)addr; addr |= -1ull << (TARGET_PHYS_ADDR_SPACE_BITS - 4); } return addr;