From owner-svn-src-stable@freebsd.org Sat Jun 4 14:20:46 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 C3700B69F29; Sat, 4 Jun 2016 14:20:46 +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 831C21CEE; Sat, 4 Jun 2016 14:20:46 +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 u54EKjQw085283; Sat, 4 Jun 2016 14:20:45 GMT (envelope-from arybchik@FreeBSD.org) Received: (from arybchik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u54EKjQ7085198; Sat, 4 Jun 2016 14:20:45 GMT (envelope-from arybchik@FreeBSD.org) Message-Id: <201606041420.u54EKjQ7085198@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 14:20:45 +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: r301319 - 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 14:20:46 -0000 Author: arybchik Date: Sat Jun 4 14:20:45 2016 New Revision: 301319 URL: https://svnweb.freebsd.org/changeset/base/301319 Log: MFC r299253 sfxge(4): disable common code support for Falcon This patch ensures that client code will fail to build with Falcon support. Following patches remove Falcon support code entirely. sfxge(4) has never supported Falcon. 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_impl.h 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 14:19:00 2016 (r301318) +++ stable/10/sys/dev/sfxge/common/efsys.h Sat Jun 4 14:20:45 2016 (r301319) @@ -236,8 +236,6 @@ sfxge_map_mbuf_fast(bus_dma_tag_t tag, b #define EFSYS_OPT_NAMES 1 -#define EFSYS_OPT_FALCON 0 -#define EFSYS_OPT_FALCON_NIC_CFG_OVERRIDE 0 #define EFSYS_OPT_SIENA 1 #define EFSYS_OPT_HUNTINGTON 1 #define EFSYS_OPT_MEDFORD 0 @@ -251,24 +249,13 @@ sfxge_map_mbuf_fast(bus_dma_tag_t tag, b #define EFSYS_OPT_MCDI_LOGGING 0 #define EFSYS_OPT_MCDI_PROXY_AUTH 0 -#define EFSYS_OPT_MAC_FALCON_GMAC 0 -#define EFSYS_OPT_MAC_FALCON_XMAC 0 #define EFSYS_OPT_MAC_STATS 1 #define EFSYS_OPT_LOOPBACK 0 -#define EFSYS_OPT_MON_NULL 0 -#define EFSYS_OPT_MON_LM87 0 -#define EFSYS_OPT_MON_MAX6647 0 #define EFSYS_OPT_MON_MCDI 0 #define EFSYS_OPT_MON_STATS 0 -#define EFSYS_OPT_PHY_NULL 0 -#define EFSYS_OPT_PHY_QT2022C2 0 -#define EFSYS_OPT_PHY_SFX7101 0 -#define EFSYS_OPT_PHY_TXC43128 0 -#define EFSYS_OPT_PHY_SFT9001 0 -#define EFSYS_OPT_PHY_QT2025C 0 #define EFSYS_OPT_PHY_STATS 1 #define EFSYS_OPT_PHY_PROPS 0 #define EFSYS_OPT_BIST 1 @@ -277,12 +264,8 @@ sfxge_map_mbuf_fast(bus_dma_tag_t tag, b #define EFSYS_OPT_VPD 1 #define EFSYS_OPT_NVRAM 1 -#define EFSYS_OPT_NVRAM_FALCON_BOOTROM 0 -#define EFSYS_OPT_NVRAM_SFT9001 0 -#define EFSYS_OPT_NVRAM_SFX7101 0 #define EFSYS_OPT_BOOTCFG 0 -#define EFSYS_OPT_PCIE_TUNE 0 #define EFSYS_OPT_DIAG 0 #define EFSYS_OPT_WOL 1 #define EFSYS_OPT_RX_SCALE 1 Modified: stable/10/sys/dev/sfxge/common/efx.h ============================================================================== --- stable/10/sys/dev/sfxge/common/efx.h Sat Jun 4 14:19:00 2016 (r301318) +++ stable/10/sys/dev/sfxge/common/efx.h Sat Jun 4 14:20:45 2016 (r301319) @@ -34,6 +34,7 @@ #define _SYS_EFX_H #include "efsys.h" +#include "efx_check.h" #include "efx_phy_ids.h" #ifdef __cplusplus Modified: stable/10/sys/dev/sfxge/common/efx_check.h ============================================================================== --- stable/10/sys/dev/sfxge/common/efx_check.h Sat Jun 4 14:19:00 2016 (r301318) +++ stable/10/sys/dev/sfxge/common/efx_check.h Sat Jun 4 14:20:45 2016 (r301319) @@ -43,6 +43,34 @@ * from client code (and do not reappear in merges from other branches). */ +#ifdef EFSYS_OPT_FALCON +# 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) +#define EFSYS_OPT_MAC_FALCON_XMAC (0) + +#define EFSYS_OPT_MON_LM87 (0) +#define EFSYS_OPT_MON_MAX6647 (0) +#define EFSYS_OPT_MON_NULL (0) + +#define EFSYS_OPT_NVRAM_FALCON_BOOTROM (0) +#define EFSYS_OPT_NVRAM_SFT9001 (0) +#define EFSYS_OPT_NVRAM_SFX7101 (0) + +#define EFSYS_OPT_PCIE_TUNE (0) + +#define EFSYS_OPT_PHY_NULL (0) +#define EFSYS_OPT_PHY_QT2022C2 (0) +#define EFSYS_OPT_PHY_QT2025C (0) +#define EFSYS_OPT_PHY_SFT9001 (0) +#define EFSYS_OPT_PHY_SFX7101 (0) +#define EFSYS_OPT_PHY_TXC43128 (0) +#endif + /* Support NVRAM based boot config */ #if EFSYS_OPT_BOOTCFG # if !EFSYS_OPT_NVRAM Modified: stable/10/sys/dev/sfxge/common/efx_impl.h ============================================================================== --- stable/10/sys/dev/sfxge/common/efx_impl.h Sat Jun 4 14:19:00 2016 (r301318) +++ stable/10/sys/dev/sfxge/common/efx_impl.h Sat Jun 4 14:20:45 2016 (r301319) @@ -34,6 +34,7 @@ #define _SYS_EFX_IMPL_H #include "efsys.h" +#include "efx_check.h" #include "efx.h" #include "efx_regs.h" #include "efx_regs_ef10.h" @@ -43,8 +44,6 @@ #define ESE_DZ_EV_CODE_DRV_GEN_EV FSE_AZ_EV_CODE_DRV_GEN_EV #endif -#include "efx_check.h" - #if EFSYS_OPT_FALCON #include "falcon_impl.h"