Page MenuHomeFreeBSD
Files F147219872

D4867.diff
No OneTemporary
Actions

D4867.diff
View Options

Index: head/sys/dev/sfxge/common/efx_nic.c
===================================================================
--- head/sys/dev/sfxge/common/efx_nic.c
+++ head/sys/dev/sfxge/common/efx_nic.c
@@ -291,7 +291,7 @@
hunt_nic_get_vi_pool, /* eno_get_vi_pool */
hunt_nic_get_bar_region, /* eno_get_bar_region */
#if EFSYS_OPT_DIAG
- hunt_sram_test, /* eno_sram_test */
+ ef10_sram_test, /* eno_sram_test */
hunt_nic_register_test, /* eno_register_test */
#endif /* EFSYS_OPT_DIAG */
hunt_nic_fini, /* eno_fini */
Index: head/sys/dev/sfxge/common/efx_sram.c
===================================================================
--- head/sys/dev/sfxge/common/efx_sram.c
+++ head/sys/dev/sfxge/common/efx_sram.c
@@ -55,20 +55,21 @@
EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_NIC);
-#if EFSYS_OPT_HUNTINGTON
- if (enp->en_family == EFX_FAMILY_HUNTINGTON) {
+#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD
+ if (enp->en_family == EFX_FAMILY_HUNTINGTON ||
+ enp->en_family == EFX_FAMILY_MEDFORD) {
/*
* FIXME: the efx_sram_buf_tbl_*() functionality needs to be
* pulled inside the Falcon/Siena queue create/destroy code,
* and then the original functions can be removed (see bug30834
* comment #1). But, for now, we just ensure that they are
- * no-ops for Huntington, to allow bringing up existing drivers
+ * no-ops for EF10, to allow bringing up existing drivers
* without modification.
*/
return (0);
}
-#endif /* EFSYS_OPT_HUNTINGTON */
+#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD */
if (stop >= EFX_BUF_TBL_SIZE) {
rc = EFBIG;
@@ -176,20 +177,21 @@
EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_NIC);
-#if EFSYS_OPT_HUNTINGTON
- if (enp->en_family == EFX_FAMILY_HUNTINGTON) {
+#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD
+ if (enp->en_family == EFX_FAMILY_HUNTINGTON ||
+ enp->en_family == EFX_FAMILY_MEDFORD) {
/*
* FIXME: the efx_sram_buf_tbl_*() functionality needs to be
* pulled inside the Falcon/Siena queue create/destroy code,
* and then the original functions can be removed (see bug30834
* comment #1). But, for now, we just ensure that they are
- * no-ops for Huntington, to allow bringing up existing drivers
+ * no-ops for EF10, to allow bringing up existing drivers
* without modification.
*/
return;
}
-#endif /* EFSYS_OPT_HUNTINGTON */
+#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD */
EFSYS_ASSERT3U(stop, <, EFX_BUF_TBL_SIZE);
Index: head/sys/dev/sfxge/common/hunt_impl.h
===================================================================
--- head/sys/dev/sfxge/common/hunt_impl.h
+++ head/sys/dev/sfxge/common/hunt_impl.h
@@ -562,7 +562,7 @@
#if EFSYS_OPT_DIAG
extern __checkReturn efx_rc_t
-hunt_sram_test(
+ef10_sram_test(
__in efx_nic_t *enp,
__in efx_sram_pattern_fn_t func);
Index: head/sys/dev/sfxge/common/hunt_sram.c
===================================================================
--- head/sys/dev/sfxge/common/hunt_sram.c
+++ head/sys/dev/sfxge/common/hunt_sram.c
@@ -41,7 +41,7 @@
#if EFSYS_OPT_DIAG
__checkReturn efx_rc_t
-hunt_sram_test(
+ef10_sram_test(
__in efx_nic_t *enp,
__in efx_sram_pattern_fn_t func)
{

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 10, 5:34 AM (5 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29452524
Default Alt Text
D4867.diff (3 KB)

Event Timeline