Author: arybchik
Date: Sat Jun 4 14:52:32 2016
New Revision: 301336
URL: https://svnweb.freebsd.org/changeset/base/301336
Log:
MFC r299407
sfxge(4): make efx_sram_test Siena-only
Submitted by: Andy Moreton <amoreton at solarflare.com>
Sponsored by: Solarflare Communications, Inc.
Deleted:
stable/10/sys/dev/sfxge/common/hunt_sram.c
Modified:
stable/10/sys/conf/files.amd64
stable/10/sys/dev/sfxge/common/efx_impl.h
stable/10/sys/dev/sfxge/common/efx_nic.c
stable/10/sys/dev/sfxge/common/efx_sram.c
stable/10/sys/dev/sfxge/common/hunt_impl.h
stable/10/sys/modules/sfxge/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/conf/files.amd64
==============================================================================
--- stable/10/sys/conf/files.amd64 Sat Jun 4 14:51:34 2016
(r301335)
+++ stable/10/sys/conf/files.amd64 Sat Jun 4 14:52:32 2016
(r301336)
@@ -342,7 +342,6 @@ dev/sfxge/common/hunt_nic.c optional sfx
dev/sfxge/common/hunt_nvram.c optional sfxge pci
dev/sfxge/common/hunt_phy.c optional sfxge pci
dev/sfxge/common/hunt_rx.c optional sfxge pci
-dev/sfxge/common/hunt_sram.c optional sfxge pci
dev/sfxge/common/hunt_tx.c optional sfxge pci
dev/sfxge/common/hunt_vpd.c optional sfxge pci
dev/sfxge/common/medford_nic.c optional sfxge pci
Modified: stable/10/sys/dev/sfxge/common/efx_impl.h
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_impl.h Sat Jun 4 14:51:34 2016
(r301335)
+++ stable/10/sys/dev/sfxge/common/efx_impl.h Sat Jun 4 14:52:32 2016
(r301336)
@@ -349,7 +349,6 @@ typedef struct efx_nic_ops_s {
efx_rc_t (*eno_get_bar_region)(efx_nic_t *, efx_nic_region_t,
uint32_t *, size_t *);
#if EFSYS_OPT_DIAG
- efx_rc_t (*eno_sram_test)(efx_nic_t *, efx_sram_pattern_fn_t);
efx_rc_t (*eno_register_test)(efx_nic_t *);
#endif /* EFSYS_OPT_DIAG */
void (*eno_fini)(efx_nic_t *);
Modified: stable/10/sys/dev/sfxge/common/efx_nic.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_nic.c Sat Jun 4 14:51:34 2016
(r301335)
+++ stable/10/sys/dev/sfxge/common/efx_nic.c Sat Jun 4 14:52:32 2016
(r301336)
@@ -188,7 +188,6 @@ static efx_nic_ops_t __efx_nic_siena_ops
NULL, /* eno_get_vi_pool */
NULL, /* eno_get_bar_region */
#if EFSYS_OPT_DIAG
- siena_sram_test, /* eno_sram_test */
siena_nic_register_test, /* eno_register_test */
#endif /* EFSYS_OPT_DIAG */
siena_nic_fini, /* eno_fini */
@@ -208,7 +207,6 @@ static efx_nic_ops_t __efx_nic_hunt_ops
ef10_nic_get_vi_pool, /* eno_get_vi_pool */
ef10_nic_get_bar_region, /* eno_get_bar_region */
#if EFSYS_OPT_DIAG
- ef10_sram_test, /* eno_sram_test */
ef10_nic_register_test, /* eno_register_test */
#endif /* EFSYS_OPT_DIAG */
ef10_nic_fini, /* eno_fini */
@@ -228,7 +226,6 @@ static efx_nic_ops_t __efx_nic_medford_o
ef10_nic_get_vi_pool, /* eno_get_vi_pool */
ef10_nic_get_bar_region, /* eno_get_bar_region */
#if EFSYS_OPT_DIAG
- ef10_sram_test, /* eno_sram_test */
ef10_nic_register_test, /* eno_register_test */
#endif /* EFSYS_OPT_DIAG */
ef10_nic_fini, /* eno_fini */
Modified: stable/10/sys/dev/sfxge/common/efx_sram.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_sram.c Sat Jun 4 14:51:34 2016
(r301335)
+++ stable/10/sys/dev/sfxge/common/efx_sram.c Sat Jun 4 14:52:32 2016
(r301336)
@@ -310,7 +310,6 @@ efx_sram_test(
__in efx_nic_t *enp,
__in efx_pattern_type_t type)
{
- efx_nic_ops_t *enop = enp->en_enop;
efx_sram_pattern_fn_t func;
EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
@@ -321,11 +320,15 @@ efx_sram_test(
EFSYS_ASSERT(!(enp->en_mod_flags & EFX_MOD_TX));
EFSYS_ASSERT(!(enp->en_mod_flags & EFX_MOD_EV));
+ /* SRAM testing is only available on Siena. */
+ if (enp->en_family != EFX_FAMILY_SIENA)
+ return (0);
+
/* Select pattern generator */
EFSYS_ASSERT3U(type, <, EFX_PATTERN_NTYPES);
func = __efx_sram_pattern_fns[type];
- return (enop->eno_sram_test(enp, func));
+ return (siena_sram_test(enp, func));
}
#endif /* EFSYS_OPT_DIAG */
Modified: stable/10/sys/dev/sfxge/common/hunt_impl.h
==============================================================================
--- stable/10/sys/dev/sfxge/common/hunt_impl.h Sat Jun 4 14:51:34 2016
(r301335)
+++ stable/10/sys/dev/sfxge/common/hunt_impl.h Sat Jun 4 14:52:32 2016
(r301336)
@@ -653,18 +653,6 @@ hunt_bist_stop(
#endif /* EFSYS_OPT_BIST */
-/* SRAM */
-
-#if EFSYS_OPT_DIAG
-
-extern __checkReturn efx_rc_t
-ef10_sram_test(
- __in efx_nic_t *enp,
- __in efx_sram_pattern_fn_t func);
-
-#endif /* EFSYS_OPT_DIAG */
-
-
/* TX */
extern __checkReturn efx_rc_t
Modified: stable/10/sys/modules/sfxge/Makefile
==============================================================================
--- stable/10/sys/modules/sfxge/Makefile Sat Jun 4 14:51:34 2016
(r301335)
+++ stable/10/sys/modules/sfxge/Makefile Sat Jun 4 14:52:32 2016
(r301336)
@@ -34,7 +34,7 @@ SRCS+= siena_flash.h siena_impl.h
SRCS+= ef10_impl.h
SRCS+= hunt_ev.c hunt_intr.c hunt_mac.c hunt_mcdi.c hunt_nic.c
-SRCS+= hunt_nvram.c hunt_rx.c hunt_phy.c hunt_sram.c hunt_tx.c hunt_vpd.c
+SRCS+= hunt_nvram.c hunt_rx.c hunt_phy.c hunt_tx.c hunt_vpd.c
SRCS+= hunt_filter.c
SRCS+= hunt_impl.h
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
