From owner-svn-src-all@freebsd.org Mon Jan 2 09:50:53 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 3761EC9BACA;
Mon, 2 Jan 2017 09:50:53 +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 E0B9B16F9;
Mon, 2 Jan 2017 09:50:52 +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 v029oqCE012445;
Mon, 2 Jan 2017 09:50:52 GMT (envelope-from arybchik@FreeBSD.org)
Received: (from arybchik@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v029oqvI012444;
Mon, 2 Jan 2017 09:50:52 GMT (envelope-from arybchik@FreeBSD.org)
Message-Id: <201701020950.v029oqvI012444@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: arybchik set sender to
arybchik@FreeBSD.org using -f
From: Andrew Rybchenko <arybchik@FreeBSD.org>
Date: Mon, 2 Jan 2017 09:50:52 +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: r311096 - stable/10/sys/dev/sfxge
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jan 2017 09:50:53 -0000
Author: arybchik
Date: Mon Jan 2 09:50:51 2017
New Revision: 311096
URL: https://svnweb.freebsd.org/changeset/base/311096
Log:
MFC r310820
sfxge(4): move queue size checks to after the NIC config has been populated
Submitted by: Mark Spender <mspender at solarflare.com>
Sponsored by: Solarflare Communications, Inc.
Modified:
stable/10/sys/dev/sfxge/sfxge.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/sfxge/sfxge.c
==============================================================================
--- stable/10/sys/dev/sfxge/sfxge.c Mon Jan 2 09:49:40 2017 (r311095)
+++ stable/10/sys/dev/sfxge/sfxge.c Mon Jan 2 09:50:51 2017 (r311096)
@@ -739,6 +739,16 @@ sfxge_create(struct sfxge_softc *sc)
goto fail3;
sc->enp = enp;
+ /* Initialize MCDI to talk to the microcontroller. */
+ DBGPRINT(sc->dev, "mcdi_init...");
+ if ((error = sfxge_mcdi_init(sc)) != 0)
+ goto fail4;
+
+ /* Probe the NIC and build the configuration data area. */
+ DBGPRINT(sc->dev, "nic_probe...");
+ if ((error = efx_nic_probe(enp)) != 0)
+ goto fail5;
+
if (!ISP2(sfxge_rx_ring_entries) ||
(sfxge_rx_ring_entries < EFX_RXQ_MINNDESCS) ||
(sfxge_rx_ring_entries > EFX_RXQ_MAXNDESCS)) {
@@ -761,16 +771,6 @@ sfxge_create(struct sfxge_softc *sc)
}
sc->txq_entries = sfxge_tx_ring_entries;
- /* Initialize MCDI to talk to the microcontroller. */
- DBGPRINT(sc->dev, "mcdi_init...");
- if ((error = sfxge_mcdi_init(sc)) != 0)
- goto fail4;
-
- /* Probe the NIC and build the configuration data area. */
- DBGPRINT(sc->dev, "nic_probe...");
- if ((error = efx_nic_probe(enp)) != 0)
- goto fail5;
-
SYSCTL_ADD_STRING(device_get_sysctl_ctx(dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
OID_AUTO, "version", CTLFLAG_RD,
@@ -863,14 +863,14 @@ fail7:
efx_nvram_fini(enp);
fail6:
+fail_tx_ring_entries:
+fail_rx_ring_entries:
efx_nic_unprobe(enp);
fail5:
sfxge_mcdi_fini(sc);
fail4:
-fail_tx_ring_entries:
-fail_rx_ring_entries:
sc->enp = NULL;
efx_nic_destroy(enp);
SFXGE_EFSYS_LOCK_DESTROY(&sc->enp_lock);