Author: arybchik
Date: Fri Dec 30 12:06:55 2016
New Revision: 310817
URL: https://svnweb.freebsd.org/changeset/base/310817

Log:
  sfxge(4): remove obsolete Wake-On-LAN support
  
  Wake-on-lan is not supported in production on any of our adapters, as
  they don't have the required AUX power connector. (It's possible that
  AUX power is supplied to some of our ALOM or mezz adapters, but if so
  then we've never implemented or tested WoL support.)
  
  Reviewed by:    gnn
  Sponsored by:   Solarflare Communications, Inc.
  MFC after:      1 week
  Differential Revision:  https://reviews.freebsd.org/D8972

Deleted:
  head/sys/dev/sfxge/common/efx_wol.c
Modified:
  head/sys/conf/files.amd64
  head/sys/dev/sfxge/common/efsys.h
  head/sys/dev/sfxge/common/efx.h
  head/sys/dev/sfxge/common/efx_check.h
  head/sys/dev/sfxge/common/efx_impl.h
  head/sys/dev/sfxge/common/efx_nic.c
  head/sys/modules/sfxge/Makefile

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64   Fri Dec 30 12:02:16 2016        (r310816)
+++ head/sys/conf/files.amd64   Fri Dec 30 12:06:55 2016        (r310817)
@@ -383,7 +383,6 @@ dev/sfxge/common/efx_rx.c   optional        sfxge
 dev/sfxge/common/efx_sram.c    optional        sfxge pci
 dev/sfxge/common/efx_tx.c      optional        sfxge pci
 dev/sfxge/common/efx_vpd.c     optional        sfxge pci
-dev/sfxge/common/efx_wol.c     optional        sfxge pci
 dev/sfxge/common/hunt_nic.c    optional        sfxge pci
 dev/sfxge/common/mcdi_mon.c    optional        sfxge pci
 dev/sfxge/common/medford_nic.c optional        sfxge pci

Modified: head/sys/dev/sfxge/common/efsys.h
==============================================================================
--- head/sys/dev/sfxge/common/efsys.h   Fri Dec 30 12:02:16 2016        
(r310816)
+++ head/sys/dev/sfxge/common/efsys.h   Fri Dec 30 12:06:55 2016        
(r310817)
@@ -266,7 +266,6 @@ sfxge_map_mbuf_fast(bus_dma_tag_t tag, b
 #define        EFSYS_OPT_BOOTCFG 0
 
 #define        EFSYS_OPT_DIAG 0
-#define        EFSYS_OPT_WOL 1
 #define        EFSYS_OPT_RX_SCALE 1
 #define        EFSYS_OPT_QSTATS 1
 #define        EFSYS_OPT_FILTER 1

Modified: head/sys/dev/sfxge/common/efx.h
==============================================================================
--- head/sys/dev/sfxge/common/efx.h     Fri Dec 30 12:02:16 2016        
(r310816)
+++ head/sys/dev/sfxge/common/efx.h     Fri Dec 30 12:06:55 2016        
(r310817)
@@ -1075,7 +1075,6 @@ efx_bist_stop(
 #define        EFX_FEATURE_LFSR_HASH_INSERT    0x00000002
 #define        EFX_FEATURE_LINK_EVENTS         0x00000004
 #define        EFX_FEATURE_PERIODIC_MAC_STATS  0x00000008
-#define        EFX_FEATURE_WOL                 0x00000010
 #define        EFX_FEATURE_MCDI                0x00000020
 #define        EFX_FEATURE_LOOKAHEAD_SPLIT     0x00000040
 #define        EFX_FEATURE_MAC_HEADER_FILTERS  0x00000080
@@ -1459,87 +1458,6 @@ efx_bootcfg_write(
 
 #endif /* EFSYS_OPT_BOOTCFG */
 
-#if EFSYS_OPT_WOL
-
-typedef enum efx_wol_type_e {
-       EFX_WOL_TYPE_INVALID,
-       EFX_WOL_TYPE_MAGIC,
-       EFX_WOL_TYPE_BITMAP,
-       EFX_WOL_TYPE_LINK,
-       EFX_WOL_NTYPES,
-} efx_wol_type_t;
-
-typedef enum efx_lightsout_offload_type_e {
-       EFX_LIGHTSOUT_OFFLOAD_TYPE_INVALID,
-       EFX_LIGHTSOUT_OFFLOAD_TYPE_ARP,
-       EFX_LIGHTSOUT_OFFLOAD_TYPE_NS,
-} efx_lightsout_offload_type_t;
-
-#define        EFX_WOL_BITMAP_MASK_SIZE    (48)
-#define        EFX_WOL_BITMAP_VALUE_SIZE   (128)
-
-typedef union efx_wol_param_u {
-       struct {
-               uint8_t mac_addr[6];
-       } ewp_magic;
-       struct {
-               uint8_t mask[EFX_WOL_BITMAP_MASK_SIZE];   /* 1 bit per byte */
-               uint8_t value[EFX_WOL_BITMAP_VALUE_SIZE]; /* value to match */
-               uint8_t value_len;
-       } ewp_bitmap;
-} efx_wol_param_t;
-
-typedef union efx_lightsout_offload_param_u {
-       struct {
-               uint8_t mac_addr[6];
-               uint32_t ip;
-       } elop_arp;
-       struct {
-               uint8_t mac_addr[6];
-               uint32_t solicited_node[4];
-               uint32_t ip[4];
-       } elop_ns;
-} efx_lightsout_offload_param_t;
-
-extern __checkReturn   efx_rc_t
-efx_wol_init(
-       __in            efx_nic_t *enp);
-
-extern __checkReturn   efx_rc_t
-efx_wol_filter_clear(
-       __in            efx_nic_t *enp);
-
-extern __checkReturn   efx_rc_t
-efx_wol_filter_add(
-       __in            efx_nic_t *enp,
-       __in            efx_wol_type_t type,
-       __in            efx_wol_param_t *paramp,
-       __out           uint32_t *filter_idp);
-
-extern __checkReturn   efx_rc_t
-efx_wol_filter_remove(
-       __in            efx_nic_t *enp,
-       __in            uint32_t filter_id);
-
-extern __checkReturn   efx_rc_t
-efx_lightsout_offload_add(
-       __in            efx_nic_t *enp,
-       __in            efx_lightsout_offload_type_t type,
-       __in            efx_lightsout_offload_param_t *paramp,
-       __out           uint32_t *filter_idp);
-
-extern __checkReturn   efx_rc_t
-efx_lightsout_offload_remove(
-       __in            efx_nic_t *enp,
-       __in            efx_lightsout_offload_type_t type,
-       __in            uint32_t filter_id);
-
-extern                 void
-efx_wol_fini(
-       __in            efx_nic_t *enp);
-
-#endif /* EFSYS_OPT_WOL */
-
 #if EFSYS_OPT_DIAG
 
 typedef enum efx_pattern_type_t {

Modified: head/sys/dev/sfxge/common/efx_check.h
==============================================================================
--- head/sys/dev/sfxge/common/efx_check.h       Fri Dec 30 12:02:16 2016        
(r310816)
+++ head/sys/dev/sfxge/common/efx_check.h       Fri Dec 30 12:06:55 2016        
(r310817)
@@ -307,10 +307,8 @@
 #endif /* EFSYS_OPT_VPD */
 
 /* Support Wake on LAN */
-#if EFSYS_OPT_WOL
-# if !EFSYS_OPT_SIENA
-#  error "WOL requires SIENA"
-# endif
+#ifdef EFSYS_OPT_WOL
+# error "WOL is obsolete and is not supported"
 #endif /* EFSYS_OPT_WOL */
 
 #ifdef EFSYS_OPT_MCAST_FILTER_LIST

Modified: head/sys/dev/sfxge/common/efx_impl.h
==============================================================================
--- head/sys/dev/sfxge/common/efx_impl.h        Fri Dec 30 12:02:16 2016        
(r310816)
+++ head/sys/dev/sfxge/common/efx_impl.h        Fri Dec 30 12:06:55 2016        
(r310817)
@@ -74,7 +74,6 @@ extern "C" {
 #define        EFX_MOD_TX              0x00000100
 #define        EFX_MOD_PORT            0x00000200
 #define        EFX_MOD_MON             0x00000400
-#define        EFX_MOD_WOL             0x00000800
 #define        EFX_MOD_FILTER          0x00001000
 #define        EFX_MOD_LIC             0x00002000
 

Modified: head/sys/dev/sfxge/common/efx_nic.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_nic.c Fri Dec 30 12:02:16 2016        
(r310816)
+++ head/sys/dev/sfxge/common/efx_nic.c Fri Dec 30 12:06:55 2016        
(r310817)
@@ -268,7 +268,6 @@ efx_nic_create(
                    EFX_FEATURE_LFSR_HASH_INSERT |
                    EFX_FEATURE_LINK_EVENTS |
                    EFX_FEATURE_PERIODIC_MAC_STATS |
-                   EFX_FEATURE_WOL |
                    EFX_FEATURE_MCDI |
                    EFX_FEATURE_LOOKAHEAD_SPLIT |
                    EFX_FEATURE_MAC_HEADER_FILTERS |
@@ -279,7 +278,6 @@ efx_nic_create(
 #if EFSYS_OPT_HUNTINGTON
        case EFX_FAMILY_HUNTINGTON:
                enp->en_enop = &__efx_nic_hunt_ops;
-               /* FIXME: Add WOL support */
                enp->en_features =
                    EFX_FEATURE_IPV6 |
                    EFX_FEATURE_LINK_EVENTS |

Modified: head/sys/modules/sfxge/Makefile
==============================================================================
--- head/sys/modules/sfxge/Makefile     Fri Dec 30 12:02:16 2016        
(r310816)
+++ head/sys/modules/sfxge/Makefile     Fri Dec 30 12:06:55 2016        
(r310817)
@@ -17,7 +17,7 @@ SRCS+=        sfxge.h sfxge_rx.h sfxge_tx.h sfx
 SRCS+= efx_bootcfg.c efx_crc32.c efx_ev.c efx_intr.c efx_lic.c efx_mac.c
 SRCS+= efx_mcdi.c efx_mon.c efx_nic.c
 SRCS+= efx_nvram.c efx_phy.c efx_port.c efx_rx.c efx_sram.c efx_tx.c
-SRCS+= efx_vpd.c efx_wol.c efx_filter.c efx_hash.c
+SRCS+= efx_vpd.c efx_filter.c efx_hash.c
 SRCS+= efsys.h
 SRCS+= efx.h efx_check.h efx_impl.h efx_mcdi.h efx_regs.h efx_regs_ef10.h
 SRCS+= efx_regs_mcdi.h efx_regs_pci.h efx_types.h efx_phy_ids.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"

Reply via email to