svn commit: r299253 - head/sys/dev/sfxge/common

Andrew Rybchenko arybchik at FreeBSD.org
Mon May 9 08:37:44 UTC 2016


Author: arybchik
Date: Mon May  9 08:37:42 2016
New Revision: 299253
URL: https://svnweb.freebsd.org/changeset/base/299253

Log:
  sfxge(4): disable common code support for Falcon
  
  This patch ensures that client code will fail to build
  with Falcon support. Following patches remove Falcon
  support code entirely.
  
  sfxge(4) has never supported Falcon.
  
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.
  MFC after:      1 week

Modified:
  head/sys/dev/sfxge/common/efsys.h
  head/sys/dev/sfxge/common/efx.h
  head/sys/dev/sfxge/common/efx_check.h
  head/sys/dev/sfxge/common/efx_impl.h

Modified: head/sys/dev/sfxge/common/efsys.h
==============================================================================
--- head/sys/dev/sfxge/common/efsys.h	Mon May  9 08:35:08 2016	(r299252)
+++ head/sys/dev/sfxge/common/efsys.h	Mon May  9 08:37:42 2016	(r299253)
@@ -236,8 +236,6 @@ sfxge_map_mbuf_fast(bus_dma_tag_t tag, b
 
 #define	EFSYS_OPT_NAMES 1
 
-#define	EFSYS_OPT_FALCON 0
-#define	EFSYS_OPT_FALCON_NIC_CFG_OVERRIDE 0
 #define	EFSYS_OPT_SIENA 1
 #define	EFSYS_OPT_HUNTINGTON 1
 #define	EFSYS_OPT_MEDFORD 0
@@ -251,24 +249,13 @@ sfxge_map_mbuf_fast(bus_dma_tag_t tag, b
 #define	EFSYS_OPT_MCDI_LOGGING 0
 #define	EFSYS_OPT_MCDI_PROXY_AUTH 0
 
-#define	EFSYS_OPT_MAC_FALCON_GMAC 0
-#define	EFSYS_OPT_MAC_FALCON_XMAC 0
 #define	EFSYS_OPT_MAC_STATS 1
 
 #define	EFSYS_OPT_LOOPBACK 0
 
-#define	EFSYS_OPT_MON_NULL 0
-#define	EFSYS_OPT_MON_LM87 0
-#define	EFSYS_OPT_MON_MAX6647 0
 #define	EFSYS_OPT_MON_MCDI 0
 #define	EFSYS_OPT_MON_STATS 0
 
-#define	EFSYS_OPT_PHY_NULL 0
-#define	EFSYS_OPT_PHY_QT2022C2 0
-#define	EFSYS_OPT_PHY_SFX7101 0
-#define	EFSYS_OPT_PHY_TXC43128 0
-#define	EFSYS_OPT_PHY_SFT9001 0
-#define	EFSYS_OPT_PHY_QT2025C 0
 #define	EFSYS_OPT_PHY_STATS 1
 #define	EFSYS_OPT_PHY_PROPS 0
 #define	EFSYS_OPT_BIST 1
@@ -277,12 +264,8 @@ sfxge_map_mbuf_fast(bus_dma_tag_t tag, b
 
 #define	EFSYS_OPT_VPD 1
 #define	EFSYS_OPT_NVRAM 1
-#define	EFSYS_OPT_NVRAM_FALCON_BOOTROM 0
-#define	EFSYS_OPT_NVRAM_SFT9001	0
-#define	EFSYS_OPT_NVRAM_SFX7101	0
 #define	EFSYS_OPT_BOOTCFG 0
 
-#define	EFSYS_OPT_PCIE_TUNE 0
 #define	EFSYS_OPT_DIAG 0
 #define	EFSYS_OPT_WOL 1
 #define	EFSYS_OPT_RX_SCALE 1

Modified: head/sys/dev/sfxge/common/efx.h
==============================================================================
--- head/sys/dev/sfxge/common/efx.h	Mon May  9 08:35:08 2016	(r299252)
+++ head/sys/dev/sfxge/common/efx.h	Mon May  9 08:37:42 2016	(r299253)
@@ -34,6 +34,7 @@
 #define	_SYS_EFX_H
 
 #include "efsys.h"
+#include "efx_check.h"
 #include "efx_phy_ids.h"
 
 #ifdef	__cplusplus

Modified: head/sys/dev/sfxge/common/efx_check.h
==============================================================================
--- head/sys/dev/sfxge/common/efx_check.h	Mon May  9 08:35:08 2016	(r299252)
+++ head/sys/dev/sfxge/common/efx_check.h	Mon May  9 08:37:42 2016	(r299253)
@@ -43,6 +43,34 @@
  * from client code (and do not reappear in merges from other branches).
  */
 
+#ifdef EFSYS_OPT_FALCON
+# error "FALCON is obsolete and is not supported."
+#else
+/* FIXME: remove this after Falcon support has been removed */
+#define	EFSYS_OPT_FALCON			(0)
+#define	EFSYS_OPT_FALCON_NIC_CFG_OVERRIDE	(0)
+
+#define	EFSYS_OPT_MAC_FALCON_GMAC		(0)
+#define	EFSYS_OPT_MAC_FALCON_XMAC		(0)
+
+#define	EFSYS_OPT_MON_LM87			(0)
+#define	EFSYS_OPT_MON_MAX6647			(0)
+#define	EFSYS_OPT_MON_NULL			(0)
+
+#define	EFSYS_OPT_NVRAM_FALCON_BOOTROM		(0)
+#define	EFSYS_OPT_NVRAM_SFT9001			(0)
+#define	EFSYS_OPT_NVRAM_SFX7101			(0)
+
+#define	EFSYS_OPT_PCIE_TUNE			(0)
+
+#define	EFSYS_OPT_PHY_NULL			(0)
+#define	EFSYS_OPT_PHY_QT2022C2			(0)
+#define	EFSYS_OPT_PHY_QT2025C			(0)
+#define	EFSYS_OPT_PHY_SFT9001			(0)
+#define	EFSYS_OPT_PHY_SFX7101			(0)
+#define	EFSYS_OPT_PHY_TXC43128			(0)
+#endif
+
 /* Support NVRAM based boot config */
 #if EFSYS_OPT_BOOTCFG
 # if !EFSYS_OPT_NVRAM

Modified: head/sys/dev/sfxge/common/efx_impl.h
==============================================================================
--- head/sys/dev/sfxge/common/efx_impl.h	Mon May  9 08:35:08 2016	(r299252)
+++ head/sys/dev/sfxge/common/efx_impl.h	Mon May  9 08:37:42 2016	(r299253)
@@ -34,6 +34,7 @@
 #define	_SYS_EFX_IMPL_H
 
 #include "efsys.h"
+#include "efx_check.h"
 #include "efx.h"
 #include "efx_regs.h"
 #include "efx_regs_ef10.h"
@@ -43,8 +44,6 @@
 #define	ESE_DZ_EV_CODE_DRV_GEN_EV FSE_AZ_EV_CODE_DRV_GEN_EV
 #endif
 
-#include "efx_check.h"
-
 
 #if EFSYS_OPT_FALCON
 #include "falcon_impl.h"


More information about the svn-src-head mailing list