Author: arybchik
Date: Tue May 10 07:01:06 2016
New Revision: 299320
URL: https://svnweb.freebsd.org/changeset/base/299320
Log:
sfxge(4): remove EFSYS_OPT_FALCON
Submitted by: Andy Moreton <amoreton at solarflare.com>
Sponsored by: Solarflare Communications, Inc.
MFC after: 1 week
Modified:
head/sys/dev/sfxge/common/efx_check.h
head/sys/dev/sfxge/common/efx_ev.c
head/sys/dev/sfxge/common/efx_filter.c
head/sys/dev/sfxge/common/efx_impl.h
head/sys/dev/sfxge/common/efx_intr.c
head/sys/dev/sfxge/common/efx_mac.c
head/sys/dev/sfxge/common/efx_mcdi.c
head/sys/dev/sfxge/common/efx_nic.c
head/sys/dev/sfxge/common/efx_nvram.c
head/sys/dev/sfxge/common/efx_phy.c
head/sys/dev/sfxge/common/efx_rx.c
head/sys/dev/sfxge/common/efx_tx.c
head/sys/dev/sfxge/common/efx_vpd.c
Modified: head/sys/dev/sfxge/common/efx_check.h
==============================================================================
--- head/sys/dev/sfxge/common/efx_check.h Tue May 10 06:53:38 2016
(r299319)
+++ head/sys/dev/sfxge/common/efx_check.h Tue May 10 07:01:06 2016
(r299320)
@@ -47,7 +47,6 @@
# 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)
@@ -78,32 +77,29 @@
/* Verify chip implements accessed registers */
#if EFSYS_OPT_CHECK_REG
-# if !(EFSYS_OPT_FALCON || EFSYS_OPT_SIENA || \
- EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
-# error "CHECK_REG requires FALCON or SIENA or HUNTINGTON or MEDFORD"
+# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
+# error "CHECK_REG requires SIENA or HUNTINGTON or MEDFORD"
# endif
#endif /* EFSYS_OPT_CHECK_REG */
/* Decode fatal errors */
#if EFSYS_OPT_DECODE_INTR_FATAL
-# if !(EFSYS_OPT_FALCON || EFSYS_OPT_SIENA)
-# error "INTR_FATAL requires FALCON or SIENA"
+# if !EFSYS_OPT_SIENA
+# error "INTR_FATAL requires SIENA"
# endif
#endif /* EFSYS_OPT_DECODE_INTR_FATAL */
/* Support diagnostic hardware tests */
#if EFSYS_OPT_DIAG
-# if !(EFSYS_OPT_FALCON || EFSYS_OPT_SIENA || \
- EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
-# error "DIAG requires FALCON or SIENA or HUNTINGTON or MEDFORD"
+# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
+# error "DIAG requires SIENA or HUNTINGTON or MEDFORD"
# endif
#endif /* EFSYS_OPT_DIAG */
/* Support optimized EVQ data access */
#if EFSYS_OPT_EV_PREFETCH
-# if !(EFSYS_OPT_FALCON || EFSYS_OPT_SIENA || \
- EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
-# error "EV_PREFETCH requires FALCON or SIENA or HUNTINGTON or MEDFORD"
+# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
+# error "EV_PREFETCH requires SIENA or HUNTINGTON or MEDFORD"
# endif
#endif /* EFSYS_OPT_EV_PREFETCH */
@@ -116,9 +112,8 @@
/* Support hardware packet filters */
#if EFSYS_OPT_FILTER
-# if !(EFSYS_OPT_FALCON || EFSYS_OPT_SIENA || \
- EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
-# error "FILTER requires FALCON or SIENA or HUNTINGTON or MEDFORD"
+# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
+# error "FILTER requires SIENA or HUNTINGTON or MEDFORD"
# endif
#endif /* EFSYS_OPT_FILTER */
@@ -130,9 +125,8 @@
/* Support hardware loopback modes */
#if EFSYS_OPT_LOOPBACK
-# if !(EFSYS_OPT_FALCON || EFSYS_OPT_SIENA || \
- EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
-# error "LOOPBACK requires FALCON or SIENA or HUNTINGTON or MEDFORD"
+# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
+# error "LOOPBACK requires SIENA or HUNTINGTON or MEDFORD"
# endif
#endif /* EFSYS_OPT_LOOPBACK */
@@ -152,9 +146,8 @@
/* Support MAC statistics */
#if EFSYS_OPT_MAC_STATS
-# if !(EFSYS_OPT_FALCON || EFSYS_OPT_SIENA || \
- EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
-# error "MAC_STATS requires FALCON or SIENA or HUNTINGTON or MEDFORD"
+# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
+# error "MAC_STATS requires SIENA or HUNTINGTON or MEDFORD"
# endif
#endif /* EFSYS_OPT_MAC_STATS */
@@ -218,9 +211,8 @@
/* Support monitor statistics (voltage/temperature) */
#if EFSYS_OPT_MON_STATS
-# if !(EFSYS_OPT_FALCON || EFSYS_OPT_SIENA || \
- EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
-# error "MON_STATS requires FALCON or SIENA or HUNTINGTON or MEDFORD"
+# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
+# error "MON_STATS requires SIENA or HUNTINGTON or MEDFORD"
# endif
#endif /* EFSYS_OPT_MON_STATS */
@@ -242,9 +234,8 @@
/* Support non volatile configuration */
#if EFSYS_OPT_NVRAM
-# if !(EFSYS_OPT_FALCON || EFSYS_OPT_SIENA || \
- EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
-# error "NVRAM requires FALCON or SIENA or HUNTINGTON or MEDFORD"
+# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
+# error "NVRAM requires SIENA or HUNTINGTON or MEDFORD"
# endif
#endif /* EFSYS_OPT_NVRAM */
@@ -289,15 +280,15 @@
/* Support PHY flags */
#if EFSYS_OPT_PHY_FLAGS
-# if !(EFSYS_OPT_FALCON || EFSYS_OPT_SIENA)
-# error "PHY_FLAGS requires FALCON or SIENA"
+# if !EFSYS_OPT_SIENA
+# error "PHY_FLAGS requires SIENA"
# endif
#endif /* EFSYS_OPT_PHY_FLAGS */
/* Support for PHY LED control */
#if EFSYS_OPT_PHY_LED_CONTROL
-# if !(EFSYS_OPT_FALCON || EFSYS_OPT_SIENA)
-# error "PHY_LED_CONTROL requires FALCON or SIENA"
+# if !EFSYS_OPT_SIENA
+# error "PHY_LED_CONTROL requires SIENA"
# endif
#endif /* EFSYS_OPT_PHY_LED_CONTROL */
@@ -315,8 +306,8 @@
/* Support PHY properties */
#if EFSYS_OPT_PHY_PROPS
-# if !(EFSYS_OPT_FALCON || EFSYS_OPT_SIENA)
-# error "PHY_PROPS requires FALCON or SIENA"
+# if !EFSYS_OPT_SIENA
+# error "PHY_PROPS requires SIENA"
# endif
#endif /* EFSYS_OPT_PHY_PROPS */
@@ -350,8 +341,8 @@
/* Support PHY statistics */
#if EFSYS_OPT_PHY_STATS
-# if !(EFSYS_OPT_FALCON || EFSYS_OPT_SIENA)
-# error "PHY_STATS requires FALCON or SIENA"
+# if !EFSYS_OPT_SIENA
+# error "PHY_STATS requires SIENA"
# endif
#endif /* EFSYS_OPT_PHY_STATS */
@@ -364,9 +355,8 @@
/* Support EVQ/RXQ/TXQ statistics */
#if EFSYS_OPT_QSTATS
-# if !(EFSYS_OPT_FALCON || EFSYS_OPT_SIENA || \
- EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
-# error "QSTATS requires FALCON or SIENA or HUNTINGTON or MEDFORD"
+# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
+# error "QSTATS requires SIENA or HUNTINGTON or MEDFORD"
# endif
#endif /* EFSYS_OPT_QSTATS */
@@ -377,17 +367,15 @@
/* Support receive scaling (RSS) */
#if EFSYS_OPT_RX_SCALE
-# if !(EFSYS_OPT_FALCON || EFSYS_OPT_SIENA || \
- EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
-# error "RX_SCALE requires FALCON or SIENA or HUNTINGTON or MEDFORD"
+# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
+# error "RX_SCALE requires SIENA or HUNTINGTON or MEDFORD"
# endif
#endif /* EFSYS_OPT_RX_SCALE */
/* Support receive scatter DMA */
#if EFSYS_OPT_RX_SCATTER
-# if !(EFSYS_OPT_FALCON || EFSYS_OPT_SIENA || \
- EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
-# error "RX_SCATTER requires FALCON or SIENA or HUNTINGTON or MEDFORD"
+# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
+# error "RX_SCATTER requires SIENA or HUNTINGTON or MEDFORD"
# endif
#endif /* EFSYS_OPT_RX_SCATTER */
@@ -398,9 +386,8 @@
/* Support PCI Vital Product Data (VPD) */
#if EFSYS_OPT_VPD
-# if !(EFSYS_OPT_FALCON || EFSYS_OPT_SIENA || \
- EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
-# error "VPD requires FALCON or SIENA or HUNTINGTON or MEDFORD"
+# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
+# error "VPD requires SIENA or HUNTINGTON or MEDFORD"
# endif
#endif /* EFSYS_OPT_VPD */
@@ -418,9 +405,8 @@
/* Support BIST */
#if EFSYS_OPT_BIST
-# if !(EFSYS_OPT_FALCON || EFSYS_OPT_SIENA || \
- EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
-# error "BIST requires FALCON or SIENA or HUNTINGTON or MEDFORD"
+# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
+# error "BIST requires SIENA or HUNTINGTON or MEDFORD"
# endif
#endif /* EFSYS_OPT_BIST */
Modified: head/sys/dev/sfxge/common/efx_ev.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_ev.c Tue May 10 06:53:38 2016
(r299319)
+++ head/sys/dev/sfxge/common/efx_ev.c Tue May 10 07:01:06 2016
(r299320)
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
-#if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA
+#if EFSYS_OPT_SIENA
static __checkReturn efx_rc_t
falconsiena_ev_init(
@@ -106,22 +106,7 @@ falconsiena_ev_qstats_update(
#endif
-#endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */
-
-#if EFSYS_OPT_FALCON
-static efx_ev_ops_t __efx_ev_falcon_ops = {
- falconsiena_ev_init, /* eevo_init */
- falconsiena_ev_fini, /* eevo_fini */
- falconsiena_ev_qcreate, /* eevo_qcreate */
- falconsiena_ev_qdestroy, /* eevo_qdestroy */
- falconsiena_ev_qprime, /* eevo_qprime */
- falconsiena_ev_qpost, /* eevo_qpost */
- falconsiena_ev_qmoderate, /* eevo_qmoderate */
-#if EFSYS_OPT_QSTATS
- falconsiena_ev_qstats_update, /* eevo_qstats_update */
-#endif
-};
-#endif /* EFSYS_OPT_FALCON */
+#endif /* EFSYS_OPT_SIENA */
#if EFSYS_OPT_SIENA
static efx_ev_ops_t __efx_ev_siena_ops = {
@@ -170,12 +155,6 @@ efx_ev_init(
}
switch (enp->en_family) {
-#if EFSYS_OPT_FALCON
- case EFX_FAMILY_FALCON:
- eevop = (efx_ev_ops_t *)&__efx_ev_falcon_ops;
- break;
-#endif /* EFSYS_OPT_FALCON */
-
#if EFSYS_OPT_SIENA
case EFX_FAMILY_SIENA:
eevop = (efx_ev_ops_t *)&__efx_ev_siena_ops;
@@ -451,7 +430,7 @@ efx_ev_qstats_update(
#endif /* EFSYS_OPT_QSTATS */
-#if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA
+#if EFSYS_OPT_SIENA
static __checkReturn efx_rc_t
falconsiena_ev_init(
@@ -1362,7 +1341,7 @@ fail1:
return (rc);
}
-#endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */
+#endif /* EFSYS_OPT_SIENA */
#if EFSYS_OPT_QSTATS
#if EFSYS_OPT_NAMES
@@ -1421,7 +1400,7 @@ efx_ev_qstat_name(
#endif /* EFSYS_OPT_NAMES */
#endif /* EFSYS_OPT_QSTATS */
-#if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA
+#if EFSYS_OPT_SIENA
#if EFSYS_OPT_QSTATS
static void
@@ -1467,4 +1446,4 @@ falconsiena_ev_fini(
_NOTE(ARGUNUSED(enp))
}
-#endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */
+#endif /* EFSYS_OPT_SIENA */
Modified: head/sys/dev/sfxge/common/efx_filter.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_filter.c Tue May 10 06:53:38 2016
(r299319)
+++ head/sys/dev/sfxge/common/efx_filter.c Tue May 10 07:01:06 2016
(r299320)
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
#if EFSYS_OPT_FILTER
-#if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA
+#if EFSYS_OPT_SIENA
static __checkReturn efx_rc_t
falconsiena_filter_init(
@@ -68,19 +68,7 @@ falconsiena_filter_supported_filters(
__out uint32_t *list,
__out size_t *length);
-#endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */
-
-#if EFSYS_OPT_FALCON
-static efx_filter_ops_t __efx_filter_falcon_ops = {
- falconsiena_filter_init, /* efo_init */
- falconsiena_filter_fini, /* efo_fini */
- falconsiena_filter_restore, /* efo_restore */
- falconsiena_filter_add, /* efo_add */
- falconsiena_filter_delete, /* efo_delete */
- falconsiena_filter_supported_filters, /* efo_supported_filters */
- NULL, /* efo_reconfigure */
-};
-#endif /* EFSYS_OPT_FALCON */
+#endif /* EFSYS_OPT_SIENA */
#if EFSYS_OPT_SIENA
static efx_filter_ops_t __efx_filter_siena_ops = {
@@ -172,12 +160,6 @@ efx_filter_init(
EFSYS_ASSERT(!(enp->en_mod_flags & EFX_MOD_FILTER));
switch (enp->en_family) {
-#if EFSYS_OPT_FALCON
- case EFX_FAMILY_FALCON:
- efop = (efx_filter_ops_t *)&__efx_filter_falcon_ops;
- break;
-#endif /* EFSYS_OPT_FALCON */
-
#if EFSYS_OPT_SIENA
case EFX_FAMILY_SIENA:
efop = (efx_filter_ops_t *)&__efx_filter_siena_ops;
@@ -428,7 +410,7 @@ efx_filter_spec_set_mc_def(
-#if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA
+#if EFSYS_OPT_SIENA
/*
* "Fudge factors" - difference between programmed value and actual depth.
@@ -1091,13 +1073,6 @@ falconsiena_filter_init(
enp->en_filter.ef_falconsiena_filter = fsfp;
switch (enp->en_family) {
-#if EFSYS_OPT_FALCON
- case EFX_FAMILY_FALCON:
- fsftp = &fsfp->fsf_tbl[EFX_FS_FILTER_TBL_RX_IP];
- fsftp->fsft_size = FR_AZ_RX_FILTER_TBL0_ROWS;
- break;
-#endif /* EFSYS_OPT_FALCON */
-
#if EFSYS_OPT_SIENA
case EFX_FAMILY_SIENA:
fsftp = &fsfp->fsf_tbl[EFX_FS_FILTER_TBL_RX_IP];
@@ -1434,6 +1409,6 @@ fail1:
#undef MAX_SUPPORTED
-#endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */
+#endif /* EFSYS_OPT_SIENA */
#endif /* EFSYS_OPT_FILTER */
Modified: head/sys/dev/sfxge/common/efx_impl.h
==============================================================================
--- head/sys/dev/sfxge/common/efx_impl.h Tue May 10 06:53:38 2016
(r299319)
+++ head/sys/dev/sfxge/common/efx_impl.h Tue May 10 07:01:06 2016
(r299320)
@@ -45,10 +45,6 @@
#endif
-#if EFSYS_OPT_FALCON
-#include "falcon_impl.h"
-#endif /* EFSYS_OPT_FALCON */
-
#if EFSYS_OPT_SIENA
#include "siena_impl.h"
#endif /* EFSYS_OPT_SIENA */
@@ -443,9 +439,9 @@ typedef struct falconsiena_filter_s {
} falconsiena_filter_t;
typedef struct efx_filter_s {
-#if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA
+#if EFSYS_OPT_SIENA
falconsiena_filter_t *ef_falconsiena_filter;
-#endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */
+#endif /* EFSYS_OPT_SIENA */
#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD
ef10_filter_table_t *ef_ef10_filter_table;
#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD */
@@ -668,21 +664,6 @@ struct efx_nic_s {
efx_lic_ops_t *en_elop;
#endif
union {
-#if EFSYS_OPT_FALCON
- struct {
- falcon_spi_dev_t enu_fsd[FALCON_SPI_NTYPES];
- falcon_i2c_t enu_fip;
- boolean_t enu_i2c_locked;
-#if EFSYS_OPT_FALCON_NIC_CFG_OVERRIDE
- const uint8_t *enu_forced_cfg;
-#endif /* EFSYS_OPT_FALCON_NIC_CFG_OVERRIDE */
- uint8_t enu_mon_devid;
- uint16_t enu_board_rev;
- boolean_t enu_internal_sram;
- uint8_t enu_sram_num_bank;
- uint8_t enu_sram_bank_size;
- } falcon;
-#endif /* EFSYS_OPT_FALCON */
#if EFSYS_OPT_SIENA
struct {
#if EFSYS_OPT_NVRAM || EFSYS_OPT_VPD
Modified: head/sys/dev/sfxge/common/efx_intr.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_intr.c Tue May 10 06:53:38 2016
(r299319)
+++ head/sys/dev/sfxge/common/efx_intr.c Tue May 10 07:01:06 2016
(r299320)
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
#include "efx_impl.h"
-#if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA
+#if EFSYS_OPT_SIENA
static __checkReturn efx_rc_t
falconsiena_intr_init(
@@ -85,22 +85,8 @@ falconsiena_intr_check_fatal(
__in efx_nic_t *enp);
-#endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */
-
+#endif /* EFSYS_OPT_SIENA */
-#if EFSYS_OPT_FALCON
-static efx_intr_ops_t __efx_intr_falcon_ops = {
- falconsiena_intr_init, /* eio_init */
- falconsiena_intr_enable, /* eio_enable */
- falconsiena_intr_disable, /* eio_disable */
- falconsiena_intr_disable_unlocked, /* eio_disable_unlocked */
- falconsiena_intr_trigger, /* eio_trigger */
- falconsiena_intr_status_line, /* eio_status_line */
- falconsiena_intr_status_message, /* eio_status_message */
- falconsiena_intr_fatal, /* eio_fatal */
- falconsiena_intr_fini, /* eio_fini */
-};
-#endif /* EFSYS_OPT_FALCON */
#if EFSYS_OPT_SIENA
static efx_intr_ops_t __efx_intr_siena_ops = {
@@ -155,12 +141,6 @@ efx_intr_init(
enp->en_mod_flags |= EFX_MOD_INTR;
switch (enp->en_family) {
-#if EFSYS_OPT_FALCON
- case EFX_FAMILY_FALCON:
- eiop = (efx_intr_ops_t *)&__efx_intr_falcon_ops;
- break;
-#endif /* EFSYS_OPT_FALCON */
-
#if EFSYS_OPT_SIENA
case EFX_FAMILY_SIENA:
eiop = (efx_intr_ops_t *)&__efx_intr_siena_ops;
@@ -320,7 +300,7 @@ efx_intr_fatal(
/* ************************************************************************* */
/* ************************************************************************* */
-#if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA
+#if EFSYS_OPT_SIENA
static __checkReturn efx_rc_t
falconsiena_intr_init(
@@ -607,4 +587,4 @@ falconsiena_intr_fini(
EFX_BAR_WRITEO(enp, FR_AZ_INT_ADR_REG_KER, &oword);
}
-#endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */
+#endif /* EFSYS_OPT_SIENA */
Modified: head/sys/dev/sfxge/common/efx_mac.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_mac.c Tue May 10 06:53:38 2016
(r299319)
+++ head/sys/dev/sfxge/common/efx_mac.c Tue May 10 07:01:06 2016
(r299320)
@@ -42,13 +42,13 @@ __FBSDID("$FreeBSD$");
#include "falcon_xmac.h"
#endif
-#if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA
+#if EFSYS_OPT_SIENA
static __checkReturn efx_rc_t
falconsiena_mac_multicast_list_set(
__in efx_nic_t *enp);
-#endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */
+#endif /* EFSYS_OPT_SIENA */
#if EFSYS_OPT_MAC_FALCON_GMAC
static efx_mac_ops_t __efx_falcon_gmac_ops = {
@@ -812,45 +812,6 @@ efx_mac_select(
}
#endif
-#if EFSYS_OPT_FALCON
- switch (epp->ep_link_mode) {
-#if EFSYS_OPT_MAC_FALCON_GMAC
- case EFX_LINK_100HDX:
- case EFX_LINK_100FDX:
- case EFX_LINK_1000HDX:
- case EFX_LINK_1000FDX:
- type = EFX_MAC_FALCON_GMAC;
- goto chosen;
-#endif /* EFSYS_OPT_FALCON_GMAC */
-
-#if EFSYS_OPT_MAC_FALCON_XMAC
- case EFX_LINK_10000FDX:
- type = EFX_MAC_FALCON_XMAC;
- goto chosen;
-#endif /* EFSYS_OPT_FALCON_XMAC */
-
- default:
-#if EFSYS_OPT_MAC_FALCON_GMAC && EFSYS_OPT_MAC_FALCON_XMAC
- /* Only initialise a MAC supported by the PHY */
- if (epp->ep_phy_cap_mask &
- ((1 << EFX_PHY_CAP_1000FDX) |
- (1 << EFX_PHY_CAP_1000HDX) |
- (1 << EFX_PHY_CAP_100FDX) |
- (1 << EFX_PHY_CAP_100HDX) |
- (1 << EFX_PHY_CAP_10FDX) |
- (1 << EFX_PHY_CAP_10FDX)))
- type = EFX_MAC_FALCON_GMAC;
- else
- type = EFX_MAC_FALCON_XMAC;
-#elif EFSYS_OPT_MAC_FALCON_GMAC
- type = EFX_MAC_FALCON_GMAC;
-#else
- type = EFX_MAC_FALCON_XMAC;
-#endif
- goto chosen;
- }
-#endif /* EFSYS_OPT_FALCON */
-
chosen:
EFSYS_ASSERT(type != EFX_MAC_INVALID);
EFSYS_ASSERT3U(type, <, EFX_MAC_NTYPES);
@@ -876,7 +837,7 @@ fail1:
}
-#if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA
+#if EFSYS_OPT_SIENA
#define EFX_MAC_HASH_BITS (1 << 8)
@@ -943,4 +904,4 @@ fail1:
return (rc);
}
-#endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */
+#endif /* EFSYS_OPT_SIENA */
Modified: head/sys/dev/sfxge/common/efx_mcdi.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_mcdi.c Tue May 10 06:53:38 2016
(r299319)
+++ head/sys/dev/sfxge/common/efx_mcdi.c Tue May 10 07:01:06 2016
(r299320)
@@ -99,13 +99,6 @@ efx_mcdi_init(
EFSYS_ASSERT3U(enp->en_mod_flags, ==, 0);
switch (enp->en_family) {
-#if EFSYS_OPT_FALCON
- case EFX_FAMILY_FALCON:
- emcop = NULL;
- emtp = NULL;
- break;
-#endif /* EFSYS_OPT_FALCON */
-
#if EFSYS_OPT_SIENA
case EFX_FAMILY_SIENA:
emcop = (efx_mcdi_ops_t *)&__efx_mcdi_siena_ops;
Modified: head/sys/dev/sfxge/common/efx_nic.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_nic.c Tue May 10 06:53:38 2016
(r299319)
+++ head/sys/dev/sfxge/common/efx_nic.c Tue May 10 07:01:06 2016
(r299320)
@@ -42,12 +42,6 @@ efx_family(
{
if (venid == EFX_PCI_VENID_SFC) {
switch (devid) {
-#if EFSYS_OPT_FALCON
- case EFX_PCI_DEVID_FALCON:
- *efp = EFX_FAMILY_FALCON;
- return (0);
-#endif /* EFSYS_OPT_FALCON */
-
#if EFSYS_OPT_SIENA
case EFX_PCI_DEVID_SIENA_F1_UNINIT:
/*
@@ -101,6 +95,7 @@ efx_family(
return (0);
#endif /* EFSYS_OPT_MEDFORD */
+ case EFX_PCI_DEVID_FALCON: /* Obsolete, not supported */
default:
break;
}
@@ -148,11 +143,6 @@ efx_infer_family(
family = EFX_FAMILY_HUNTINGTON;
goto out;
#endif
- } else {
-#if EFSYS_OPT_FALCON
- family = EFX_FAMILY_FALCON;
- goto out;
-#endif
}
}
rc = ENOTSUP;
@@ -240,26 +230,6 @@ fail1:
return (rc);
}
-#if EFSYS_OPT_FALCON
-
-static efx_nic_ops_t __efx_nic_falcon_ops = {
- falcon_nic_probe, /* eno_probe */
- NULL, /* eno_board_cfg */
- NULL, /* eno_set_drv_limits */
- falcon_nic_reset, /* eno_reset */
- falcon_nic_init, /* eno_init */
- NULL, /* eno_get_vi_pool */
- NULL, /* eno_get_bar_region */
-#if EFSYS_OPT_DIAG
- falcon_sram_test, /* eno_sram_test */
- falcon_nic_register_test, /* eno_register_test */
-#endif /* EFSYS_OPT_DIAG */
- falcon_nic_fini, /* eno_fini */
- falcon_nic_unprobe, /* eno_unprobe */
-};
-
-#endif /* EFSYS_OPT_FALCON */
-
#if EFSYS_OPT_SIENA
static efx_nic_ops_t __efx_nic_siena_ops = {
@@ -346,13 +316,6 @@ efx_nic_create(
enp->en_magic = EFX_NIC_MAGIC;
switch (family) {
-#if EFSYS_OPT_FALCON
- case EFX_FAMILY_FALCON:
- enp->en_enop = (efx_nic_ops_t *)&__efx_nic_falcon_ops;
- enp->en_features = 0;
- break;
-#endif /* EFSYS_OPT_FALCON */
-
#if EFSYS_OPT_SIENA
case EFX_FAMILY_SIENA:
enp->en_enop = (efx_nic_ops_t *)&__efx_nic_siena_ops;
Modified: head/sys/dev/sfxge/common/efx_nvram.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_nvram.c Tue May 10 06:53:38 2016
(r299319)
+++ head/sys/dev/sfxge/common/efx_nvram.c Tue May 10 07:01:06 2016
(r299320)
@@ -36,26 +36,6 @@ __FBSDID("$FreeBSD$");
#if EFSYS_OPT_NVRAM
-#if EFSYS_OPT_FALCON
-
-static efx_nvram_ops_t __efx_nvram_falcon_ops = {
-#if EFSYS_OPT_DIAG
- falcon_nvram_test, /* envo_test */
-#endif /* EFSYS_OPT_DIAG */
- falcon_nvram_type_to_partn, /* envo_type_to_partn */
- falcon_nvram_partn_size, /* envo_partn_size */
- falcon_nvram_partn_rw_start, /* envo_partn_rw_start */
- falcon_nvram_partn_read, /* envo_partn_read */
- falcon_nvram_partn_erase, /* envo_partn_erase */
- falcon_nvram_partn_write, /* envo_partn_write */
- falcon_nvram_partn_rw_finish, /* envo_partn_rw_finish */
- falcon_nvram_partn_get_version, /* envo_partn_get_version */
- falcon_nvram_partn_set_version, /* envo_partn_set_version */
- NULL, /* envo_partn_validate */
-};
-
-#endif /* EFSYS_OPT_FALCON */
-
#if EFSYS_OPT_SIENA
static efx_nvram_ops_t __efx_nvram_siena_ops = {
@@ -108,12 +88,6 @@ efx_nvram_init(
EFSYS_ASSERT(!(enp->en_mod_flags & EFX_MOD_NVRAM));
switch (enp->en_family) {
-#if EFSYS_OPT_FALCON
- case EFX_FAMILY_FALCON:
- envop = (efx_nvram_ops_t *)&__efx_nvram_falcon_ops;
- break;
-#endif /* EFSYS_OPT_FALCON */
-
#if EFSYS_OPT_SIENA
case EFX_FAMILY_SIENA:
envop = (efx_nvram_ops_t *)&__efx_nvram_siena_ops;
Modified: head/sys/dev/sfxge/common/efx_phy.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_phy.c Tue May 10 06:53:38 2016
(r299319)
+++ head/sys/dev/sfxge/common/efx_phy.c Tue May 10 07:01:06 2016
(r299320)
@@ -33,10 +33,6 @@ __FBSDID("$FreeBSD$");
#include "efx.h"
#include "efx_impl.h"
-#if EFSYS_OPT_FALCON
-#include "falcon_nvram.h"
-#endif
-
#if EFSYS_OPT_MAC_FALCON_XMAC
#include "falcon_xmac.h"
#endif
@@ -310,46 +306,6 @@ efx_phy_probe(
/* Hook in operations structure */
switch (enp->en_family) {
-#if EFSYS_OPT_FALCON
- case EFX_FAMILY_FALCON:
- switch (epp->ep_phy_type) {
-#if EFSYS_OPT_PHY_NULL
- case PHY_TYPE_NONE_DECODE:
- epop = (efx_phy_ops_t *)&__efx_phy_null_ops;
- break;
-#endif
-#if EFSYS_OPT_PHY_QT2022C2
- case PHY_TYPE_QT2022C2_DECODE:
- epop = (efx_phy_ops_t *)&__efx_phy_qt2022c2_ops;
- break;
-#endif
-#if EFSYS_OPT_PHY_SFX7101
- case PHY_TYPE_SFX7101_DECODE:
- epop = (efx_phy_ops_t *)&__efx_phy_sfx7101_ops;
- break;
-#endif
-#if EFSYS_OPT_PHY_TXC43128
- case PHY_TYPE_TXC43128_DECODE:
- epop = (efx_phy_ops_t *)&__efx_phy_txc43128_ops;
- break;
-#endif
-#if EFSYS_OPT_PHY_SFT9001
- case PHY_TYPE_SFT9001A_DECODE:
- case PHY_TYPE_SFT9001B_DECODE:
- epop = (efx_phy_ops_t *)&__efx_phy_sft9001_ops;
- break;
-#endif
-#if EFSYS_OPT_PHY_QT2025C
- case EFX_PHY_QT2025C:
- epop = (efx_phy_ops_t *)&__efx_phy_qt2025c_ops;
- break;
-#endif
- default:
- rc = ENOTSUP;
- goto fail1;
- }
- break;
-#endif /* EFSYS_OPT_FALCON */
#if EFSYS_OPT_SIENA
case EFX_FAMILY_SIENA:
epop = (efx_phy_ops_t *)&__efx_phy_siena_ops;
Modified: head/sys/dev/sfxge/common/efx_rx.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_rx.c Tue May 10 06:53:38 2016
(r299319)
+++ head/sys/dev/sfxge/common/efx_rx.c Tue May 10 07:01:06 2016
(r299320)
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
#include "efx_impl.h"
-#if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA
+#if EFSYS_OPT_SIENA
static __checkReturn efx_rc_t
falconsiena_rx_init(
@@ -125,31 +125,8 @@ static void
falconsiena_rx_qdestroy(
__in efx_rxq_t *erp);
-#endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */
-
+#endif /* EFSYS_OPT_SIENA */
-#if EFSYS_OPT_FALCON
-static efx_rx_ops_t __efx_rx_falcon_ops = {
- falconsiena_rx_init, /* erxo_init */
- falconsiena_rx_fini, /* erxo_fini */
-#if EFSYS_OPT_RX_SCATTER
- falconsiena_rx_scatter_enable, /* erxo_scatter_enable */
-#endif
-#if EFSYS_OPT_RX_SCALE
- falconsiena_rx_scale_mode_set, /* erxo_scale_mode_set */
- falconsiena_rx_scale_key_set, /* erxo_scale_key_set */
- falconsiena_rx_scale_tbl_set, /* erxo_scale_tbl_set */
- falconsiena_rx_prefix_hash, /* erxo_prefix_hash */
-#endif
- falconsiena_rx_prefix_pktlen, /* erxo_prefix_pktlen */
- falconsiena_rx_qpost, /* erxo_qpost */
- falconsiena_rx_qpush, /* erxo_qpush */
- falconsiena_rx_qflush, /* erxo_qflush */
- falconsiena_rx_qenable, /* erxo_qenable */
- falconsiena_rx_qcreate, /* erxo_qcreate */
- falconsiena_rx_qdestroy, /* erxo_qdestroy */
-};
-#endif /* EFSYS_OPT_FALCON */
#if EFSYS_OPT_SIENA
static efx_rx_ops_t __efx_rx_siena_ops = {
@@ -219,12 +196,6 @@ efx_rx_init(
}
switch (enp->en_family) {
-#if EFSYS_OPT_FALCON
- case EFX_FAMILY_FALCON:
- erxop = (efx_rx_ops_t *)&__efx_rx_falcon_ops;
- break;
-#endif /* EFSYS_OPT_FALCON */
-
#if EFSYS_OPT_SIENA
case EFX_FAMILY_SIENA:
erxop = (efx_rx_ops_t *)&__efx_rx_siena_ops;
@@ -593,7 +564,7 @@ efx_psuedo_hdr_hash_get(
}
#endif /* EFSYS_OPT_RX_SCALE */
-#if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA
+#if EFSYS_OPT_SIENA
static __checkReturn efx_rc_t
falconsiena_rx_init(
@@ -1255,4 +1226,4 @@ falconsiena_rx_fini(
_NOTE(ARGUNUSED(enp))
}
-#endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */
+#endif /* EFSYS_OPT_SIENA */
Modified: head/sys/dev/sfxge/common/efx_tx.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_tx.c Tue May 10 06:53:38 2016
(r299319)
+++ head/sys/dev/sfxge/common/efx_tx.c Tue May 10 07:01:06 2016
(r299320)
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
#define EFX_TX_QSTAT_INCR(_etp, _stat)
#endif
-#if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA
+#if EFSYS_OPT_SIENA
static __checkReturn efx_rc_t
falconsiena_tx_init(
@@ -121,35 +121,9 @@ falconsiena_tx_qstats_update(
__inout_ecount(TX_NQSTATS) efsys_stat_t *stat);
#endif
-#endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */
+#endif /* EFSYS_OPT_SIENA */
-#if EFSYS_OPT_FALCON
-static efx_tx_ops_t __efx_tx_falcon_ops = {
- falconsiena_tx_init, /* etxo_init */
- falconsiena_tx_fini, /* etxo_fini */
- falconsiena_tx_qcreate, /* etxo_qcreate */
- falconsiena_tx_qdestroy, /* etxo_qdestroy */
- falconsiena_tx_qpost, /* etxo_qpost */
- falconsiena_tx_qpush, /* etxo_qpush */
- falconsiena_tx_qpace, /* etxo_qpace */
- falconsiena_tx_qflush, /* etxo_qflush */
- falconsiena_tx_qenable, /* etxo_qenable */
- NULL, /* etxo_qpio_enable */
- NULL, /* etxo_qpio_disable */
- NULL, /* etxo_qpio_write */
- NULL, /* etxo_qpio_post */
- falconsiena_tx_qdesc_post, /* etxo_qdesc_post */
- falconsiena_tx_qdesc_dma_create, /* etxo_qdesc_dma_create */
- NULL, /* etxo_qdesc_tso_create */
- NULL, /* etxo_qdesc_tso2_create */
- NULL, /* etxo_qdesc_vlantci_create */
-#if EFSYS_OPT_QSTATS
- falconsiena_tx_qstats_update, /* etxo_qstats_update */
-#endif
-};
-#endif /* EFSYS_OPT_FALCON */
-
#if EFSYS_OPT_SIENA
static efx_tx_ops_t __efx_tx_siena_ops = {
falconsiena_tx_init, /* etxo_init */
@@ -249,12 +223,6 @@ efx_tx_init(
}
switch (enp->en_family) {
-#if EFSYS_OPT_FALCON
- case EFX_FAMILY_FALCON:
- etxop = (efx_tx_ops_t *)&__efx_tx_falcon_ops;
- break;
-#endif /* EFSYS_OPT_FALCON */
-
#if EFSYS_OPT_SIENA
case EFX_FAMILY_SIENA:
etxop = (efx_tx_ops_t *)&__efx_tx_siena_ops;
@@ -694,7 +662,7 @@ efx_tx_qstats_update(
#endif
-#if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA
+#if EFSYS_OPT_SIENA
static __checkReturn efx_rc_t
falconsiena_tx_init(
@@ -1055,7 +1023,7 @@ falconsiena_tx_qdesc_dma_create(
(uint32_t)(addr >> 32));
}
-#endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */
+#endif /* EFSYS_OPT_SIENA */
#if EFSYS_OPT_QSTATS
#if EFSYS_OPT_NAMES
@@ -1080,7 +1048,7 @@ efx_tx_qstat_name(
#endif /* EFSYS_OPT_NAMES */
#endif /* EFSYS_OPT_QSTATS */
-#if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA
+#if EFSYS_OPT_SIENA
#if EFSYS_OPT_QSTATS
static void
@@ -1120,4 +1088,4 @@ falconsiena_tx_fini(
_NOTE(ARGUNUSED(enp))
}
-#endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */
+#endif /* EFSYS_OPT_SIENA */
Modified: head/sys/dev/sfxge/common/efx_vpd.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_vpd.c Tue May 10 06:53:38 2016
(r299319)
+++ head/sys/dev/sfxge/common/efx_vpd.c Tue May 10 07:01:06 2016
(r299320)
@@ -54,23 +54,6 @@ __FBSDID("$FreeBSD$");
#define TAG_NAME_VPD_R_DECODE 0x10
#define TAG_NAME_VPD_W_DECODE 0x11
-#if EFSYS_OPT_FALCON
-
-static efx_vpd_ops_t __efx_vpd_falcon_ops = {
- NULL, /* evpdo_init */
- falcon_vpd_size, /* evpdo_size */
- falcon_vpd_read, /* evpdo_read */
- falcon_vpd_verify, /* evpdo_verify */
- NULL, /* evpdo_reinit */
- falcon_vpd_get, /* evpdo_get */
- falcon_vpd_set, /* evpdo_set */
- falcon_vpd_next, /* evpdo_next */
- falcon_vpd_write, /* evpdo_write */
- NULL, /* evpdo_fini */
-};
-
-#endif /* EFSYS_OPT_FALCON */
-
#if EFSYS_OPT_SIENA
static efx_vpd_ops_t __efx_vpd_siena_ops = {
@@ -117,12 +100,6 @@ efx_vpd_init(
EFSYS_ASSERT(!(enp->en_mod_flags & EFX_MOD_VPD));
switch (enp->en_family) {
-#if EFSYS_OPT_FALCON
- case EFX_FAMILY_FALCON:
- evpdop = (efx_vpd_ops_t *)&__efx_vpd_falcon_ops;
- break;
-#endif /* EFSYS_OPT_FALCON */
-
#if EFSYS_OPT_SIENA
case EFX_FAMILY_SIENA:
evpdop = (efx_vpd_ops_t *)&__efx_vpd_siena_ops;
_______________________________________________
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"
