From patchwork Sat May 8 14:10:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artyom Tarasenko X-Patchwork-Id: 51965 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 92C0BB7D64 for ; Sun, 9 May 2010 00:12:10 +1000 (EST) Received: from localhost ([127.0.0.1]:51147 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OAklC-0003Ya-8n for incoming@patchwork.ozlabs.org; Sat, 08 May 2010 10:12:06 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1OAkja-0003Wu-Ob for qemu-devel@nongnu.org; Sat, 08 May 2010 10:10:26 -0400 Received: from [140.186.70.92] (port=56616 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OAkjV-0003UI-BH for qemu-devel@nongnu.org; Sat, 08 May 2010 10:10:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OAkjS-0008Hc-P9 for qemu-devel@nongnu.org; Sat, 08 May 2010 10:10:21 -0400 Received: from fg-out-1718.google.com ([72.14.220.154]:22636) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OAkjS-0008H6-KG for qemu-devel@nongnu.org; Sat, 08 May 2010 10:10:18 -0400 Received: by fg-out-1718.google.com with SMTP id 19so797574fgg.10 for ; Sat, 08 May 2010 07:10:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=r+X6G0VR0fj2S/Miq2dsOl7zEcnOOefanzaUGtcYogc=; b=GS4xin/KJhpmavW4maaAruR4vjeelgUOKFqF/hvjE2FqKPywnWR3Y0hpZtAR62yslA PwA2jDbmVnBoR8yKfuGCkwEr9BL0mWdW4eD1wcwOdWdgg8sERbbHOPmpRKSOwaZkC5mZ hKPOS4icWFUwZ1+EBOWcNA9uzMwfVM/LIF2H4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=Nl/sHh8HOgQmEMNtAZ31pCPnmv/DPZe84K9cZ28vSrWHvGaQoQ1uh1+ZKbF2svmX3H dnOvVpmTjP37rX+S5oAdouOaqFjOeJZDmaSDyLLbwS5vRAHpab0XfgoC2Zv9QN+YU4LI wXgGjZtehsnV2vvQnQaeE+m9RHWqX5YyvVyTI= Received: by 10.87.70.21 with SMTP id x21mr5793280fgk.62.1273327816526; Sat, 08 May 2010 07:10:16 -0700 (PDT) Received: from localhost (e181211204.adsl.alicedsl.de [85.181.211.204]) by mx.google.com with ESMTPS id b17sm6101677fka.43.2010.05.08.07.10.15 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 08 May 2010 07:10:16 -0700 (PDT) From: Artyom Tarasenko To: qemu-devel@nongnu.org Date: Sat, 8 May 2010 16:10:14 +0200 Message-Id: <1273327815-21408-1-git-send-email-atar4qemu@gmail.com> X-Mailer: git-send-email 1.6.2.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: blauwirbel@gmail.com, Artyom Tarasenko Subject: [Qemu-devel] [PATCH 1/2] Pad iommu with an empty slot (necessary for SunOS 4.1.4) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On the real hardware (SS-5, LX) the MMU is not padded, but aliased. Software shouldn't use aliased addresses, neither should it crash when it uses (on the real hardware it wouldn't). Using empty_slot instead of aliasing can help with debugging such accesses. --- hw/sun4m.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/hw/sun4m.c b/hw/sun4m.c index 9a79120..e31d039 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -93,7 +93,7 @@ #define ESCC_CLOCK 4915200 struct sun4m_hwdef { - target_phys_addr_t iommu_base, slavio_base; + target_phys_addr_t iommu_base, iommu_pad_base, iommu_pad_len, slavio_base; target_phys_addr_t intctl_base, counter_base, nvram_base, ms_kb_base; target_phys_addr_t serial_base, fd_base; target_phys_addr_t afx_base, idreg_base, dma_base, esp_base, le_base; @@ -850,6 +850,14 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size, iommu = iommu_init(hwdef->iommu_base, hwdef->iommu_version, slavio_irq[30]); + if (hwdef->iommu_pad_base) { + /* On the real hardware (SS-5, LX) the MMU is not padded, but aliased. + Software shouldn't use aliased addresses, neither should it crash + when does. Using empty_slot instead of aliasing can help with + debugging such accesses */ + empty_slot_init(hwdef->iommu_pad_base,hwdef->iommu_pad_len); + } + espdma = sparc32_dma_init(hwdef->dma_base, slavio_irq[18], iommu, &espdma_irq); @@ -961,6 +969,8 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = { /* SS-5 */ { .iommu_base = 0x10000000, + .iommu_pad_base = 0x10004000, + .iommu_pad_len = 0x0fffb000, .tcx_base = 0x50000000, .cs_base = 0x6c000000, .slavio_base = 0x70000000, @@ -1087,6 +1097,8 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = { /* LX */ { .iommu_base = 0x10000000, + .iommu_pad_base = 0x10004000, + .iommu_pad_len = 0x0fffb000, .tcx_base = 0x50000000, .slavio_base = 0x70000000, .ms_kb_base = 0x71000000,