d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sfxge(4): remove EFSYS_OPT_PHY_QT2025C

Browse Source 
Submitted by:   Andy Moreton <amoreton at solarflare.com>
Sponsored by:   Solarflare Communications, Inc.
MFC after:      1 week
This commit is contained in:
arybchik 2016-05-10 07:18:18 +00:00
parent 3c5d7e81d3
commit b2e45fd4df
3 changed files with 4 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/sfxge/common/efx_check.h
View File

@ -47,7 +47,6 @@
# error "FALCON is obsolete and is not supported." # error "FALCON is obsolete and is not supported."
#else #else
/* FIXME: remove this after Falcon support has been removed */ /* FIXME: remove this after Falcon support has been removed */
#define EFSYS_OPT_PHY_QT2025C (0)
#define EFSYS_OPT_PHY_SFT9001 (0) #define EFSYS_OPT_PHY_SFT9001 (0)
#define EFSYS_OPT_PHY_SFX7101 (0) #define EFSYS_OPT_PHY_SFX7101 (0)
#define EFSYS_OPT_PHY_TXC43128 (0) #define EFSYS_OPT_PHY_TXC43128 (0)
@ -261,12 +260,9 @@
# error "PHY_QT2022C2 is obsolete and is not supported." # error "PHY_QT2022C2 is obsolete and is not supported."
#endif #endif
/* Support QT2025C PHY (Wakefield NIC) */ #ifdef EFSYS_OPT_PHY_QT2025C
#if EFSYS_OPT_PHY_QT2025C # error "PHY_QT2025C is obsolete and is not supported."
# if !EFSYS_OPT_FALCON #endif
# error "PHY_QT2025C requires FALCON"
# endif
#endif /* EFSYS_OPT_PHY_QT2025C */
/* Support SFT9001 PHY (Starbolt NIC) */ /* Support SFT9001 PHY (Starbolt NIC) */
#if EFSYS_OPT_PHY_SFT9001 #if EFSYS_OPT_PHY_SFT9001

5
sys/dev/sfxge/common/efx_impl.h
View File

@ -301,14 +301,11 @@ typedef struct efx_port_s {
uint32_t ep_lp_cap_mask; uint32_t ep_lp_cap_mask;
uint32_t ep_default_adv_cap_mask; uint32_t ep_default_adv_cap_mask;
uint32_t ep_phy_cap_mask; uint32_t ep_phy_cap_mask;
#if EFSYS_OPT_PHY_TXC43128 || EFSYS_OPT_PHY_QT2025C #if EFSYS_OPT_PHY_TXC43128
union { union {
struct { struct {
unsigned int bug10934_count; unsigned int bug10934_count;
} ep_txc43128; } ep_txc43128;
struct {
unsigned int bug17190_count;
} ep_qt2025c;
}; };
#endif #endif
boolean_t ep_mac_poll_needed; /* falcon only */ boolean_t ep_mac_poll_needed; /* falcon only */

32
sys/dev/sfxge/common/efx_phy.c
View File

@ -46,10 +46,6 @@ __FBSDID("$FreeBSD$");
#include "sft9001.h" #include "sft9001.h"
#endif #endif
#if EFSYS_OPT_PHY_QT2025C
#include "qt2025c.h"
#endif
#if EFSYS_OPT_PHY_SFX7101 #if EFSYS_OPT_PHY_SFX7101
static efx_phy_ops_t __efx_phy_sfx7101_ops = { static efx_phy_ops_t __efx_phy_sfx7101_ops = {
sfx7101_power, /* epo_power */ sfx7101_power, /* epo_power */
@ -134,34 +130,6 @@ static efx_phy_ops_t __efx_phy_sft9001_ops = {
}; };
#endif /* EFSYS_OPT_PHY_SFT9001 */ #endif /* EFSYS_OPT_PHY_SFT9001 */
#if EFSYS_OPT_PHY_QT2025C
static efx_phy_ops_t __efx_phy_qt2025c_ops = {
NULL, /* epo_power */
qt2025c_reset, /* epo_reset */
qt2025c_reconfigure, /* epo_reconfigure */
qt2025c_verify, /* epo_verify */
qt2025c_uplink_check, /* epo_uplink_check */
qt2025c_downlink_check, /* epo_downlink_check */
qt2025c_oui_get, /* epo_oui_get */
#if EFSYS_OPT_PHY_STATS
qt2025c_stats_update, /* epo_stats_update */
#endif /* EFSYS_OPT_PHY_STATS */
#if EFSYS_OPT_PHY_PROPS
#if EFSYS_OPT_NAMES
qt2025c_prop_name, /* epo_prop_name */
#endif
qt2025c_prop_get, /* epo_prop_get */
qt2025c_prop_set, /* epo_prop_set */
#endif /* EFSYS_OPT_PHY_PROPS */
#if EFSYS_OPT_BIST
NULL, /* epo_bist_enable_offline */
NULL, /* epo_bist_start */
NULL, /* epo_bist_poll */
NULL, /* epo_bist_stop */
#endif /* EFSYS_OPT_BIST */
};
#endif /* EFSYS_OPT_PHY_QT2025C */
#if EFSYS_OPT_SIENA #if EFSYS_OPT_SIENA
static efx_phy_ops_t __efx_phy_siena_ops = { static efx_phy_ops_t __efx_phy_siena_ops = {
siena_phy_power, /* epo_power */ siena_phy_power, /* epo_power */