From owner-svn-src-head@FreeBSD.ORG  Mon Nov 19 08:35:59 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3C6C6904;
 Mon, 19 Nov 2012 08:35:59 +0000 (UTC)
 (envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 06E4E8FC12;
 Mon, 19 Nov 2012 08:35:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAJ8ZwFo018919;
 Mon, 19 Nov 2012 08:35:58 GMT
 (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAJ8ZwIY018917;
 Mon, 19 Nov 2012 08:35:58 GMT
 (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201211190835.qAJ8ZwIY018917@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Mon, 19 Nov 2012 08:35:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243265 - head/sys/contrib/octeon-sdk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Nov 2012 08:35:59 -0000

Author: jmallett
Date: Mon Nov 19 08:35:58 2012
New Revision: 243265
URL: http://svnweb.freebsd.org/changeset/base/243265

Log:
  Return port numbers for ATCA-7220 SPI interfaces in a different place for
  consistency reasons, and to ensure that CRC addition is disabled on output.
  With this, transmit seems to be working properly on the ATCA-7220.

Modified:
  head/sys/contrib/octeon-sdk/cvmx-helper-board.c
  head/sys/contrib/octeon-sdk/cvmx-helper-spi.c

Modified: head/sys/contrib/octeon-sdk/cvmx-helper-board.c
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx-helper-board.c	Mon Nov 19 08:30:29 2012	(r243264)
+++ head/sys/contrib/octeon-sdk/cvmx-helper-board.c	Mon Nov 19 08:35:58 2012	(r243265)
@@ -1313,14 +1313,6 @@ int __cvmx_helper_board_interface_probe(
 	        return 12;
 	    break;
 #endif
-#if defined(OCTEON_VENDOR_RADISYS)
-	case CVMX_BOARD_TYPE_CUST_RADISYS_RSYS4GBE:
-	    if (interface == 0)
-		    return 13;
-	    if (interface == 1)
-		    return 8;
-	    return 0;
-#endif
     }
 #ifdef CVMX_BUILD_FOR_UBOOT
     if (CVMX_HELPER_INTERFACE_MODE_SPI == cvmx_helper_interface_get_mode(interface) && getenv("disable_spi"))

Modified: head/sys/contrib/octeon-sdk/cvmx-helper-spi.c
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx-helper-spi.c	Mon Nov 19 08:30:29 2012	(r243264)
+++ head/sys/contrib/octeon-sdk/cvmx-helper-spi.c	Mon Nov 19 08:35:58 2012	(r243265)
@@ -104,6 +104,16 @@ int __cvmx_helper_spi_enumerate(int inte
     }
 #endif
 
+#if defined(OCTEON_VENDOR_RADISYS)
+    if (cvmx_sysinfo_get()->board_type == CVMX_BOARD_TYPE_CUST_RADISYS_RSYS4GBE) {
+	    if (interface == 0)
+		    return 13;
+	    if (interface == 1)
+		    return 8;
+	    return 0;
+    }
+#endif
+
 	if ((cvmx_sysinfo_get()->board_type != CVMX_BOARD_TYPE_SIM) &&
 	    cvmx_spi4000_is_present(interface))
 		return 10;