From: Sascha Wildner <saw@online.de>
Date: Tue, 23 Dec 2008 09:20:57 +0000 (+0100)
Subject: Add support for the FC929X in mpt(4).
X-Git-Tag: v2.3.0~220^2~7
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/d30c73c756d0855a17a29d8c38a775cd92d755eb

Add support for the FC929X in mpt(4).

Submitted-by:  Ben Matthews <matthb2@scorec.rpi.edu>
Dragonfly-bug: <https://bugs.dragonflybsd.org/issue1186>
---

diff --git a/share/man/man4/mpt.4 b/share/man/man4/mpt.4
index 5a5b96c1b6..492a5a94e8 100644
--- a/share/man/man4/mpt.4
+++ b/share/man/man4/mpt.4
@@ -67,7 +67,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd November 7, 2003
+.Dd December 23, 2008
 .Dt MPT 4
 .Os
 .Sh NAME
@@ -100,7 +100,8 @@ FC909A
 FC919
 .Pq 2Gb/s Tn Fibre Channel
 .It
-FC929
+FC929,
+FC929X
 .Pq Dual 2Gb/s Tn Fibre Channel
 .El
 .Pp
diff --git a/sys/bus/pci/pcidevs b/sys/bus/pci/pcidevs
index 43be75ce11..b0ce168c3d 100644
--- a/sys/bus/pci/pcidevs
+++ b/sys/bus/pci/pcidevs
@@ -2097,6 +2097,7 @@ product SYMBIOS FC929	0x0622	FC929
 product SYMBIOS FC929_1	0x0623	FC929
 product SYMBIOS FC919	0x0624	FC919
 product SYMBIOS FC919_1	0x0625	FC919
+product SYMBIOS FC929X	0x0626	FC929X
 
 /* Packet Engines products */
 product SYMBIOS PE_GNIC	0x0702	Packet Engines G-NIC Ethernet
diff --git a/sys/bus/pci/pcidevs.h b/sys/bus/pci/pcidevs.h
index 585db06e2f..651317135a 100644
--- a/sys/bus/pci/pcidevs.h
+++ b/sys/bus/pci/pcidevs.h
@@ -1,10 +1,5 @@
-/*	$DragonFly$	*/
-
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
- *
- * generated from:
- *	DragonFly: src/sys/bus/pci/pcidevs,v 1.35 2008/09/13 02:21:56 sephe Exp 
  */
 /* $NetBSD: pcidevs,v 1.606 2004/01/06 19:44:17 matt Exp $ */
 
@@ -2104,6 +2099,7 @@
 #define	PCI_PRODUCT_SYMBIOS_FC929_1	0x0623		/* FC929 */
 #define	PCI_PRODUCT_SYMBIOS_FC919	0x0624		/* FC919 */
 #define	PCI_PRODUCT_SYMBIOS_FC919_1	0x0625		/* FC919 */
+#define	PCI_PRODUCT_SYMBIOS_FC929X	0x0626		/* FC929X */
 
 /* Packet Engines products */
 #define	PCI_PRODUCT_SYMBIOS_PE_GNIC	0x0702		/* Packet Engines G-NIC Ethernet */
diff --git a/sys/bus/pci/pcidevs_data.h b/sys/bus/pci/pcidevs_data.h
index 3744563cfb..b4e8e42942 100644
--- a/sys/bus/pci/pcidevs_data.h
+++ b/sys/bus/pci/pcidevs_data.h
@@ -1,10 +1,5 @@
-/*	$DragonFly$	*/
-
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
- *
- * generated from:
- *	DragonFly: src/sys/bus/pci/pcidevs,v 1.35 2008/09/13 02:21:56 sephe Exp 
  */
 /* $NetBSD: pcidevs,v 1.606 2004/01/06 19:44:17 matt Exp $ */
 
@@ -7198,6 +7193,12 @@ const struct pci_knowndev pci_knowndevs[] = {
 	    "Symbios Logic",
 	    "FC919",
 	},
+	{
+	    PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_FC929X,
+	    0,
+	    "Symbios Logic",
+	    "FC929X",
+	},
 	{
 	    PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_PE_GNIC,
 	    0,
diff --git a/sys/dev/disk/mpt/mpt_pci.c b/sys/dev/disk/mpt/mpt_pci.c
index ad325dcf9e..c7c4a610cc 100644
--- a/sys/dev/disk/mpt/mpt_pci.c
+++ b/sys/dev/disk/mpt/mpt_pci.c
@@ -130,6 +130,9 @@ mpt_probe(device_t dev)
 	case PCI_PRODUCT_SYMBIOS_FC929:
 		desc = "LSILogic FC929 FC Adapter";
 		break;
+	case PCI_PRODUCT_SYMBIOS_FC929X:
+		desc = "LSILogic FC929 FC Adapter";
+		break;
 	case PCI_PRODUCT_SYMBIOS_1030:
 		desc = "LSILogic 1030 Ultra4 Adapter";
 		break;
@@ -213,6 +216,7 @@ mpt_attach(device_t dev)
 	case PCI_PRODUCT_SYMBIOS_FC909A:
 	case PCI_PRODUCT_SYMBIOS_FC919:
 	case PCI_PRODUCT_SYMBIOS_FC929:
+	case PCI_PRODUCT_SYMBIOS_FC929X:
 		mpt->is_fc = 1;
 		break;
 	default:
@@ -251,6 +255,7 @@ mpt_attach(device_t dev)
 	 * If so, link with our partner (around yet)
 	 */
 	if ((pci_get_device(dev) & ~1) == PCI_PRODUCT_SYMBIOS_FC929 ||
+	    (pci_get_device(dev) & ~1) == PCI_PRODUCT_SYMBIOS_FC929X ||
 	    (pci_get_device(dev) & ~1) == PCI_PRODUCT_SYMBIOS_1030) {
 		mpt_link_peer(mpt);
 	}