Author: jmallett
Date: Fri Oct 26 00:08:50 2012
New Revision: 242104
URL: http://svn.freebsd.org/changeset/base/242104
Log:
Add support for Radisys as a vendor of Octeon hardware. Add some preliminary
support for what their boot loader refers to as the "RSYS4GBE", of which there
are two instances ("Data Processing Blocks") on the Radisys ATCA-7220.
Modified:
head/sys/conf/options.mips
head/sys/contrib/octeon-sdk/cvmx-app-init.h
head/sys/contrib/octeon-sdk/cvmx-helper-board.c
head/sys/contrib/octeon-sdk/cvmx-helper.c
head/sys/mips/conf/OCTEON1
Modified: head/sys/conf/options.mips
==============================================================================
--- head/sys/conf/options.mips Fri Oct 26 00:04:05 2012 (r242103)
+++ head/sys/conf/options.mips Fri Oct 26 00:08:50 2012 (r242104)
@@ -72,6 +72,7 @@ MAXMEM opt_global.h
# Options that control the Cavium Simple Executive.
#
OCTEON_VENDOR_LANNER opt_cvmx.h
+OCTEON_VENDOR_RADISYS opt_cvmx.h
OCTEON_BOARD_CAPK_0100ND opt_cvmx.h
#
Modified: head/sys/contrib/octeon-sdk/cvmx-app-init.h
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx-app-init.h Fri Oct 26 00:04:05 2012
(r242103)
+++ head/sys/contrib/octeon-sdk/cvmx-app-init.h Fri Oct 26 00:08:50 2012
(r242104)
@@ -299,6 +299,9 @@ enum cvmx_board_types_enum {
CVMX_BOARD_TYPE_CUST_LANNER_MR320= 20002,
CVMX_BOARD_TYPE_CUST_LANNER_MR321X=20007,
#endif
+#if defined(OCTEON_VENDOR_RADISYS)
+ CVMX_BOARD_TYPE_CUST_RADISYS_RSYS4GBE=20002,
+#endif
CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000,
@@ -423,6 +426,9 @@ static inline const char *cvmx_board_typ
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_LANNER_MR320)
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_LANNER_MR321X)
#endif
+#if defined(OCTEON_VENDOR_RADISYS)
+ ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_RADISYS_RSYS4GBE)
+#endif
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX)
/* Module range */
Modified: head/sys/contrib/octeon-sdk/cvmx-helper-board.c
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx-helper-board.c Fri Oct 26 00:04:05
2012 (r242103)
+++ head/sys/contrib/octeon-sdk/cvmx-helper-board.c Fri Oct 26 00:08:50
2012 (r242104)
@@ -1296,6 +1296,14 @@ 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.c
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx-helper.c Fri Oct 26 00:04:05 2012
(r242103)
+++ head/sys/contrib/octeon-sdk/cvmx-helper.c Fri Oct 26 00:08:50 2012
(r242104)
@@ -146,6 +146,10 @@ int cvmx_helper_get_number_of_interfaces
case CVMX_BOARD_TYPE_CUST_LANNER_MR730:
return 1;
#endif
+#if defined(OCTEON_VENDOR_RADISYS)
+ case CVMX_BOARD_TYPE_CUST_RADISYS_RSYS4GBE:
+ return 2;
+#endif
default:
break;
}
Modified: head/sys/mips/conf/OCTEON1
==============================================================================
--- head/sys/mips/conf/OCTEON1 Fri Oct 26 00:04:05 2012 (r242103)
+++ head/sys/mips/conf/OCTEON1 Fri Oct 26 00:08:50 2012 (r242104)
@@ -38,6 +38,7 @@ makeoptions DEBUG=-g #Build kernel with
# Board-specific support that cannot be auto-detected at runtime.
#options OCTEON_VENDOR_LANNER # Support for Lanner boards.
+#options OCTEON_VENDOR_RADISYS # Support for Radisys boards.
#options OCTEON_BOARD_CAPK_0100ND # Support for CAPK-0100nd.
options SCHED_ULE # ULE scheduler
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
