svn commit: r301320 - stable/10/sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Sat Jun  4 14:23:11 2016
New Revision: 301320
URL: https://svnweb.freebsd.org/changeset/base/301320

Log:
  MFC r299254
  
  sfxge(4): remove EFSYS_OPT_PCIE_TUNE
  
  With the removal of Falcon support, this is now dead code.
  
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.

Modified:
  stable/10/sys/dev/sfxge/common/efx.h
  stable/10/sys/dev/sfxge/common/efx_check.h
  stable/10/sys/dev/sfxge/common/efx_impl.h
  stable/10/sys/dev/sfxge/common/efx_nic.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sfxge/common/efx.h
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx.h	Sat Jun  4 14:20:45 2016	(r301319)
+++ stable/10/sys/dev/sfxge/common/efx.h	Sat Jun  4 14:23:11 2016	(r301320)
@@ -149,15 +149,6 @@ extern	__checkReturn	efx_rc_t
 efx_nic_probe(
 	__in		efx_nic_t *enp);
 
-#if EFSYS_OPT_PCIE_TUNE
-
-extern	__checkReturn	efx_rc_t
-efx_nic_pcie_tune(
-	__in		efx_nic_t *enp,
-	unsigned int	nlanes);
-
-#endif	/* EFSYS_OPT_PCIE_TUNE */
-
 extern	__checkReturn	efx_rc_t
 efx_nic_init(
 	__in		efx_nic_t *enp);

Modified: stable/10/sys/dev/sfxge/common/efx_check.h
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_check.h	Sat Jun  4 14:20:45 2016	(r301319)
+++ stable/10/sys/dev/sfxge/common/efx_check.h	Sat Jun  4 14:23:11 2016	(r301320)
@@ -61,8 +61,6 @@
 #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)
@@ -280,12 +278,9 @@
 # endif
 #endif /* EFSYS_OPT_NVRAM_SFX7101 */
 
-/* Support PCIe interface tuning */
-#if EFSYS_OPT_PCIE_TUNE
-# if !EFSYS_OPT_FALCON
-#  error "PCIE_TUNE requires FALCON"
-# endif
-#endif /* EFSYS_OPT_PCIE_TUNE */
+#ifdef EFSYS_OPT_PCIE_TUNE
+# error "PCIE_TUNE is obsolete and is not supported."
+#endif
 
 /* Obsolete option */
 #ifdef EFSYS_OPT_PHY_BIST

Modified: stable/10/sys/dev/sfxge/common/efx_impl.h
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_impl.h	Sat Jun  4 14:20:45 2016	(r301319)
+++ stable/10/sys/dev/sfxge/common/efx_impl.h	Sat Jun  4 14:23:11 2016	(r301320)
@@ -667,9 +667,6 @@ struct efx_nic_s {
 			const uint8_t		*enu_forced_cfg;
 #endif	/* EFSYS_OPT_FALCON_NIC_CFG_OVERRIDE */
 			uint8_t			enu_mon_devid;
-#if EFSYS_OPT_PCIE_TUNE
-			unsigned int 		enu_nlanes;
-#endif	/* EFSYS_OPT_PCIE_TUNE */
 			uint16_t		enu_board_rev;
 			boolean_t		enu_internal_sram;
 			uint8_t			enu_sram_num_bank;

Modified: stable/10/sys/dev/sfxge/common/efx_nic.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_nic.c	Sat Jun  4 14:20:45 2016	(r301319)
+++ stable/10/sys/dev/sfxge/common/efx_nic.c	Sat Jun  4 14:23:11 2016	(r301320)
@@ -467,26 +467,6 @@ fail1:
 	return (rc);
 }
 
-#if EFSYS_OPT_PCIE_TUNE
-
-	__checkReturn	efx_rc_t
-efx_nic_pcie_tune(
-	__in		efx_nic_t *enp,
-	unsigned int	nlanes)
-{
-	EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
-	EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_PROBE);
-	EFSYS_ASSERT(!(enp->en_mod_flags & EFX_MOD_NIC));
-
-#if EFSYS_OPT_FALCON
-	if (enp->en_family == EFX_FAMILY_FALCON)
-		return (falcon_nic_pcie_tune(enp, nlanes));
-#endif
-	return (ENOTSUP);
-}
-
-#endif	/* EFSYS_OPT_PCIE_TUNE */
-
 	__checkReturn	efx_rc_t
 efx_nic_set_drv_limits(
 	__inout		efx_nic_t *enp,