From patchwork Thu Apr 28 20:51:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 93334 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8E542B6FC0 for ; Fri, 29 Apr 2011 07:04:56 +1000 (EST) Received: from localhost ([::1]:47143 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFYOL-0004Je-VH for incoming@patchwork.ozlabs.org; Thu, 28 Apr 2011 17:04:53 -0400 Received: from eggs.gnu.org ([140.186.70.92]:48006) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFYBj-0005a0-Tm for qemu-devel@nongnu.org; Thu, 28 Apr 2011 16:51:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QFYBj-0005fl-5F for qemu-devel@nongnu.org; Thu, 28 Apr 2011 16:51:51 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:41034) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFYBi-0005Xk-VC for qemu-devel@nongnu.org; Thu, 28 Apr 2011 16:51:51 -0400 Received: by mail-pz0-f45.google.com with SMTP id 30so2296231pzk.4 for ; Thu, 28 Apr 2011 13:51:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=OH0rPrGCwcTUY7KtNax2iccvNYwwtKSe1LArQZtAcX0=; b=gXpQXOLMmoDzGqDeB6seAOWrCaR/6K9sI5dWmgx/y0saPyMZWRbzc/Lkzp1Fnw8mIn UaCHj/K9PDct3q1DZLUudDJSgvIlVliX1CqTMq+yP2p4dYYt4tSeLBkGKi/EHPYdk05i ISPJIr7imWydBYTnVve1xWh+Ow1DFR4Rfc18s= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=ZfBoNNyptzIZGToQfGRRfSZ6W6PvyL4hTxXfCv+tE03FzS76zVu6dHH+zJhqLh2xzD ZghtFhmh5Y+LzW+icr7hCWB8yLaX4T2YFnmlEqD3IDdbPPni2y1e0kNcRFRqG+IPRDiL zm1N5WJVL4xlLq2gM4LqNQp8zqgEBpLJMXqaM= Received: by 10.142.245.14 with SMTP id s14mr1306731wfh.264.1304023910506; Thu, 28 Apr 2011 13:51:50 -0700 (PDT) Received: from localhost.localdomain (are.twiddle.net [75.101.38.216]) by mx.google.com with ESMTPS id z10sm2266797wfj.12.2011.04.28.13.51.49 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 28 Apr 2011 13:51:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 28 Apr 2011 13:51:06 -0700 Message-Id: <1304023875-25040-25-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1304023875-25040-1-git-send-email-rth@twiddle.net> References: <1304023875-25040-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.45 Subject: [Qemu-devel] [PATCH 24/33] target-alpha: Remap PIO space for 43-bit KSEG for EV6. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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 Signed-off-by: Richard Henderson --- target-alpha/helper.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/target-alpha/helper.c b/target-alpha/helper.c index 96b407b..bd3af38 100644 --- a/target-alpha/helper.c +++ b/target-alpha/helper.c @@ -220,14 +220,18 @@ static int get_physical_address(CPUState *env, target_ulong addr, /* Translate the superpage. */ /* ??? When we do more than emulate Unix PALcode, we'll need to - determine which superpage is actually active. */ - if (saddr < 0 && (saddr >> (TARGET_VIRT_ADDR_SPACE_BITS - 2) & 3) == 2) { - /* User-space cannot access kseg addresses. */ + determine which KSEG is actually active. */ + if (saddr < 0 && ((saddr >> 41) & 3) == 2) { + /* User-space cannot access KSEG addresses. */ if (mmu_idx != MMU_KERNEL_IDX) { goto exit; } + /* For the benefit of the Typhoon chipset, move bit 40 to bit 43. + We would not do this if the 48-bit KSEG is enabled. */ phys = saddr & ((1ull << 40) - 1); + phys |= (saddr & (1ull << 40)) << 3; + prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC; ret = -1; goto exit;