svn commit: r293953 - stable/10/sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Thu Jan 14 15:13:54 2016
New Revision: 293953
URL: https://svnweb.freebsd.org/changeset/base/293953

Log:
  MFC r291922
  
  sfxge: support PERMIT_SET_MAC_WHEN_FILTERS_INSTALLED flag
  
  Use flag on vadapter alloc when reported as a supported capability.
  Use the slow device reset only when the capability is missing.
  
  Submitted by:   Richard Houldsworth <rhouldsworth at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.

Modified:
  stable/10/sys/dev/sfxge/common/efx.h
  stable/10/sys/dev/sfxge/common/hunt_nic.c
  stable/10/sys/dev/sfxge/common/siena_nic.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sfxge/common/efx.h
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx.h	Thu Jan 14 15:12:48 2016	(r293952)
+++ stable/10/sys/dev/sfxge/common/efx.h	Thu Jan 14 15:13:54 2016	(r293953)
@@ -1173,6 +1173,7 @@ typedef struct efx_nic_cfg_s {
 	/* Datapath firmware vadapter/vport/vswitch support */
 	boolean_t		enc_datapath_cap_evb;
 	boolean_t               enc_rx_disable_scatter_supported;
+	boolean_t               enc_allow_set_mac_with_installed_filters;
 	/* External port identifier */
 	uint8_t			enc_external_port;
 } efx_nic_cfg_t;

Modified: stable/10/sys/dev/sfxge/common/hunt_nic.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/hunt_nic.c	Thu Jan 14 15:12:48 2016	(r293952)
+++ stable/10/sys/dev/sfxge/common/hunt_nic.c	Thu Jan 14 15:13:54 2016	(r293953)
@@ -149,6 +149,9 @@ efx_mcdi_vadaptor_alloc(
 	req.emr_out_length = MC_CMD_VADAPTOR_ALLOC_OUT_LEN;
 
 	MCDI_IN_SET_DWORD(req, VADAPTOR_ALLOC_IN_UPSTREAM_PORT_ID, port_id);
+	MCDI_IN_POPULATE_DWORD_1(req, VADAPTOR_ALLOC_IN_FLAGS,
+	    VADAPTOR_ALLOC_IN_FLAG_PERMIT_SET_MAC_WHEN_FILTERS_INSTALLED,
+	    enp->en_nic_cfg.enc_allow_set_mac_with_installed_filters ? 1 : 0);
 
 	efx_mcdi_execute(enp, &req);
 
@@ -928,6 +931,15 @@ hunt_get_datapath_caps(
 		encp->enc_rx_disable_scatter_supported = B_FALSE;
 	}
 
+	/* Check if the firmware supports set mac with running filters */
+	if (MCDI_CMD_DWORD_FIELD(&datapath_capabilities,
+	    GET_CAPABILITIES_OUT_VADAPTOR_PERMIT_SET_MAC_WHEN_FILTERS_INSTALLED)
+	    == 1) {
+		encp->enc_allow_set_mac_with_installed_filters = B_TRUE;
+	} else {
+		encp->enc_allow_set_mac_with_installed_filters = B_FALSE;
+	}
+
 	return (0);
 
 fail2:

Modified: stable/10/sys/dev/sfxge/common/siena_nic.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/siena_nic.c	Thu Jan 14 15:12:48 2016	(r293952)
+++ stable/10/sys/dev/sfxge/common/siena_nic.c	Thu Jan 14 15:13:54 2016	(r293953)
@@ -170,6 +170,7 @@ siena_board_cfg(
 
 	encp->enc_hw_tx_insert_vlan_enabled = B_FALSE;
 	encp->enc_fw_assisted_tso_enabled = B_FALSE;
+	encp->enc_allow_set_mac_with_installed_filters = B_TRUE;
 
 	return (0);