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

sfxge(4): disable common code support for Falcon

Browse Source 
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 <amoreton at solarflare.com>
Sponsored by:   Solarflare Communications, Inc.
MFC after:      1 week
This commit is contained in:
Andrew Rybchenko 2016-05-09 08:37:42 +00:00
parent aa7e294253
commit 5af774cbaf
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=299253
4 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/dev/sfxge/common/efsys.h
View File

@ -236,8 +236,6 @@ sfxge_map_mbuf_fast(bus_dma_tag_t tag, bus_dmamap_t map,
#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, bus_dmamap_t map,
#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, bus_dmamap_t map,
#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

1
sys/dev/sfxge/common/efx.h
View File

@ -34,6 +34,7 @@
#define _SYS_EFX_H
#include "efsys.h"
#include "efx_check.h"
#include "efx_phy_ids.h"
#ifdef __cplusplus

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

@ -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

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

@ -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"