Date: Fri, 6 Apr 2012 17:21:32 +0000 (UTC) From: Marius Strobl <marius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r233955 - in releng/8.3/sys: dev/mpt i386/conf Message-ID: <201204061721.q36HLWlt018895@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204061721.q36HLWlt018895>