svn commit: r301390 - in stable/10/sys/dev/sfxge: . common

[Andrew Rybchenko]

Author: arybchik
Date: Sat Jun  4 17:12:28 2016
New Revision: 301390
URL: https://svnweb.freebsd.org/changeset/base/301390

Log:
  MFC r300609
  
  sfxge(4): enable Medford support
  
  Reviewed by:    gnn
  Sponsored by:   Solarflare Communications, Inc.

Modified:
  stable/10/sys/dev/sfxge/common/efsys.h
  stable/10/sys/dev/sfxge/sfxge.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sfxge/common/efsys.h
==============================================================================
--- stable/10/sys/dev/sfxge/common/efsys.h	Sat Jun  4 17:11:04 2016	(r301389)
+++ stable/10/sys/dev/sfxge/common/efsys.h	Sat Jun  4 17:12:28 2016	(r301390)
@@ -238,7 +238,7 @@ sfxge_map_mbuf_fast(bus_dma_tag_t tag, b
 
 #define	EFSYS_OPT_SIENA 1
 #define	EFSYS_OPT_HUNTINGTON 1
-#define	EFSYS_OPT_MEDFORD 0
+#define	EFSYS_OPT_MEDFORD 1
 #ifdef DEBUG
 #define	EFSYS_OPT_CHECK_REG 1
 #else

Modified: stable/10/sys/dev/sfxge/sfxge.c
==============================================================================
--- stable/10/sys/dev/sfxge/sfxge.c	Sat Jun  4 17:11:04 2016	(r301389)
+++ stable/10/sys/dev/sfxge/sfxge.c	Sat Jun  4 17:12:28 2016	(r301390)
@@ -1174,6 +1174,11 @@ sfxge_probe(device_t dev)
 		return (0);
 	}
 
+	if (family == EFX_FAMILY_MEDFORD) {
+		device_set_desc(dev, "Solarflare SFC9200 family");
+		return (0);
+	}
+
 	DBGPRINT(dev, "impossible controller family %d", family);
 	return (ENXIO);
 }