From owner-svn-src-all@FreeBSD.ORG  Mon Apr 30 08:44:11 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 17DCA106566B;
	Mon, 30 Apr 2012 08:44:11 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 035488FC0A;
	Mon, 30 Apr 2012 08:44:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3U8iAlh056906;
	Mon, 30 Apr 2012 08:44:10 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3U8iAEj056904;
	Mon, 30 Apr 2012 08:44:10 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <201204300844.q3U8iAEj056904@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Mon, 30 Apr 2012 08:44:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234831 - head/sys/dev/cxgbe
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2012 08:44:11 -0000

Author: np
Date: Mon Apr 30 08:44:10 2012
New Revision: 234831
URL: http://svn.freebsd.org/changeset/base/234831

Log:
  Make sure that the firmware version is available in
  dev.t4nex.X.firmware_version even if the driver fails to attach
  properly.  At least it'll be easy to tell what we're dealing with.
  
  MFC after:	1 week

Modified:
  head/sys/dev/cxgbe/t4_main.c

Modified: head/sys/dev/cxgbe/t4_main.c
==============================================================================
--- head/sys/dev/cxgbe/t4_main.c	Mon Apr 30 08:00:52 2012	(r234830)
+++ head/sys/dev/cxgbe/t4_main.c	Mon Apr 30 08:44:10 2012	(r234831)
@@ -1449,6 +1449,11 @@ prep_firmware(struct adapter *sc)
 
 	/* Check firmware version and install a different one if necessary */
 	rc = t4_check_fw_version(sc);
+	snprintf(sc->fw_version, sizeof(sc->fw_version), "%u.%u.%u.%u",
+	    G_FW_HDR_FW_VER_MAJOR(sc->params.fw_vers),
+	    G_FW_HDR_FW_VER_MINOR(sc->params.fw_vers),
+	    G_FW_HDR_FW_VER_MICRO(sc->params.fw_vers),
+	    G_FW_HDR_FW_VER_BUILD(sc->params.fw_vers));
 	if (rc != 0) {
 		uint32_t v = 0;
 
@@ -1505,6 +1510,12 @@ prep_firmware(struct adapter *sc)
 			} else {
 				/* refresh */
 				(void) t4_check_fw_version(sc);
+				snprintf(sc->fw_version,
+				    sizeof(sc->fw_version), "%u.%u.%u.%u",
+				    G_FW_HDR_FW_VER_MAJOR(sc->params.fw_vers),
+				    G_FW_HDR_FW_VER_MINOR(sc->params.fw_vers),
+				    G_FW_HDR_FW_VER_MICRO(sc->params.fw_vers),
+				    G_FW_HDR_FW_VER_BUILD(sc->params.fw_vers));
 			}
 		}
 	}
@@ -1548,11 +1559,6 @@ prep_firmware(struct adapter *sc)
 			goto done;	/* error message displayed already */
 	}
 
-	snprintf(sc->fw_version, sizeof(sc->fw_version), "%u.%u.%u.%u",
-	    G_FW_HDR_FW_VER_MAJOR(sc->params.fw_vers),
-	    G_FW_HDR_FW_VER_MINOR(sc->params.fw_vers),
-	    G_FW_HDR_FW_VER_MICRO(sc->params.fw_vers),
-	    G_FW_HDR_FW_VER_BUILD(sc->params.fw_vers));
 	sc->flags |= FW_OK;
 
 done: