1 files changed, 128 insertions, 535 deletions

diff --git a/sys/dev/sfxge/common/siena_nic.c b/sys/dev/sfxge/common/siena_nic.c
index 1276c93..3dcf48e 100644
--- a/sys/dev/sfxge/common/siena_nic.c
+++ b/sys/dev/sfxge/common/siena_nic.c
@@ -1,26 +1,31 @@
 /*-
- * Copyright 2009 Solarflare Communications Inc.  All rights reserved.
+ * Copyright (c) 2009-2015 Solarflare Communications Inc.
+ * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ * modification, are permitted provided that the following conditions are met:
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are
+ * those of the authors and should not be interpreted as representing official
+ * policies, either expressed or implied, of the FreeBSD Project.
  */
 
 #include <sys/cdefs.h>
@@ -29,6 +34,7 @@ __FBSDID("$FreeBSD$");
 #include "efsys.h"
 #include "efx.h"
 #include "efx_impl.h"
+#include "mcdi_mon.h"
 
 #if EFSYS_OPT_SIENA
 
@@ -38,15 +44,16 @@ siena_nic_get_partn_mask(
 	__out			unsigned int *maskp)
 {
 	efx_mcdi_req_t req;
-	uint8_t outbuf[MC_CMD_NVRAM_TYPES_OUT_LEN];
+	uint8_t payload[MAX(MC_CMD_NVRAM_TYPES_IN_LEN,
+			    MC_CMD_NVRAM_TYPES_OUT_LEN)];
 	int rc;
 
+	(void) memset(payload, 0, sizeof (payload));
 	req.emr_cmd = MC_CMD_NVRAM_TYPES;
-	EFX_STATIC_ASSERT(MC_CMD_NVRAM_TYPES_IN_LEN == 0);
-	req.emr_in_buf = NULL;
-	req.emr_in_length = 0;
-	req.emr_out_buf = outbuf;
-	req.emr_out_length = sizeof (outbuf);
+	req.emr_in_buf = payload;
+	req.emr_in_length = MC_CMD_NVRAM_TYPES_IN_LEN;
+	req.emr_out_buf = payload;
+	req.emr_out_length = MC_CMD_NVRAM_TYPES_OUT_LEN;
 
 	efx_mcdi_execute(enp, &req);
 
@@ -72,193 +79,17 @@ fail1:
 	return (rc);
 }
 
-static	__checkReturn	int
-siena_nic_exit_assertion_handler(
-	__in		efx_nic_t *enp)
-{
-	efx_mcdi_req_t req;
-	uint8_t payload[MC_CMD_REBOOT_IN_LEN];
-	int rc;
-
-	req.emr_cmd = MC_CMD_REBOOT;
-	req.emr_in_buf = payload;
-	req.emr_in_length = MC_CMD_REBOOT_IN_LEN;
-	EFX_STATIC_ASSERT(MC_CMD_REBOOT_OUT_LEN == 0);
-	req.emr_out_buf = NULL;
-	req.emr_out_length = 0;
-
-	MCDI_IN_SET_DWORD(req, REBOOT_IN_FLAGS,
-			    MC_CMD_REBOOT_FLAGS_AFTER_ASSERTION);
-
-	efx_mcdi_execute(enp, &req);
-
-	if (req.emr_rc != 0 && req.emr_rc != EIO) {
-		rc = req.emr_rc;
-		goto fail1;
-	}
-
-	return (0);
-
-fail1:
-	EFSYS_PROBE1(fail1, int, rc);
-
-	return (rc);
-}
-
-static	__checkReturn	int
-siena_nic_read_assertion(
-	__in		efx_nic_t *enp)
-{
-	efx_mcdi_req_t req;
-	uint8_t payload[MAX(MC_CMD_GET_ASSERTS_IN_LEN,
-			    MC_CMD_GET_ASSERTS_OUT_LEN)];
-	const char *reason;
-	unsigned int flags;
-	unsigned int index;
-	unsigned int ofst;
-	int retry;
-	int rc;
-
-	/*
-	 * Before we attempt to chat to the MC, we should verify that the MC
-	 * isn't in it's assertion handler, either due to a previous reboot,
-	 * or because we're reinitializing due to an eec_exception().
-	 *
-	 * Use GET_ASSERTS to read any assertion state that may be present.
-	 * Retry this command twice. Once because a boot-time assertion failure
-	 * might cause the 1st MCDI request to fail. And once again because
-	 * we might race with siena_nic_exit_assertion_handler() running on the
-	 * other port.
-	 */
-	retry = 2;
-	do {
-		req.emr_cmd = MC_CMD_GET_ASSERTS;
-		req.emr_in_buf = payload;
-		req.emr_in_length = MC_CMD_GET_ASSERTS_IN_LEN;
-		req.emr_out_buf = payload;
-		req.emr_out_length = MC_CMD_GET_ASSERTS_OUT_LEN;
-
-		MCDI_IN_SET_DWORD(req, GET_ASSERTS_IN_CLEAR, 1);
-		efx_mcdi_execute(enp, &req);
-
-	} while ((req.emr_rc == EINTR || req.emr_rc == EIO) && retry-- > 0);
-
-	if (req.emr_rc != 0) {
-		rc = req.emr_rc;
-		goto fail1;
-	}
-
-	if (req.emr_out_length_used < MC_CMD_GET_ASSERTS_OUT_LEN) {
-		rc = EMSGSIZE;
-		goto fail2;
-	}
-
-	/* Print out any assertion state recorded */
-	flags = MCDI_OUT_DWORD(req, GET_ASSERTS_OUT_GLOBAL_FLAGS);
-	if (flags == MC_CMD_GET_ASSERTS_FLAGS_NO_FAILS)
-		return (0);
-
-	reason = (flags == MC_CMD_GET_ASSERTS_FLAGS_SYS_FAIL)
-		? "system-level assertion"
-		: (flags == MC_CMD_GET_ASSERTS_FLAGS_THR_FAIL)
-		? "thread-level assertion"
-		: (flags == MC_CMD_GET_ASSERTS_FLAGS_WDOG_FIRED)
-		? "watchdog reset"
-		: "unknown assertion";
-	EFSYS_PROBE3(mcpu_assertion,
-	    const char *, reason, unsigned int,
-	    MCDI_OUT_DWORD(req, GET_ASSERTS_OUT_SAVED_PC_OFFS),
-	    unsigned int,
-	    MCDI_OUT_DWORD(req, GET_ASSERTS_OUT_THREAD_OFFS));
-
-	/* Print out the registers */
-	ofst = MC_CMD_GET_ASSERTS_OUT_GP_REGS_OFFS_OFST;
-	for (index = 1; index < 32; index++) {
-		EFSYS_PROBE2(mcpu_register, unsigned int, index, unsigned int,
-			    EFX_DWORD_FIELD(*MCDI_OUT(req, efx_dword_t, ofst),
-					    EFX_DWORD_0));
-		ofst += sizeof (efx_dword_t);
-	}
-	EFSYS_ASSERT(ofst <= MC_CMD_GET_ASSERTS_OUT_LEN);
-
-	return (0);
-
-fail2:
-	EFSYS_PROBE(fail2);
-fail1:
-	EFSYS_PROBE1(fail1, int, rc);
-
-	return (rc);
-}
-
-static	__checkReturn	int
-siena_nic_attach(
-	__in		efx_nic_t *enp,
-	__in		boolean_t attach)
-{
-	efx_mcdi_req_t req;
-	uint8_t payload[MC_CMD_DRV_ATTACH_IN_LEN];
-	int rc;
-
-	req.emr_cmd = MC_CMD_DRV_ATTACH;
-	req.emr_in_buf = payload;
-	req.emr_in_length = MC_CMD_DRV_ATTACH_IN_LEN;
-	req.emr_out_buf = NULL;
-	req.emr_out_length = 0;
-
-	MCDI_IN_SET_DWORD(req, DRV_ATTACH_IN_NEW_STATE, attach ? 1 : 0);
-	MCDI_IN_SET_DWORD(req, DRV_ATTACH_IN_UPDATE, 1);
-
-	efx_mcdi_execute(enp, &req);
-
-	if (req.emr_rc != 0) {
-		rc = req.emr_rc;
-		goto fail1;
-	}
-
-	if (req.emr_out_length_used < MC_CMD_DRV_ATTACH_OUT_LEN) {
-		rc = EMSGSIZE;
-		goto fail2;
-	}
-
-	return (0);
-
-fail2:
-	EFSYS_PROBE(fail2);
-fail1:
-	EFSYS_PROBE1(fail1, int, rc);
-
-	return (rc);
-}
-
 #if EFSYS_OPT_PCIE_TUNE
 
 	__checkReturn	int
 siena_nic_pcie_extended_sync(
 	__in		efx_nic_t *enp)
 {
-	uint8_t inbuf[MC_CMD_WORKAROUND_IN_LEN];
-	efx_mcdi_req_t req;
 	int rc;
 
-	EFSYS_ASSERT3U(enp->en_family, ==, EFX_FAMILY_SIENA);
-
-	req.emr_cmd = MC_CMD_WORKAROUND;
-	req.emr_in_buf = inbuf;
-	req.emr_in_length = sizeof (inbuf);
-	EFX_STATIC_ASSERT(MC_CMD_WORKAROUND_OUT_LEN == 0);
-	req.emr_out_buf = NULL;
-	req.emr_out_length = 0;
-
-	MCDI_IN_SET_DWORD(req, WORKAROUND_IN_TYPE, MC_CMD_WORKAROUND_BUG17230);
-	MCDI_IN_SET_DWORD(req, WORKAROUND_IN_ENABLED, 1);
-
-	efx_mcdi_execute(enp, &req);
-
-	if (req.emr_rc != 0) {
-		rc = req.emr_rc;
+	if ((rc = efx_mcdi_set_workaround(enp, MC_CMD_WORKAROUND_BUG17230,
+		    B_TRUE, NULL) != 0))
 		goto fail1;
-	}
 
 	return (0);
 
@@ -275,58 +106,33 @@ siena_board_cfg(
 	__in		efx_nic_t *enp)
 {
 	efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
-	efx_mcdi_iface_t *emip = &(enp->en_u.siena.enu_mip);
-	uint8_t outbuf[MAX(MC_CMD_GET_BOARD_CFG_OUT_LENMIN,
-		    MC_CMD_GET_RESOURCE_LIMITS_OUT_LEN)];
-	efx_mcdi_req_t req;
-	uint8_t *mac_addr;
-	efx_dword_t *capabilities;
+	uint8_t mac_addr[6];
+	efx_dword_t capabilities;
+	uint32_t board_type;
+	uint32_t nevq, nrxq, ntxq;
 	int rc;
 
-	/* Board configuration */
-	req.emr_cmd = MC_CMD_GET_BOARD_CFG;
-	EFX_STATIC_ASSERT(MC_CMD_GET_BOARD_CFG_IN_LEN == 0);
-	req.emr_in_buf = NULL;
-	req.emr_in_length = 0;
-	req.emr_out_buf = outbuf;
-	req.emr_out_length = MC_CMD_GET_BOARD_CFG_OUT_LENMIN;
-
-	efx_mcdi_execute(enp, &req);
+	/* External port identifier using one-based port numbering */
+	encp->enc_external_port = (uint8_t)enp->en_mcdi.em_emip.emi_port;
 
-	if (req.emr_rc != 0) {
-		rc = req.emr_rc;
+	/* Board configuration */
+	if ((rc = efx_mcdi_get_board_cfg(enp, &board_type,
+		    &capabilities, mac_addr)) != 0)
 		goto fail1;
-	}
-
-	if (req.emr_out_length_used < MC_CMD_GET_BOARD_CFG_OUT_LENMIN) {
-		rc = EMSGSIZE;
-		goto fail2;
-	}
 
-	if (emip->emi_port == 1) {
-		mac_addr = MCDI_OUT2(req, uint8_t,
-			    GET_BOARD_CFG_OUT_MAC_ADDR_BASE_PORT0);
-		capabilities = MCDI_OUT2(req, efx_dword_t,
-			    GET_BOARD_CFG_OUT_CAPABILITIES_PORT0);
-	} else {
-		mac_addr = MCDI_OUT2(req, uint8_t,
-			    GET_BOARD_CFG_OUT_MAC_ADDR_BASE_PORT1);
-		capabilities = MCDI_OUT2(req, efx_dword_t,
-			    GET_BOARD_CFG_OUT_CAPABILITIES_PORT1);
-	}
 	EFX_MAC_ADDR_COPY(encp->enc_mac_addr, mac_addr);
 
-	encp->enc_board_type = MCDI_OUT_DWORD(req,
-				    GET_BOARD_CFG_OUT_BOARD_TYPE);
+	encp->enc_board_type = board_type;
 
 	/* Additional capabilities */
 	encp->enc_clk_mult = 1;
-	if (MCDI_CMD_DWORD_FIELD(capabilities, CAPABILITIES_TURBO)) {
+	if (EFX_DWORD_FIELD(capabilities, MC_CMD_CAPABILITIES_TURBO)) {
 		enp->en_features |= EFX_FEATURE_TURBO;
 
-		if (MCDI_CMD_DWORD_FIELD(capabilities,
-		    CAPABILITIES_TURBO_ACTIVE))
+		if (EFX_DWORD_FIELD(capabilities,
+			MC_CMD_CAPABILITIES_TURBO_ACTIVE)) {
 			encp->enc_clk_mult = 2;
+		}
 	}
 
 	encp->enc_evq_timer_quantum_ns =
@@ -334,48 +140,39 @@ siena_board_cfg(
 	encp->enc_evq_timer_max_us = (encp->enc_evq_timer_quantum_ns <<
 		FRF_CZ_TC_TIMER_VAL_WIDTH) / 1000;
 
-	/* Resource limits */
-	req.emr_cmd = MC_CMD_GET_RESOURCE_LIMITS;
-	EFX_STATIC_ASSERT(MC_CMD_GET_RESOURCE_LIMITS_IN_LEN == 0);
-	req.emr_in_buf = NULL;
-	req.emr_in_length = 0;
-	req.emr_out_buf = outbuf;
-	req.emr_out_length = MC_CMD_GET_RESOURCE_LIMITS_OUT_LEN;
+	/* When hash header insertion is enabled, Siena inserts 16 bytes */
+	encp->enc_rx_prefix_size = 16;
 
-	efx_mcdi_execute(enp, &req);
+	/* Alignment for receive packet DMA buffers */
+	encp->enc_rx_buf_align_start = 1;
+	encp->enc_rx_buf_align_end = 1;
 
-	if (req.emr_rc == 0) {
-		if (req.emr_out_length_used <
-		    MC_CMD_GET_RESOURCE_LIMITS_OUT_LEN) {
-			rc = EMSGSIZE;
-			goto fail3;
-		}
+	/* Alignment for WPTR updates */
+	encp->enc_rx_push_align = 1;
 
-		encp->enc_evq_limit = MCDI_OUT_DWORD(req,
-		    GET_RESOURCE_LIMITS_OUT_EVQ);
-		encp->enc_txq_limit = MIN(EFX_TXQ_LIMIT_TARGET,
-		    MCDI_OUT_DWORD(req, GET_RESOURCE_LIMITS_OUT_TXQ));
-		encp->enc_rxq_limit = MIN(EFX_RXQ_LIMIT_TARGET,
-		    MCDI_OUT_DWORD(req, GET_RESOURCE_LIMITS_OUT_RXQ));
-	} else if (req.emr_rc == ENOTSUP) {
-		encp->enc_evq_limit = 1024;
-		encp->enc_txq_limit = EFX_TXQ_LIMIT_TARGET;
-		encp->enc_rxq_limit = EFX_RXQ_LIMIT_TARGET;
-	} else {
-		rc = req.emr_rc;
-		goto fail4;
+	/* Resource limits */
+	rc = efx_mcdi_get_resource_limits(enp, &nevq, &nrxq, &ntxq);
+	if (rc != 0) {
+		if (rc != ENOTSUP)
+			goto fail2;
+
+		nevq = 1024;
+		nrxq = EFX_RXQ_LIMIT_TARGET;
+		ntxq = EFX_TXQ_LIMIT_TARGET;
 	}
+	encp->enc_evq_limit = nevq;
+	encp->enc_rxq_limit = MIN(EFX_RXQ_LIMIT_TARGET, nrxq);
+	encp->enc_txq_limit = MIN(EFX_TXQ_LIMIT_TARGET, ntxq);
 
 	encp->enc_buftbl_limit = SIENA_SRAM_ROWS -
 	    (encp->enc_txq_limit * EFX_TXQ_DC_NDESCS(EFX_TXQ_DC_SIZE)) -
 	    (encp->enc_rxq_limit * EFX_RXQ_DC_NDESCS(EFX_RXQ_DC_SIZE));
 
+	encp->enc_hw_tx_insert_vlan_enabled = B_FALSE;
+	encp->enc_fw_assisted_tso_enabled = B_FALSE;
+
 	return (0);
 
-fail4:
-	EFSYS_PROBE(fail4);
-fail3:
-	EFSYS_PROBE(fail3);
 fail2:
 	EFSYS_PROBE(fail2);
 fail1:
@@ -388,220 +185,27 @@ static	__checkReturn	int
 siena_phy_cfg(
 	__in		efx_nic_t *enp)
 {
-	efx_port_t *epp = &(enp->en_port);
 	efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
-	efx_mcdi_req_t req;
-	uint8_t outbuf[MC_CMD_GET_PHY_CFG_OUT_LEN];
 	int rc;
 
-	req.emr_cmd = MC_CMD_GET_PHY_CFG;
-	EFX_STATIC_ASSERT(MC_CMD_GET_PHY_CFG_IN_LEN == 0);
-	req.emr_in_buf = NULL;
-	req.emr_in_length = 0;
-	req.emr_out_buf = outbuf;
-	req.emr_out_length = sizeof (outbuf);
-
-	efx_mcdi_execute(enp, &req);
-
-	if (req.emr_rc != 0) {
-		rc = req.emr_rc;
+	/* Fill out fields in enp->en_port and enp->en_nic_cfg from MCDI */
+	if ((rc = efx_mcdi_get_phy_cfg(enp)) != 0)
 		goto fail1;
-	}
-
-	if (req.emr_out_length_used < MC_CMD_GET_PHY_CFG_OUT_LEN) {
-		rc = EMSGSIZE;
-		goto fail2;
-	}
-
-	encp->enc_phy_type = MCDI_OUT_DWORD(req, GET_PHY_CFG_OUT_TYPE);
-#if EFSYS_OPT_NAMES
-	(void) strncpy(encp->enc_phy_name,
-		MCDI_OUT2(req, char, GET_PHY_CFG_OUT_NAME),
-		MIN(sizeof (encp->enc_phy_name) - 1,
-		    MC_CMD_GET_PHY_CFG_OUT_NAME_LEN));
-#endif	/* EFSYS_OPT_NAMES */
-	(void) memset(encp->enc_phy_revision, 0,
-	    sizeof (encp->enc_phy_revision));
-	memcpy(encp->enc_phy_revision,
-		MCDI_OUT2(req, char, GET_PHY_CFG_OUT_REVISION),
-		MIN(sizeof (encp->enc_phy_revision) - 1,
-		    MC_CMD_GET_PHY_CFG_OUT_REVISION_LEN));
-#if EFSYS_OPT_PHY_LED_CONTROL
-	encp->enc_led_mask = ((1 << EFX_PHY_LED_DEFAULT) |
-			    (1 << EFX_PHY_LED_OFF) |
-			    (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);
-	EFX_STATIC_ASSERT(MC_CMD_MEDIA_KX4 == EFX_PHY_MEDIA_KX4);
-	EFX_STATIC_ASSERT(MC_CMD_MEDIA_XFP == EFX_PHY_MEDIA_XFP);
-	EFX_STATIC_ASSERT(MC_CMD_MEDIA_SFP_PLUS == EFX_PHY_MEDIA_SFP_PLUS);
-	EFX_STATIC_ASSERT(MC_CMD_MEDIA_BASE_T == EFX_PHY_MEDIA_BASE_T);
-	epp->ep_fixed_port_type =
-		MCDI_OUT_DWORD(req, GET_PHY_CFG_OUT_MEDIA_TYPE);
-	if (epp->ep_fixed_port_type >= EFX_PHY_MEDIA_NTYPES)
-		epp->ep_fixed_port_type = EFX_PHY_MEDIA_INVALID;
-
-	epp->ep_phy_cap_mask =
-		MCDI_OUT_DWORD(req, GET_PHY_CFG_OUT_SUPPORTED_CAP);
-#if EFSYS_OPT_PHY_FLAGS
-	encp->enc_phy_flags_mask = MCDI_OUT_DWORD(req, GET_PHY_CFG_OUT_FLAGS);
-#endif	/* EFSYS_OPT_PHY_FLAGS */
-
-	encp->enc_port = (uint8_t)MCDI_OUT_DWORD(req, GET_PHY_CFG_OUT_PRT);
-
-	/* Populate internal state */
-	encp->enc_siena_channel =
-		(uint8_t)MCDI_OUT_DWORD(req, GET_PHY_CFG_OUT_CHANNEL);
 
 #if EFSYS_OPT_PHY_STATS
-	encp->enc_siena_phy_stat_mask =
-		MCDI_OUT_DWORD(req, GET_PHY_CFG_OUT_STATS_MASK);
-
 	/* Convert the MCDI statistic mask into the EFX_PHY_STAT mask */
-	siena_phy_decode_stats(enp, encp->enc_siena_phy_stat_mask,
+	siena_phy_decode_stats(enp, encp->enc_mcdi_phy_stat_mask,
 			    NULL, &encp->enc_phy_stat_mask, NULL);
 #endif	/* EFSYS_OPT_PHY_STATS */
 
-#if EFSYS_OPT_PHY_BIST
-	encp->enc_bist_mask = 0;
-	if (MCDI_OUT_DWORD_FIELD(req, GET_PHY_CFG_OUT_FLAGS,
-	    GET_PHY_CFG_OUT_BIST_CABLE_SHORT))
-		encp->enc_bist_mask |= (1 << EFX_PHY_BIST_TYPE_CABLE_SHORT);
-	if (MCDI_OUT_DWORD_FIELD(req, GET_PHY_CFG_OUT_FLAGS,
-	    GET_PHY_CFG_OUT_BIST_CABLE_LONG))
-		encp->enc_bist_mask |= (1 << EFX_PHY_BIST_TYPE_CABLE_LONG);
-	if (MCDI_OUT_DWORD_FIELD(req, GET_PHY_CFG_OUT_FLAGS,
-	    GET_PHY_CFG_OUT_BIST))
-		encp->enc_bist_mask |= (1 << EFX_PHY_BIST_TYPE_NORMAL);
-#endif	/* EFSYS_OPT_PHY_BIST */
-
-	return (0);
-
-fail2:
-	EFSYS_PROBE(fail2);
-fail1:
-	EFSYS_PROBE1(fail1, int, rc);
-
-	return (rc);
-}
-
-#if EFSYS_OPT_LOOPBACK
-
-static	__checkReturn	int
-siena_loopback_cfg(
-	__in		efx_nic_t *enp)
-{
-	efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
-	efx_mcdi_req_t req;
-	uint8_t outbuf[MC_CMD_GET_LOOPBACK_MODES_OUT_LEN];
-	int rc;
-
-	req.emr_cmd = MC_CMD_GET_LOOPBACK_MODES;
-	EFX_STATIC_ASSERT(MC_CMD_GET_LOOPBACK_MODES_IN_LEN == 0);
-	req.emr_in_buf = NULL;
-	req.emr_in_length = 0;
-	req.emr_out_buf = outbuf;
-	req.emr_out_length = sizeof (outbuf);
-
-	efx_mcdi_execute(enp, &req);
-
-	if (req.emr_rc != 0) {
-		rc = req.emr_rc;
-		goto fail1;
-	}
-
-	if (req.emr_out_length_used < MC_CMD_GET_LOOPBACK_MODES_OUT_LEN) {
-		rc = EMSGSIZE;
-		goto fail2;
-	}
-
-	/*
-	 * We assert the MC_CMD_LOOPBACK and EFX_LOOPBACK namespaces agree
-	 * in siena_phy.c:siena_phy_get_link()
-	 */
-	encp->enc_loopback_types[EFX_LINK_100FDX] = EFX_LOOPBACK_MASK &
-	    MCDI_OUT_DWORD(req, GET_LOOPBACK_MODES_OUT_100M) &
-	    MCDI_OUT_DWORD(req, GET_LOOPBACK_MODES_OUT_SUGGESTED);
-	encp->enc_loopback_types[EFX_LINK_1000FDX] = EFX_LOOPBACK_MASK &
-	    MCDI_OUT_DWORD(req, GET_LOOPBACK_MODES_OUT_1G) &
-	    MCDI_OUT_DWORD(req, GET_LOOPBACK_MODES_OUT_SUGGESTED);
-	encp->enc_loopback_types[EFX_LINK_10000FDX] = EFX_LOOPBACK_MASK &
-	    MCDI_OUT_DWORD(req, GET_LOOPBACK_MODES_OUT_10G) &
-	    MCDI_OUT_DWORD(req, GET_LOOPBACK_MODES_OUT_SUGGESTED);
-	encp->enc_loopback_types[EFX_LINK_UNKNOWN] =
-	    (1 << EFX_LOOPBACK_OFF) |
-	    encp->enc_loopback_types[EFX_LINK_100FDX] |
-	    encp->enc_loopback_types[EFX_LINK_1000FDX] |
-	    encp->enc_loopback_types[EFX_LINK_10000FDX];
-
-	return (0);
-
-fail2:
-	EFSYS_PROBE(fail2);
-fail1:
-	EFSYS_PROBE1(fail1, int, rc);
-
-	return (rc);
-}
-
-#endif	/* EFSYS_OPT_LOOPBACK */
-
-#if EFSYS_OPT_MON_STATS
-
-static	__checkReturn	int
-siena_monitor_cfg(
-	__in		efx_nic_t *enp)
-{
-	efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
-	efx_mcdi_req_t req;
-	uint8_t outbuf[MCDI_CTL_SDU_LEN_MAX];
-	int rc;
-
-	req.emr_cmd = MC_CMD_SENSOR_INFO;
-	EFX_STATIC_ASSERT(MC_CMD_SENSOR_INFO_IN_LEN == 0);
-	req.emr_in_buf = NULL;
-	req.emr_in_length = 0;
-	req.emr_out_buf = outbuf;
-	req.emr_out_length = sizeof (outbuf);
-
-	efx_mcdi_execute(enp, &req);
-
-	if (req.emr_rc != 0) {
-		rc = req.emr_rc;
-		goto fail1;
-	}
-
-	if (req.emr_out_length_used < MC_CMD_SENSOR_INFO_OUT_MASK_OFST + 4) {
-		rc = EMSGSIZE;
-		goto fail2;
-	}
-
-	encp->enc_siena_mon_stat_mask =
-		MCDI_OUT_DWORD(req, SENSOR_INFO_OUT_MASK);
-	encp->enc_mon_type = EFX_MON_SFC90X0;
-
-	siena_mon_decode_stats(enp, encp->enc_siena_mon_stat_mask,
-			    NULL, &(encp->enc_mon_stat_mask), NULL);
-
 	return (0);
 
-fail2:
-	EFSYS_PROBE(fail2);
 fail1:
 	EFSYS_PROBE1(fail1, int, rc);
 
 	return (rc);
 }
 
-#endif	/* EFSYS_OPT_MON_STATS */
-
 	__checkReturn	int
 siena_nic_probe(
 	__in		efx_nic_t *enp)
@@ -610,56 +214,69 @@ siena_nic_probe(
 	efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
 	siena_link_state_t sls;
 	unsigned int mask;
+	efx_oword_t oword;
 	int rc;
 
 	EFSYS_ASSERT3U(enp->en_family, ==, EFX_FAMILY_SIENA);
 
-	/* Read clear any assertion state */
-	if ((rc = siena_nic_read_assertion(enp)) != 0)
+	/* Test BIU */
+	if ((rc = efx_nic_biu_test(enp)) != 0)
 		goto fail1;
 
-	/* Exit the assertion handler */
-	if ((rc = siena_nic_exit_assertion_handler(enp)) != 0)
+	/* Clear the region register */
+	EFX_POPULATE_OWORD_4(oword,
+	    FRF_AZ_ADR_REGION0, 0,
+	    FRF_AZ_ADR_REGION1, (1 << 16),
+	    FRF_AZ_ADR_REGION2, (2 << 16),
+	    FRF_AZ_ADR_REGION3, (3 << 16));
+	EFX_BAR_WRITEO(enp, FR_AZ_ADR_REGION_REG, &oword);
+
+	/* Read clear any assertion state */
+	if ((rc = efx_mcdi_read_assertion(enp)) != 0)
 		goto fail2;
 
-	/* Wrestle control from the BMC */
-	if ((rc = siena_nic_attach(enp, B_TRUE)) != 0)
+	/* Exit the assertion handler */
+	if ((rc = efx_mcdi_exit_assertion_handler(enp)) != 0)
 		goto fail3;
 
-	if ((rc = siena_board_cfg(enp)) != 0)
+	/* Wrestle control from the BMC */
+	if ((rc = efx_mcdi_drv_attach(enp, B_TRUE)) != 0)
 		goto fail4;
 
-	if ((rc = siena_phy_cfg(enp)) != 0)
+	if ((rc = siena_board_cfg(enp)) != 0)
 		goto fail5;
 
+	if ((rc = siena_phy_cfg(enp)) != 0)
+		goto fail6;
+
 	/* Obtain the default PHY advertised capabilities */
 	if ((rc = siena_nic_reset(enp)) != 0)
-		goto fail6;
-	if ((rc = siena_phy_get_link(enp, &sls)) != 0)
 		goto fail7;
+	if ((rc = siena_phy_get_link(enp, &sls)) != 0)
+		goto fail8;
 	epp->ep_default_adv_cap_mask = sls.sls_adv_cap_mask;
 	epp->ep_adv_cap_mask = sls.sls_adv_cap_mask;
 
 #if EFSYS_OPT_VPD || EFSYS_OPT_NVRAM
 	if ((rc = siena_nic_get_partn_mask(enp, &mask)) != 0)
-		goto fail8;
+		goto fail9;
 	enp->en_u.siena.enu_partn_mask = mask;
 #endif
 
 #if EFSYS_OPT_MAC_STATS
 	/* Wipe the MAC statistics */
-	if ((rc = siena_mac_stats_clear(enp)) != 0)
-		goto fail9;
+	if ((rc = efx_mcdi_mac_stats_clear(enp)) != 0)
+		goto fail10;
 #endif
 
 #if EFSYS_OPT_LOOPBACK
-	if ((rc = siena_loopback_cfg(enp)) != 0)
-		goto fail10;
+	if ((rc = efx_mcdi_get_loopback_modes(enp)) != 0)
+		goto fail11;
 #endif
 
 #if EFSYS_OPT_MON_STATS
-	if ((rc = siena_monitor_cfg(enp)) != 0)
-		goto fail11;
+	if ((rc = mcdi_mon_cfg_build(enp)) != 0)
+		goto fail12;
 #endif
 
 	encp->enc_features = enp->en_features;
@@ -667,21 +284,23 @@ siena_nic_probe(
 	return (0);
 
 #if EFSYS_OPT_MON_STATS
+fail12:
+	EFSYS_PROBE(fail12);
+#endif
+#if EFSYS_OPT_LOOPBACK
 fail11:
 	EFSYS_PROBE(fail11);
 #endif
-#if EFSYS_OPT_LOOPBACK
+#if EFSYS_OPT_MAC_STATS
 fail10:
 	EFSYS_PROBE(fail10);
 #endif
-#if EFSYS_OPT_MAC_STATS
+#if EFSYS_OPT_VPD || EFSYS_OPT_NVRAM
 fail9:
 	EFSYS_PROBE(fail9);
 #endif
-#if EFSYS_OPT_VPD || EFSYS_OPT_NVRAM
 fail8:
 	EFSYS_PROBE(fail8);
-#endif
 fail7:
 	EFSYS_PROBE(fail7);
 fail6:
@@ -710,16 +329,20 @@ siena_nic_reset(
 	EFSYS_ASSERT3U(enp->en_family, ==, EFX_FAMILY_SIENA);
 
 	/* siena_nic_reset() is called to recover from BADASSERT failures. */
-	if ((rc = siena_nic_read_assertion(enp)) != 0)
+	if ((rc = efx_mcdi_read_assertion(enp)) != 0)
 		goto fail1;
-	if ((rc = siena_nic_exit_assertion_handler(enp)) != 0)
+	if ((rc = efx_mcdi_exit_assertion_handler(enp)) != 0)
 		goto fail2;
 
-	req.emr_cmd = MC_CMD_PORT_RESET;
-	EFX_STATIC_ASSERT(MC_CMD_PORT_RESET_IN_LEN == 0);
+	/*
+	 * Bug24908: ENTITY_RESET_IN_LEN is non zero but zero may be supplied
+	 * for backwards compatibility with PORT_RESET_IN_LEN.
+	 */
+	EFX_STATIC_ASSERT(MC_CMD_ENTITY_RESET_OUT_LEN == 0);
+
+	req.emr_cmd = MC_CMD_ENTITY_RESET;
 	req.emr_in_buf = NULL;
 	req.emr_in_length = 0;
-	EFX_STATIC_ASSERT(MC_CMD_PORT_RESET_OUT_LEN == 0);
 	req.emr_out_buf = NULL;
 	req.emr_out_length = 0;
 
@@ -742,40 +365,6 @@ fail1:
 	return (0);
 }
 
-static	__checkReturn	int
-siena_nic_logging(
-	__in		efx_nic_t *enp)
-{
-	efx_mcdi_req_t req;
-	uint8_t payload[MC_CMD_LOG_CTRL_IN_LEN];
-	int rc;
-
-	req.emr_cmd = MC_CMD_LOG_CTRL;
-	req.emr_in_buf = payload;
-	req.emr_in_length = MC_CMD_LOG_CTRL_IN_LEN;
-	EFX_STATIC_ASSERT(MC_CMD_LOG_CTRL_OUT_LEN == 0);
-	req.emr_out_buf = NULL;
-	req.emr_out_length = 0;
-
-	MCDI_IN_SET_DWORD(req, LOG_CTRL_IN_LOG_DEST,
-		    MC_CMD_LOG_CTRL_IN_LOG_DEST_EVQ);
-	MCDI_IN_SET_DWORD(req, LOG_CTRL_IN_LOG_DEST_EVQ, 0);
-
-	efx_mcdi_execute(enp, &req);
-
-	if (req.emr_rc != 0) {
-		rc = req.emr_rc;
-		goto fail1;
-	}
-
-	return (0);
-
-fail1:
-	EFSYS_PROBE1(fail1, int, rc);
-
-	return (rc);
-}
-
 static			void
 siena_nic_rx_cfg(
 	__in		efx_nic_t *enp)
@@ -814,7 +403,8 @@ siena_nic_init(
 
 	EFSYS_ASSERT3U(enp->en_family, ==, EFX_FAMILY_SIENA);
 
-	if ((rc = siena_nic_logging(enp)) != 0)
+	/* Enable reporting of some events (e.g. link change) */
+	if ((rc = efx_mcdi_log_ctrl(enp)) != 0)
 		goto fail1;
 
 	siena_sram_init(enp);
@@ -850,12 +440,15 @@ siena_nic_fini(
 siena_nic_unprobe(
 	__in		efx_nic_t *enp)
 {
-	(void) siena_nic_attach(enp, B_FALSE);
+#if EFSYS_OPT_MON_STATS
+	mcdi_mon_cfg_free(enp);
+#endif /* EFSYS_OPT_MON_STATS */
+	(void) efx_mcdi_drv_attach(enp, B_FALSE);
 }
 
 #if EFSYS_OPT_DIAG
 
-static efx_register_set_t __cs	__siena_registers[] = {
+static efx_register_set_t __siena_registers[] = {
 	{ FR_AZ_ADR_REGION_REG_OFST, 0, 1 },
 	{ FR_CZ_USR_EV_CFG_OFST, 0, 1 },
 	{ FR_AZ_RX_CFG_REG_OFST, 0, 1 },
@@ -871,7 +464,7 @@ static efx_register_set_t __cs	__siena_registers[] = {
 	{ FR_CZ_RX_RSS_IPV6_REG3_OFST, 0, 1}
 };
 
-static const uint32_t __cs	__siena_register_masks[] = {
+static const uint32_t __siena_register_masks[] = {
 	0x0003FFFF, 0x0003FFFF, 0x0003FFFF, 0x0003FFFF,
 	0x000103FF, 0x00000000, 0x00000000, 0x00000000,
 	0xFFFFFFFE, 0xFFFFFFFF, 0x0003FFFF, 0x00000000,
@@ -887,7 +480,7 @@ static const uint32_t __cs	__siena_register_masks[] = {
 	0xFFFFFFFF, 0xFFFFFFFF, 0x00000007, 0x00000000
 };
 
-static efx_register_set_t __cs	__siena_tables[] = {
+static efx_register_set_t __siena_tables[] = {
 	{ FR_AZ_RX_FILTER_TBL0_OFST, FR_AZ_RX_FILTER_TBL0_STEP,
 	    FR_AZ_RX_FILTER_TBL0_ROWS },
 	{ FR_CZ_RX_MAC_FILTER_TBL0_OFST, FR_CZ_RX_MAC_FILTER_TBL0_STEP,
@@ -903,7 +496,7 @@ static efx_register_set_t __cs	__siena_tables[] = {
 	    FR_CZ_TX_MAC_FILTER_TBL0_STEP, FR_CZ_TX_MAC_FILTER_TBL0_ROWS }
 };
 
-static const uint32_t __cs	__siena_table_masks[] = {
+static const uint32_t __siena_table_masks[] = {
 	0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x000003FF,
 	0xFFFF0FFF, 0xFFFFFFFF, 0x00000E7F, 0x00000000,
 	0xFFFFFFFE, 0x0FFFFFFF, 0x01800000, 0x00000000,