From owner-svn-src-user@FreeBSD.ORG  Sat Feb 27 21:03:28 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C869E106564A;
	Sat, 27 Feb 2010 21:03:28 +0000 (UTC) (envelope-from imp@bsdimp.com)
Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85])
	by mx1.freebsd.org (Postfix) with ESMTP id 6D5DE8FC18;
	Sat, 27 Feb 2010 21:03:28 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id o1RKsttR023998;
	Sat, 27 Feb 2010 13:54:55 -0700 (MST) (envelope-from imp@bsdimp.com)
Date: Sat, 27 Feb 2010 13:55:08 -0700 (MST)
Message-Id: <20100227.135508.999284356098972095.imp@bsdimp.com>
To: jmallett@FreeBSD.org
From: "M. Warner Losh" <imp@bsdimp.com>
In-Reply-To: <201002270333.o1R3XVJb039720@svn.freebsd.org>
References: <201002270333.o1R3XVJb039720@svn.freebsd.org>
X-Mailer: Mew version 6.3 on Emacs 22.3 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: src-committers@FreeBSD.org, svn-src-user@FreeBSD.org
Subject: Re: svn commit: r204389 - in user/jmallett/octeon/sys/mips:
 include mips
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Feb 2010 21:03:28 -0000

In message: <201002270333.o1R3XVJb039720@svn.freebsd.org>
            Juli Mallett <jmallett@freebsd.org> writes:
: Author: jmallett
: Date: Sat Feb 27 03:33:31 2010
: New Revision: 204389
: URL: http://svn.freebsd.org/changeset/base/204389
: 
: Log:
:   Check for __mips_n32, not ISA_MIPS32, on Octeon to tell whether we have
:   longer-than-pointer bus addresses.  It's the ABI that matters (or at least
:   it's more like the ABI than the ISA that matters.)
: 
: Modified:
:   user/jmallett/octeon/sys/mips/include/_bus.h
:   user/jmallett/octeon/sys/mips/mips/bus_space_generic.c
: 
: Modified: user/jmallett/octeon/sys/mips/include/_bus.h
: ==============================================================================
: --- user/jmallett/octeon/sys/mips/include/_bus.h	Sat Feb 27 03:30:48 2010	(r204388)
: +++ user/jmallett/octeon/sys/mips/include/_bus.h	Sat Feb 27 03:33:31 2010	(r204389)
: @@ -35,10 +35,10 @@
:   * Bus address and size types
:   */
:  #include "opt_cputype.h" 
: -#if !(defined(TARGET_OCTEON) && defined(ISA_MIPS32))
: -typedef uintptr_t bus_addr_t;
: -#else
: +#if defined(TARGET_OCTEON) && defined(__mips_n32)
:  typedef uint64_t bus_addr_t;
: +#else
: +typedef uintptr_t bus_addr_t;
:  #endif
:  typedef uintptr_t bus_size_t;

I'm starting to think that we need this to be subport specific...


: Modified: user/jmallett/octeon/sys/mips/mips/bus_space_generic.c
: ==============================================================================
: --- user/jmallett/octeon/sys/mips/mips/bus_space_generic.c	Sat Feb 27 03:30:48 2010	(r204388)
: +++ user/jmallett/octeon/sys/mips/mips/bus_space_generic.c	Sat Feb 27 03:33:31 2010	(r204389)
: @@ -198,7 +198,7 @@ static struct bus_space generic_space = 
:  
:  /* Ultra-gross kludge */
:  #include "opt_cputype.h"
: -#if defined(TARGET_OCTEON) && defined(ISA_MIPS32)
: +#if defined(TARGET_OCTEON) && defined(__mips_n32)
:  #include <mips/cavium/octeon_pcmap_regs.h>
:  #define rd8(a) oct_read8(a)
:  #define rd16(a) oct_read16(a)

this doesn't seem quite right...  This kludge is also likely to go
away in the future...

Warner