Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 4 Jun 2016 14:48:00 +0000 (UTC)
From:      Andrew Rybchenko <arybchik@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r301331 - stable/10/sys/dev/sfxge/common
Message-ID:  <201606041448.u54Em0sw096461@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: arybchik
Date: Sat Jun  4 14:48:00 2016
New Revision: 301331
URL: https://svnweb.freebsd.org/changeset/base/301331

Log:
  MFC r299404
  
  sfxge(4): remove Falcon specific EV_GLOBAL support
  
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.

Modified:
  stable/10/sys/dev/sfxge/common/efx_ev.c
  stable/10/sys/dev/sfxge/common/efx_impl.h
  stable/10/sys/dev/sfxge/common/efx_port.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sfxge/common/efx_ev.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_ev.c	Sat Jun  4 14:46:40 2016	(r301330)
+++ stable/10/sys/dev/sfxge/common/efx_ev.c	Sat Jun  4 14:48:00 2016	(r301331)
@@ -748,23 +748,11 @@ falconsiena_ev_global(
 	__in		const efx_ev_callbacks_t *eecp,
 	__in_opt	void *arg)
 {
-	efx_nic_t *enp = eep->ee_enp;
-	efx_port_t *epp = &(enp->en_port);
-	boolean_t should_abort;
+	_NOTE(ARGUNUSED(eqp, eecp, arg))
 
 	EFX_EV_QSTAT_INCR(eep, EV_GLOBAL);
-	should_abort = B_FALSE;
-
-	/* Check for a link management event */
-	if (EFX_QWORD_FIELD(*eqp, FSF_BZ_GLB_EV_XG_MNT_INTR) != 0) {
-		EFX_EV_QSTAT_INCR(eep, EV_GLOBAL_MNT);
 
-		EFSYS_PROBE(xg_mgt);
-
-		epp->ep_mac_poll_needed = B_TRUE;
-	}
-
-	return (should_abort);
+	return (B_FALSE);
 }
 
 static	__checkReturn	boolean_t

Modified: stable/10/sys/dev/sfxge/common/efx_impl.h
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_impl.h	Sat Jun  4 14:46:40 2016	(r301330)
+++ stable/10/sys/dev/sfxge/common/efx_impl.h	Sat Jun  4 14:48:00 2016	(r301331)
@@ -298,9 +298,6 @@ typedef struct efx_port_s {
 	uint32_t		ep_lp_cap_mask;
 	uint32_t		ep_default_adv_cap_mask;
 	uint32_t		ep_phy_cap_mask;
-	boolean_t		ep_mac_poll_needed; /* falcon only */
-	boolean_t		ep_mac_up; /* falcon only */
-	uint32_t		ep_fwver; /* falcon only */
 	boolean_t		ep_mac_drain;
 	boolean_t		ep_mac_stats_pending;
 #if EFSYS_OPT_BIST

Modified: stable/10/sys/dev/sfxge/common/efx_port.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_port.c	Sat Jun  4 14:46:40 2016	(r301330)
+++ stable/10/sys/dev/sfxge/common/efx_port.c	Sat Jun  4 14:48:00 2016	(r301331)
@@ -55,7 +55,6 @@ efx_port_init(
 
 	epp->ep_mac_type = EFX_MAC_INVALID;
 	epp->ep_link_mode = EFX_LINK_UNKNOWN;
-	epp->ep_mac_poll_needed = B_TRUE;
 	epp->ep_mac_drain = B_TRUE;
 
 	/* Configure the MAC */
@@ -247,7 +246,6 @@ efx_port_fini(
 	epp->ep_emop = NULL;
 	epp->ep_mac_type = EFX_MAC_INVALID;
 	epp->ep_mac_drain = B_FALSE;
-	epp->ep_mac_poll_needed = B_FALSE;
 
 	/* Turn off the PHY */
 	if (epop->epo_power != NULL)

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606041448.u54Em0sw096461>