From owner-svn-src-stable@freebsd.org Sat Jun 4 15:57:03 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 04A9DB6A69E; Sat, 4 Jun 2016 15:57:03 +0000 (UTC) (envelope-from arybchik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BC2671DFA; Sat, 4 Jun 2016 15:57:02 +0000 (UTC) (envelope-from arybchik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u54Fv1ew024158; Sat, 4 Jun 2016 15:57:01 GMT (envelope-from arybchik@FreeBSD.org) Received: (from arybchik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u54Fv17d024153; Sat, 4 Jun 2016 15:57:01 GMT (envelope-from arybchik@FreeBSD.org) Message-Id: <201606041557.u54Fv17d024153@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arybchik set sender to arybchik@FreeBSD.org using -f From: Andrew Rybchenko Date: Sat, 4 Jun 2016 15:57:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r301350 - stable/10/sys/dev/sfxge/common X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jun 2016 15:57:03 -0000 Author: arybchik Date: Sat Jun 4 15:57:01 2016 New Revision: 301350 URL: https://svnweb.freebsd.org/changeset/base/301350 Log: MFC r299722 sfxge(4): remove obsolete EFSYS_OPT_PHY_PROPS option and APIs Submitted by: Andy Moreton Sponsored by: Solarflare Communications, Inc. Modified: stable/10/sys/dev/sfxge/common/efsys.h stable/10/sys/dev/sfxge/common/efx.h stable/10/sys/dev/sfxge/common/efx_check.h stable/10/sys/dev/sfxge/common/efx_mcdi.c stable/10/sys/dev/sfxge/common/efx_phy.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/sfxge/common/efsys.h ============================================================================== --- stable/10/sys/dev/sfxge/common/efsys.h Sat Jun 4 15:54:54 2016 (r301349) +++ stable/10/sys/dev/sfxge/common/efsys.h Sat Jun 4 15:57:01 2016 (r301350) @@ -257,7 +257,6 @@ sfxge_map_mbuf_fast(bus_dma_tag_t tag, b #define EFSYS_OPT_MON_STATS 0 #define EFSYS_OPT_PHY_STATS 1 -#define EFSYS_OPT_PHY_PROPS 0 #define EFSYS_OPT_BIST 1 #define EFSYS_OPT_PHY_LED_CONTROL 1 #define EFSYS_OPT_PHY_FLAGS 0 Modified: stable/10/sys/dev/sfxge/common/efx.h ============================================================================== --- stable/10/sys/dev/sfxge/common/efx.h Sat Jun 4 15:54:54 2016 (r301349) +++ stable/10/sys/dev/sfxge/common/efx.h Sat Jun 4 15:57:01 2016 (r301350) @@ -946,33 +946,6 @@ efx_phy_stats_update( #endif /* EFSYS_OPT_PHY_STATS */ -#if EFSYS_OPT_PHY_PROPS - -#if EFSYS_OPT_NAMES - -extern const char * -efx_phy_prop_name( - __in efx_nic_t *enp, - __in unsigned int id); - -#endif /* EFSYS_OPT_NAMES */ - -#define EFX_PHY_PROP_DEFAULT 0x00000001 - -extern __checkReturn efx_rc_t -efx_phy_prop_get( - __in efx_nic_t *enp, - __in unsigned int id, - __in uint32_t flags, - __out uint32_t *valp); - -extern __checkReturn efx_rc_t -efx_phy_prop_set( - __in efx_nic_t *enp, - __in unsigned int id, - __in uint32_t val); - -#endif /* EFSYS_OPT_PHY_PROPS */ #if EFSYS_OPT_BIST @@ -1109,9 +1082,6 @@ typedef struct efx_nic_cfg_s { #if EFSYS_OPT_PHY_STATS uint64_t enc_phy_stat_mask; #endif /* EFSYS_OPT_PHY_STATS */ -#if EFSYS_OPT_PHY_PROPS - unsigned int enc_phy_nprops; -#endif /* EFSYS_OPT_PHY_PROPS */ #if EFSYS_OPT_SIENA uint8_t enc_mcdi_mdio_channel; #if EFSYS_OPT_PHY_STATS Modified: stable/10/sys/dev/sfxge/common/efx_check.h ============================================================================== --- stable/10/sys/dev/sfxge/common/efx_check.h Sat Jun 4 15:54:54 2016 (r301349) +++ stable/10/sys/dev/sfxge/common/efx_check.h Sat Jun 4 15:57:01 2016 (r301350) @@ -185,9 +185,8 @@ /* Support printable names for statistics */ #if EFSYS_OPT_NAMES # if !(EFSYS_OPT_LOOPBACK || EFSYS_OPT_MAC_STATS || EFSYS_OPT_MCDI || \ - EFSYS_MON_STATS || EFSYS_OPT_PHY_PROPS || EFSYS_OPT_PHY_STATS || \ - EFSYS_OPT_QSTATS) -# error "NAMES requires LOOPBACK or xxxSTATS or MCDI or PHY_PROPS" + EFSYS_MON_STATS || EFSYS_OPT_PHY_STATS || EFSYS_OPT_QSTATS) +# error "NAMES requires LOOPBACK or xxxSTATS or MCDI" # endif #endif /* EFSYS_OPT_NAMES */ @@ -237,15 +236,12 @@ #endif #ifdef EFSYS_OPT_PHY_PM8358 -# error "EFSYS_OPT_PHY_PM8358 is obsolete and is not supported." +# error "PHY_PM8358 is obsolete and is not supported." #endif -/* Support PHY properties */ -#if EFSYS_OPT_PHY_PROPS -# if !EFSYS_OPT_SIENA -# error "PHY_PROPS requires SIENA" -# endif -#endif /* EFSYS_OPT_PHY_PROPS */ +#ifdef EFSYS_OPT_PHY_PROPS +# error "PHY_PROPS is obsolete and is not supported." +#endif #ifdef EFSYS_OPT_PHY_QT2022C2 # error "PHY_QT2022C2 is obsolete and is not supported." Modified: stable/10/sys/dev/sfxge/common/efx_mcdi.c ============================================================================== --- stable/10/sys/dev/sfxge/common/efx_mcdi.c Sat Jun 4 15:54:54 2016 (r301349) +++ stable/10/sys/dev/sfxge/common/efx_mcdi.c Sat Jun 4 15:57:01 2016 (r301350) @@ -1428,10 +1428,6 @@ efx_mcdi_get_phy_cfg( (1 << EFX_PHY_LED_ON)); #endif /* EFSYS_OPT_PHY_LED_CONTROL */ -#if EFSYS_OPT_PHY_PROPS - encp->enc_phy_nprops = 0; -#endif /* EFSYS_OPT_PHY_PROPS */ - /* Get the media type of the fixed port, if recognised. */ EFX_STATIC_ASSERT(MC_CMD_MEDIA_XAUI == EFX_PHY_MEDIA_XAUI); EFX_STATIC_ASSERT(MC_CMD_MEDIA_CX4 == EFX_PHY_MEDIA_CX4); Modified: stable/10/sys/dev/sfxge/common/efx_phy.c ============================================================================== --- stable/10/sys/dev/sfxge/common/efx_phy.c Sat Jun 4 15:54:54 2016 (r301349) +++ stable/10/sys/dev/sfxge/common/efx_phy.c Sat Jun 4 15:57:01 2016 (r301350) @@ -423,43 +423,6 @@ efx_phy_stats_update( #endif /* EFSYS_OPT_PHY_STATS */ -#if EFSYS_OPT_PHY_PROPS - -#if EFSYS_OPT_NAMES - const char * -efx_phy_prop_name( - __in efx_nic_t *enp, - __in unsigned int id) -{ - _NOTE(ARGUNUSED(enp, id)) - - return (NULL); -} -#endif /* EFSYS_OPT_NAMES */ - - __checkReturn efx_rc_t -efx_phy_prop_get( - __in efx_nic_t *enp, - __in unsigned int id, - __in uint32_t flags, - __out uint32_t *valp) -{ - _NOTE(ARGUNUSED(enp, id, flags, valp)) - - return (ENOTSUP); -} - - __checkReturn efx_rc_t -efx_phy_prop_set( - __in efx_nic_t *enp, - __in unsigned int id, - __in uint32_t val) -{ - _NOTE(ARGUNUSED(enp, id, val)) - - return (ENOTSUP); -} -#endif /* EFSYS_OPT_PHY_STATS */ #if EFSYS_OPT_BIST