From owner-p4-projects@FreeBSD.ORG  Sat Nov 29 18:43:15 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 55FEE1065680; Sat, 29 Nov 2008 18:43:15 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F1330106564A
	for <perforce@freebsd.org>; Sat, 29 Nov 2008 18:43:14 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DBDE68FC18
	for <perforce@freebsd.org>; Sat, 29 Nov 2008 18:43:14 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mATIhEcR082390
	for <perforce@freebsd.org>; Sat, 29 Nov 2008 18:43:14 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mATIhEGq082388
	for perforce@freebsd.org; Sat, 29 Nov 2008 18:43:14 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 29 Nov 2008 18:43:14 GMT
Message-Id: <200811291843.mATIhEGq082388@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 153780 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Nov 2008 18:43:15 -0000

http://perforce.freebsd.org/chv.cgi?CH=153780

Change 153780 by sam@sam_ebb on 2008/11/29 18:42:54

	checkpoint ixp435 work; we're apparently not mapping the
	MCU registers correctly as their contents looks wrong; need
	this so we can size DDRAM at boot

Affected files ...

.. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_mem.c#3 edit

Differences ...

==== //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_mem.c#3 (text+ko) ====

@@ -62,11 +62,10 @@
 	0, 0
 };
 
-#define MCU_REG_READ(x)	(*(volatile uint32_t *)(IXP425_MCU_VBASE + (x)))
-
 uint32_t
 ixp425_sdram_size(void)
 {
+#define MCU_REG_READ(x)	(*(volatile uint32_t *)(IXP425_MCU_VBASE + (x)))
 	uint32_t size, sdr_config;
 
 	sdr_config = MCU_REG_READ(MCU_SDR_CONFIG);
@@ -82,4 +81,20 @@
 	}
 
 	return (size);
+#undef MCU_REG_READ
+}
+
+uint32_t
+ixp435_ddram_size(void)
+{
+#define MCU_REG_READ(x)	(*(volatile uint32_t *)(IXP435_MCU_VBASE + (x)))
+
+printf("sdir 0x%x\n", MCU_REG_READ(MCU_DDR_SDIR));/*XXX*/
+printf("sdcr0 0x%x\n", MCU_REG_READ(MCU_DDR_SDCR0));/*XXX*/
+printf("sdcr1 0x%x\n", MCU_REG_READ(MCU_DDR_SDCR1));/*XXX*/
+printf("sdbr 0x%x\n", MCU_REG_READ(MCU_DDR_SDBR));/*XXX*/
+printf("sbr0 0x%x\n", MCU_REG_READ(MCU_DDR_SBR0));/*XXX*/
+printf("sbr1 0x%x\n", MCU_REG_READ(MCU_DDR_SBR1));/*XXX*/
+	return 128*1024*1024;	/*XXX*/
+#undef MCU_REG_READ
 }