svn commit: r280601 - in stable/10/sys: dev/sfxge modules/sfxge

[Andrew Rybchenko]

Author: arybchik
Date: Wed Mar 25 13:44:01 2015
New Revision: 280601
URL: https://svnweb.freebsd.org/changeset/base/280601

Log:
  MFC: 280162
  
  sfxge: adding version info to device description
  
  The information is required for NIC update and config tools.
  
  Submitted by:   Artem V. Andreev <Artem.Andreev at oktetlabs.ru>
  Sponsored by:   Solarflare Communications, Inc.
  Approved by:    gnn (mentor)

Added:
  stable/10/sys/dev/sfxge/sfxge_version.h
     - copied unchanged from r280162, head/sys/dev/sfxge/sfxge_version.h
Modified:
  stable/10/sys/dev/sfxge/sfxge.c
  stable/10/sys/modules/sfxge/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sfxge/sfxge.c
==============================================================================
--- stable/10/sys/dev/sfxge/sfxge.c	Wed Mar 25 13:42:37 2015	(r280600)
+++ stable/10/sys/dev/sfxge/sfxge.c	Wed Mar 25 13:44:01 2015	(r280601)
@@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$");
 
 #include "sfxge.h"
 #include "sfxge_rx.h"
+#include "sfxge_version.h"
 
 #define	SFXGE_CAP (IFCAP_VLAN_MTU | \
 		   IFCAP_HWCSUM | IFCAP_VLAN_HWCSUM | IFCAP_TSO |	\
@@ -472,6 +473,12 @@ sfxge_create(struct sfxge_softc *sc)
 	if ((error = efx_nic_probe(enp)) != 0)
 		goto fail5;
 
+	SYSCTL_ADD_STRING(device_get_sysctl_ctx(dev),
+			  SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
+			  OID_AUTO, "version", CTLFLAG_RD,
+			  SFXGE_VERSION_STRING, 0,
+			  "Driver version");
+
 	/* Initialize the NVRAM. */
 	if ((error = efx_nvram_init(enp)) != 0)
 		goto fail6;

Copied: stable/10/sys/dev/sfxge/sfxge_version.h (from r280162, head/sys/dev/sfxge/sfxge_version.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/sys/dev/sfxge/sfxge_version.h	Wed Mar 25 13:44:01 2015	(r280601, copy of r280162, head/sys/dev/sfxge/sfxge_version.h)
@@ -0,0 +1,37 @@
+/*-
+ * Copyright (c) 2015 Solarflare Communications, Inc.
+ * All rights reserved.
+ *
+ * This software was developed in part by OKTET Labs under contract for
+ * Solarflare Communications, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _SFXGE_VERSION_H
+#define	_SFXGE_VERSION_H
+
+#define	SFXGE_VERSION_STRING	"v3.3.4.6363"
+
+#endif	/* _SFXGE_DRIVER_VERSION_H */

Modified: stable/10/sys/modules/sfxge/Makefile
==============================================================================
--- stable/10/sys/modules/sfxge/Makefile	Wed Mar 25 13:42:37 2015	(r280600)
+++ stable/10/sys/modules/sfxge/Makefile	Wed Mar 25 13:44:01 2015	(r280601)
@@ -11,7 +11,7 @@ SRCS+=	opt_inet.h opt_sched.h
 SRCS+=	sfxge.c sfxge_dma.c sfxge_ev.c
 SRCS+=	sfxge_intr.c sfxge_mcdi.c
 SRCS+=	sfxge_port.c sfxge_rx.c sfxge_tx.c
-SRCS+=	sfxge.h sfxge_rx.h sfxge_tx.h
+SRCS+=	sfxge.h sfxge_rx.h sfxge_tx.h sfxge_version.h
 
 .PATH: ${.CURDIR}/../../dev/sfxge/common
 SRCS+=	efx_ev.c efx_intr.c efx_mac.c efx_mcdi.c efx_nic.c