From owner-svn-src-all@FreeBSD.ORG  Thu Apr 18 22:54:42 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 65CB5DC3;
 Thu, 18 Apr 2013 22:54:42 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 58AAC893;
 Thu, 18 Apr 2013 22:54:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3IMsgpI041610;
 Thu, 18 Apr 2013 22:54:42 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3IMsgHt041609;
 Thu, 18 Apr 2013 22:54:42 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <201304182254.r3IMsgHt041609@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Thu, 18 Apr 2013 22:54:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249629 - head/sys/dev/cxgbe/common
X-SVN-Group: head
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.14
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/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Apr 2013 22:54:42 -0000

Author: np
Date: Thu Apr 18 22:54:41 2013
New Revision: 249629
URL: http://svnweb.freebsd.org/changeset/base/249629

Log:
  cxgbe(4): Refuse to install T5 firmwares on a T4 card (and vice versa).
  
  MFC after:	1 week

Modified:
  head/sys/dev/cxgbe/common/t4_hw.c

Modified: head/sys/dev/cxgbe/common/t4_hw.c
==============================================================================
--- head/sys/dev/cxgbe/common/t4_hw.c	Thu Apr 18 20:13:33 2013	(r249628)
+++ head/sys/dev/cxgbe/common/t4_hw.c	Thu Apr 18 22:54:41 2013	(r249629)
@@ -1136,6 +1136,13 @@ int t4_load_fw(struct adapter *adap, con
 		       FLASH_FW_MAX_SIZE);
 		return -EFBIG;
 	}
+	if ((is_t4(adap) && hdr->chip != FW_HDR_CHIP_T4) ||
+	    (is_t5(adap) && hdr->chip != FW_HDR_CHIP_T5)) {
+		CH_ERR(adap,
+		    "FW image (%d) is not suitable for this adapter (%d)\n",
+		    hdr->chip, chip_id(adap));
+		return -EINVAL;
+	}
 
 	for (csum = 0, i = 0; i < size / sizeof(csum); i++)
 		csum += ntohl(p[i]);