svn commit: r341325 - in head: share/man/man4 sys/dev/sfxge sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Fri Nov 30 07:10:43 2018
New Revision: 341325
URL: https://svnweb.freebsd.org/changeset/base/341325

Log:
  sfxge(4): support Medford2
  
  Sponsored by:   Solarflare Communications, Inc.
  Differential Revision:  https://reviews.freebsd.org/D18286

Modified:
  head/share/man/man4/sfxge.4
  head/sys/dev/sfxge/common/efsys.h
  head/sys/dev/sfxge/sfxge.c

Modified: head/share/man/man4/sfxge.4
==============================================================================
--- head/share/man/man4/sfxge.4	Fri Nov 30 07:10:32 2018	(r341324)
+++ head/share/man/man4/sfxge.4	Fri Nov 30 07:10:43 2018	(r341325)
@@ -52,7 +52,7 @@ sfxge_load="YES"
 The
 .Nm
 driver provides support for 10Gb Ethernet adapters based on
-Solarflare SFC9000 family controllers.
+Solarflare SFC9000 and XtremeScale X2 family controllers.
 The driver supports jumbo
 frames, transmit/receive checksum offload, TCP Segmentation Offload
 (TSO), Large Receive Offload (LRO), VLAN checksum offload, VLAN TSO,
@@ -163,8 +163,8 @@ Period in milliseconds to refresh interface statistics
 The accepted range is 0 to 65535, the default is 1000 (1 second).
 Use zero value to disable periodic statistics update.
 Supported on SFN8xxx series adapters with firmware v6.2.1.1033 and later and
-SFN5xxx and SFN6xxx series adapters.
-SFN7xxx series adapters and SFN8xxx series with earlier firmware use a
+SFN5xxx, SFN6xxx and XtremeScale X2xxx series adapters.
+SFN7xxx series adapters and sfN8xxx series with earlier firmware use a
 fixed 1000 milliseconds statistics update period.
 The period may also be changed after the driver is loaded using the sysctl
 .Va dev.sfxge.%d.stats_update_period_ms .

Modified: head/sys/dev/sfxge/common/efsys.h
==============================================================================
--- head/sys/dev/sfxge/common/efsys.h	Fri Nov 30 07:10:32 2018	(r341324)
+++ head/sys/dev/sfxge/common/efsys.h	Fri Nov 30 07:10:43 2018	(r341325)
@@ -202,7 +202,7 @@ sfxge_map_mbuf_fast(bus_dma_tag_t tag, bus_dmamap_t ma
 #define	EFSYS_OPT_SIENA 1
 #define	EFSYS_OPT_HUNTINGTON 1
 #define	EFSYS_OPT_MEDFORD 1
-#define	EFSYS_OPT_MEDFORD2 0
+#define	EFSYS_OPT_MEDFORD2 1
 #ifdef DEBUG
 #define	EFSYS_OPT_CHECK_REG 1
 #else

Modified: head/sys/dev/sfxge/sfxge.c
==============================================================================
--- head/sys/dev/sfxge/sfxge.c	Fri Nov 30 07:10:32 2018	(r341324)
+++ head/sys/dev/sfxge/sfxge.c	Fri Nov 30 07:10:43 2018	(r341325)
@@ -1182,6 +1182,11 @@ sfxge_probe(device_t dev)
 		return (0);
 	}
 
+	if (family == EFX_FAMILY_MEDFORD2) {
+		device_set_desc(dev, "Solarflare SFC9250 family");
+		return (0);
+	}
+
 	DBGPRINT(dev, "impossible controller family %d", family);
 	return (ENXIO);
 }