From owner-svn-src-all@FreeBSD.ORG  Fri Apr  6 17:21:32 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 8F5D1106566C;
	Fri,  6 Apr 2012 17:21:32 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7B1C48FC17;
	Fri,  6 Apr 2012 17:21:32 +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 q36HLW3x018897;
	Fri, 6 Apr 2012 17:21:32 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q36HLWlt018895;
	Fri, 6 Apr 2012 17:21:32 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201204061721.q36HLWlt018895@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Fri, 6 Apr 2012 17:21:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233955 - in releng/8.3/sys: dev/mpt i386/conf
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: Fri, 06 Apr 2012 17:21:32 -0000

Author: marius
Date: Fri Apr  6 17:21:31 2012
New Revision: 233955
URL: http://svn.freebsd.org/changeset/base/233955

Log:
  MFC: r233827 (backported)
  
  Fix probing of SAS1068E with a device ID of 0x0059 after r232411 (MFC'ed
  to releng/8.3 in r232632).
  Reported by: infofarmer
  
  This is a minimal direct commit to releng/8.3 in order to restore pre-r232632
  behavior for the above devices.
  
  Approved by:	re (kensmith)

Modified:
  releng/8.3/sys/dev/mpt/mpt_pci.c
Directory Properties:
  releng/8.3/sys/   (props changed)
  releng/8.3/sys/amd64/include/xen/   (props changed)
  releng/8.3/sys/boot/   (props changed)
  releng/8.3/sys/cddl/contrib/opensolaris/   (props changed)
  releng/8.3/sys/contrib/dev/acpica/   (props changed)
  releng/8.3/sys/contrib/pf/   (props changed)
  releng/8.3/sys/dev/e1000/   (props changed)
  releng/8.3/sys/i386/conf/XENHVM   (props changed)

Modified: releng/8.3/sys/dev/mpt/mpt_pci.c
==============================================================================
--- releng/8.3/sys/dev/mpt/mpt_pci.c	Fri Apr  6 16:41:19 2012	(r233954)
+++ releng/8.3/sys/dev/mpt/mpt_pci.c	Fri Apr  6 17:21:31 2012	(r233955)
@@ -205,6 +205,10 @@ __FBSDID("$FreeBSD$");
 #define PCI_PRODUCT_LSI_SAS1068E	0x0058
 #endif
 
+#ifndef PCI_PRODUCT_LSI_SAS1068E2
+#define PCI_PRODUCT_LSI_SAS1068E2	0x0059
+#endif
+
 #ifndef PCI_PRODUCT_LSI_SAS1078
 #define PCI_PRODUCT_LSI_SAS1078		0x0062
 #endif
@@ -305,6 +309,7 @@ mpt_pci_probe(device_t dev)
 	case PCI_PRODUCT_LSI_SAS1068:
 	case PCI_PRODUCT_LSI_SAS1068A:
 	case PCI_PRODUCT_LSI_SAS1068E:
+	case PCI_PRODUCT_LSI_SAS1068E2:
 	case PCI_PRODUCT_LSI_SAS1078:
 	case PCI_PRODUCT_LSI_SAS1078DE:
 		desc = "LSILogic SAS/SATA Adapter";
@@ -493,6 +498,7 @@ mpt_pci_attach(device_t dev)
 	case PCI_PRODUCT_LSI_SAS1068:
 	case PCI_PRODUCT_LSI_SAS1068A:
 	case PCI_PRODUCT_LSI_SAS1068E:
+	case PCI_PRODUCT_LSI_SAS1068E2:
 		mpt->is_sas = 1;
 		break;
 	default: