From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=34948 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PUjpt-0008Ew-Dr for qemu-devel@nongnu.org; Mon, 20 Dec 2010 12:47:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PUjpr-0005HR-Q6 for qemu-devel@nongnu.org; Mon, 20 Dec 2010 12:47:49 -0500 Received: from mail.mc.net ([209.172.128.24]:37869) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1PUjpr-0005H6-Lb for qemu-devel@nongnu.org; Mon, 20 Dec 2010 12:47:47 -0500 Message-ID: <4D0F9895.6030700@mc.net> Date: Mon, 20 Dec 2010 11:55:33 -0600 From: Bob Breuer MIME-Version: 1.0 References: <4D0CEAB0.9030706@mc.net> <4D0E5F16.3090905@mc.net> <4D0E6448.7070006@mc.net> In-Reply-To: <4D0E6448.7070006@mc.net> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH v2] sparc32: ledma extra registers need tracing too List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers Cc: Blue Swirl , =?ISO-8859-1?Q?Andreas_F=E4rber?= , Artyom Tarasenko Also trace the extra registers, and update the comments with new info from Artyom Tarasenko. Signed-off-by: Bob Breuer --- Since the extra registers are aliased, we could instead alias them at a higher level. Solaris9 boots to single-user with either option. diff --git a/hw/sparc32_dma.c b/hw/sparc32_dma.c index 56be8c8..e75694b 100644 --- a/hw/sparc32_dma.c +++ b/hw/sparc32_dma.c @@ -44,7 +44,7 @@ /* We need the mask, because one instance of the device is not page aligned (ledma, start address 0x0010) */ #define DMA_MASK (DMA_SIZE - 1) -/* ledma has more than 4 registers, Solaris reads the 5th one */ +/* OBP says 0x20 bytes for ledma, the extras are aliased to espdma */ #define DMA_ETH_SIZE (8 * sizeof(uint32_t)) #define DMA_MAX_REG_OFFSET (2 * DMA_SIZE - 1) @@ -170,7 +170,10 @@ static uint32_t dma_mem_readl(void *opaque, target_phys_addr_t addr) uint32_t saddr; if (s->is_ledma && (addr > DMA_MAX_REG_OFFSET)) { - return 0; /* extra mystery register(s) */ + /* aliased to espdma, but we can't get there from here */ + /* buggy driver if using undocumented behavior, just return 0 */ + trace_sparc32_dma_mem_readl(addr, 0); + return 0; } saddr = (addr & DMA_MASK) >> 2; trace_sparc32_dma_mem_readl(addr, s->dmaregs[saddr]); @@ -183,7 +186,9 @@ static void dma_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val) uint32_t saddr; if (s->is_ledma && (addr > DMA_MAX_REG_OFFSET)) { - return; /* extra mystery register(s) */ + /* aliased to espdma, but we can't get there from here */ + trace_sparc32_dma_mem_writel(addr, 0, val); + return; } saddr = (addr & DMA_MASK) >> 2; trace_sparc32_dma_mem_writel(addr, s->dmaregs[saddr], val);