Subject: kern/35970: HP ML110 G2 / Adaptec 2610SA support
To: None <kern-bug-people@netbsd.org, gnats-admin@netbsd.org,>
From: Todd Kover <kovert@omniscient.com>
List: netbsd-bugs
Date: 03/10/2007 21:00:02
>Number: 35970
>Category: kern
>Synopsis: Add support for HP ML110 G2 / Adaptec 2610SA
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: kern-bug-people
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Sat Mar 10 21:00:00 +0000 2007
>Originator: Todd Kover
>Release: NetBSD 4.0_BETA2
>Organization:
Omniscient Technologies
>Environment:
System: NetBSD tarvalon.omniscient.com 4.0_BETA2 NetBSD 4.0_BETA2 (GENERIC) #12: Sat Mar 10 15:35:40 EST 2007 kovert@saidin.omniscient.com:/usr/obj/4.0-stable/i386/omniscient/os/NetBSD-4.0-branch/src/sys/arch/i386/compile/GENERIC i386
Architecture: i386
Machine: i386
>Description:
This is a port of the pci bits for the HP ML110 G2's version of
the Adaptec 2610SA from FreeBSD. The card itself doesn't show
any HP markings, just 'Adaptec 2610SA', but web searches seem
to indicate that this was originally an HP card with that name.
Apparently the Dell CERC card is another version of the same
card, though different firmware. Adaptec's site shows no trace
of this card.
I developed against 4.0 beta2 for this from today, but the changes
are trivial enough that they should just apply anywhere.
It would be awesome if this could be pulled up to 4.0 once it
was committed.
>How-To-Repeat:
This should be evident. :)
>Fix:
path for -current and 4.0 attached.
########################### patch against -current ###########################
Index: share/man/man4/aac.4
===================================================================
RCS file: /cvsroot/src/share/man/man4/aac.4,v
retrieving revision 1.10
diff -u -r1.10 aac.4
--- share/man/man4/aac.4 13 Nov 2006 16:33:57 -0000 1.10
+++ share/man/man4/aac.4 10 Mar 2007 20:50:30 -0000
@@ -70,6 +70,8 @@
Dell CERC SATA RAID 1.5/6ch
.It
HP NetRAID 4M
+.It
+HP ML110 G2 (Adaptec SATA RAID 2610SA)
.Pp
.El
Access to RAID containers is available via the
Index: sys/dev/pci/aac_pci.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/aac_pci.c,v
retrieving revision 1.19
diff -u -r1.19 aac_pci.c
--- sys/dev/pci/aac_pci.c 16 Nov 2006 01:33:08 -0000 1.19
+++ sys/dev/pci/aac_pci.c 10 Mar 2007 20:50:45 -0000
@@ -304,6 +304,15 @@
"Adaptec ASR-2410SA"
},
{
+ PCI_VENDOR_ADP2,
+ PCI_PRODUCT_ADP2_ASR2200S,
+ PCI_VENDOR_HP,
+ PCI_PRODUCT_ADP2_HP_M110_G2,
+ AAC_HWIF_I960RX,
+ 0,
+ "HP ML110 G2 (Adaptec ASR-2610SA)"
+ },
+ {
PCI_VENDOR_DEC,
PCI_PRODUCT_DEC_21554,
PCI_VENDOR_ADP2,
Index: sys/dev/pci/pcidevs
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/pcidevs,v
retrieving revision 1.871
diff -u -r1.871 pcidevs
--- sys/dev/pci/pcidevs 9 Mar 2007 22:10:40 -0000 1.871
+++ sys/dev/pci/pcidevs 10 Mar 2007 20:50:46 -0000
@@ -819,6 +819,7 @@
product ADP2 PERC_2QC 0x1364 Dell PERC 2/QC
/* XXX guess */
product ADP2 PERC_3QC 0x1365 Dell PERC 3/QC
+product ADP2 HP_M110_G2 0x3227 HP M110 G2 / ASR-2610SA
/* Addtron Products */
product ADDTRON 8139 0x1360 8139 Ethernet
Index: sys/dev/pci/pcidevs.h
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/pcidevs.h,v
retrieving revision 1.871
diff -u -r1.871 pcidevs.h
--- sys/dev/pci/pcidevs.h 9 Mar 2007 22:11:06 -0000 1.871
+++ sys/dev/pci/pcidevs.h 10 Mar 2007 20:50:48 -0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcidevs.h,v 1.871 2007/03/09 22:11:06 xtraeme Exp $ */
+/* $NetBSD$ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -826,6 +826,7 @@
#define PCI_PRODUCT_ADP2_PERC_2QC 0x1364 /* Dell PERC 2/QC */
/* XXX guess */
#define PCI_PRODUCT_ADP2_PERC_3QC 0x1365 /* Dell PERC 3/QC */
+#define PCI_PRODUCT_ADP2_HP_M110_G2 0x3227 /* HP M110 G2 / ASR-2610SA */
/* Addtron Products */
#define PCI_PRODUCT_ADDTRON_8139 0x1360 /* 8139 Ethernet */
Index: sys/dev/pci/pcidevs_data.h
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/pcidevs_data.h,v
retrieving revision 1.870
diff -u -r1.870 pcidevs_data.h
--- sys/dev/pci/pcidevs_data.h 9 Mar 2007 22:11:07 -0000 1.870
+++ sys/dev/pci/pcidevs_data.h 10 Mar 2007 20:50:49 -0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcidevs_data.h,v 1.870 2007/03/09 22:11:07 xtraeme Exp $ */
+/* $NetBSD$ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -3008,6 +3008,10 @@
"Dell PERC 3/QC",
},
{
+ PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_HP_M110_G2,
+ "HP M110 G2 / ASR-2610SA",
+ },
+ {
PCI_VENDOR_ADDTRON, PCI_PRODUCT_ADDTRON_8139,
"8139 Ethernet",
},
@@ -12828,4 +12832,4 @@
"Video Controller",
},
};
-const int pci_nproducts = 2613;
+const int pci_nproducts = 2584;
########################### patch against today's 4.0 ########################
Index: share/man/man4/aac.4
===================================================================
RCS file: /cvsroot/src/share/man/man4/aac.4,v
retrieving revision 1.10
diff -u -r1.10 aac.4
--- share/man/man4/aac.4 13 Nov 2006 16:33:57 -0000 1.10
+++ share/man/man4/aac.4 10 Mar 2007 20:43:24 -0000
@@ -70,6 +70,8 @@
Dell CERC SATA RAID 1.5/6ch
.It
HP NetRAID 4M
+.It
+HP ML110 G2 (Adaptec SATA RAID 2610SA)
.Pp
.El
Access to RAID containers is available via the
Index: sys/dev/pci/aac_pci.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/aac_pci.c,v
retrieving revision 1.19
diff -u -r1.19 aac_pci.c
--- sys/dev/pci/aac_pci.c 16 Nov 2006 01:33:08 -0000 1.19
+++ sys/dev/pci/aac_pci.c 10 Mar 2007 20:43:30 -0000
@@ -304,6 +304,15 @@
"Adaptec ASR-2410SA"
},
{
+ PCI_VENDOR_ADP2,
+ PCI_PRODUCT_ADP2_ASR2200S,
+ PCI_VENDOR_HP,
+ PCI_PRODUCT_ADP2_HP_M110_G2,
+ AAC_HWIF_I960RX,
+ 0,
+ "HP ML110 G2 (Adaptec ASR-2610SA)"
+ },
+ {
PCI_VENDOR_DEC,
PCI_PRODUCT_DEC_21554,
PCI_VENDOR_ADP2,
Index: sys/dev/pci/pcidevs
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/pcidevs,v
retrieving revision 1.855.2.4
diff -u -r1.855.2.4 pcidevs
--- sys/dev/pci/pcidevs 21 Feb 2007 13:17:59 -0000 1.855.2.4
+++ sys/dev/pci/pcidevs 10 Mar 2007 20:43:31 -0000
@@ -819,6 +819,7 @@
product ADP2 PERC_2QC 0x1364 Dell PERC 2/QC
/* XXX guess */
product ADP2 PERC_3QC 0x1365 Dell PERC 3/QC
+product ADP2 HP_M110_G2 0x3227 HP M110 G2 / ASR-2610SA
/* Addtron Products */
product ADDTRON 8139 0x1360 8139 Ethernet
Index: sys/dev/pci/pcidevs.h
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/pcidevs.h,v
retrieving revision 1.854.2.4
diff -u -r1.854.2.4 pcidevs.h
--- sys/dev/pci/pcidevs.h 21 Feb 2007 13:18:47 -0000 1.854.2.4
+++ sys/dev/pci/pcidevs.h 10 Mar 2007 20:43:32 -0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcidevs.h,v 1.854.2.4 2007/02/21 13:18:47 tron Exp $ */
+/* $NetBSD$ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -826,6 +826,7 @@
#define PCI_PRODUCT_ADP2_PERC_2QC 0x1364 /* Dell PERC 2/QC */
/* XXX guess */
#define PCI_PRODUCT_ADP2_PERC_3QC 0x1365 /* Dell PERC 3/QC */
+#define PCI_PRODUCT_ADP2_HP_M110_G2 0x3227 /* HP M110 G2 / ASR-2610SA */
/* Addtron Products */
#define PCI_PRODUCT_ADDTRON_8139 0x1360 /* 8139 Ethernet */
Index: sys/dev/pci/pcidevs_data.h
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/pcidevs_data.h,v
retrieving revision 1.853.2.4
diff -u -r1.853.2.4 pcidevs_data.h
--- sys/dev/pci/pcidevs_data.h 21 Feb 2007 13:18:48 -0000 1.853.2.4
+++ sys/dev/pci/pcidevs_data.h 10 Mar 2007 20:43:34 -0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcidevs_data.h,v 1.853.2.4 2007/02/21 13:18:48 tron Exp $ */
+/* $NetBSD$ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -3008,6 +3008,10 @@
"Dell PERC 3/QC",
},
{
+ PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_HP_M110_G2,
+ "HP M110 G2 / ASR-2610SA",
+ },
+ {
PCI_VENDOR_ADDTRON, PCI_PRODUCT_ADDTRON_8139,
"8139 Ethernet",
},
@@ -12708,4 +12712,4 @@
"Video Controller",
},
};
-const int pci_nproducts = 2583;
+const int pci_nproducts = 2584;