SEO

this patch adds cheap LSI MegaRAID 320 support to ami driver.

pcidevs stuff is primarily for LSI MegaRAID 320 support but
also for unknown devices on my HP DL380. iLo part comfirmed by
http://www.pcidatabase.com/vendor_details.php?id=238 and
server's BIOS device list. Smart Array 6i part comfirmed by
PCI_DEVICE_ID_COMPAQ_CISSC entry from Linux PCI devices database.

tested on HP DL380 with Intel SRCU42X RAID controller which is
just a re-bagged 2 channel LSI board. should work for other
GC80302-based controllers. dmesg for 3.7 follows...

--- pcidevs.orig Sat May 21 13:30:40 2005
+++ pcidevs Sat May 21 13:54:11 2005
@@ -973,6 +973,7 @@
/* Compaq products */
product COMPAQ PCI_EISA_BRIDGE 0x0001 EISA
product COMPAQ PCI_ISA_BRIDGE 0x0002 ISA
+product COMPAQ CSA6i 0x0046 Smart Array 6i
product COMPAQ TRIFLEX1 0x1000 Triflex PCI
product COMPAQ TRIFLEX2 0x2000 Triflex PCI
product COMPAQ QVISION_V0 0x3032 QVision
@@ -1010,6 +1011,8 @@
product COMPAQ N10_TX_UTP 0xb030 Netelligent 10/100 TX
product COMPAQ CSA5300_2 0xb060 Smart Array 5300 rev.2
product COMPAQ CSA5i_2 0xb178 Smart Array 5i/532 rev.2
+product COMPAQ ILO 0xb203 iLo Processor
+product COMPAQ ILO_2 0xb204 iLo Controller
product COMPAQ NF3P 0xf130 NetFlex 3/P
product COMPAQ NF3P_BNC 0xf150 NetFlex 3/PB

@@ -1974,6 +1977,7 @@
product SYMBIOS 1010_2 0x0021 53c1010-66
product SYMBIOS 1030 0x0030 53c1030
product SYMBIOS 875J 0x008f 53c875J
+product SYMBIOS MEGARAID_2 0x0407 MegaRAID 320
product SYMBIOS FC909 0x0620 FC909
product SYMBIOS FC909A 0x0621 FC909A
product SYMBIOS FC929 0x0622 FC929
--- ami_pci.c.orig Sat May 21 13:30:34 2005
+++ ami_pci.c Sat May 21 13:51:43 2005
@@ -86,6 +86,7 @@
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_80960RP_ATU,
AMI_CHECK_SIGN | AMI_BROKEN },
{ PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_MEGARAID, 0 },
+ { PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_MEGARAID_2, 0 },
{ PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SATA8, 0 },
{ 0 }
};
@@ -93,7 +94,7 @@
static const
struct ami_pci_subsys {
pcireg_t id;
- char name[12];
+ char name[14];
} ami_pci_subsys[] = {
/* only those of a special name are listed here */
{ 0x09A0101E, "Dell 466v1" },
@@ -105,6 +106,7 @@
{ 0x10cc103c, "HP T7" },
{ 0x10cd103c, "HP 466" },
{ 0x45231000, "LSI 523" },
+ { 0x05328086, "Intel SRCU42X" },
{ 0 }
};

@@ -117,6 +119,7 @@
{ 0x1028, "Dell" },
{ 0x103c, "HP" },
{ 0x1000, "LSI" },
+ { 0x8086, "Intel" },
{ 0 }
};

dmesg:

OpenBSD 3.7 (GENERIC) #0: Fri May 20 17:12:19 EEST 2005
root@localhost:/usr/src/sys/arch/i386/compile/GENERIC
cpu0: Intel(R) Xeon(TM) CPU 3.40GHz ("GenuineIntel" 686-class) 3.40 GHz
cpu0:
FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,P GE,MCA,CMOV,PAT,PSE36,CFLUSH,ACPI,MMX,FXSR,SSE,SSE 2,SS,HTT,TM,SBF,PNI,MWAIT,EST,CNXT-ID
cpu0: Enhanced SpeedStep disabled by BIOS
real mem = 4227362816 (4128284K)
avail mem = 3401277440 (3321560K)
using 4278 buffers containing 211472384 bytes (206516K) of memory
mainbus0 (root)
bios0 at mainbus0: AT/286+(00) BIOS, date 12/31/99, BIOS32 rev. 0 @ 0xf0000
pcibios0 at bios0: rev 2.1 @ 0xf0000/0x2000
pcibios0: PCI BIOS has 7 Interrupt Routing table entries
pcibios0: PCI Interrupt Router at 000:31:0 ("Intel 82801EB/ER LPC" rev 0x00)
pcibios0: PCI bus #8 is the last bus
bios0: ROM list: 0xc0000/0x8000 0xc8000/0x2400 0xca400/0x1800
0xee000/0x2000!
cpu0 at mainbus0
pci0 at mainbus0 bus 0: configuration mode 1 (no bios)
pchb0 at pci0 dev 0 function 0 "Intel E7710 SMCH" rev 0x0c
ppb0 at pci0 dev 2 function 0 "Intel E7710 MCH PCIE" rev 0x0c
pci1 at ppb0 bus 1
ppb1 at pci1 dev 0 function 0 "Intel PCIE-PCIE" rev 0x09
pci2 at ppb1 bus 2
bge0 at pci2 dev 1 function 0 "Broadcom BCM5704C" rev 0x10, unknown
BCM5704 (0x2100): irq 5 address 00:12:79:d2:e2:fd
brgphy0 at bge0 phy 1: BCM5704 10/100/1000baseT PHY, rev. 0
bge1 at pci2 dev 1 function 1 "Broadcom BCM5704C" rev 0x10, unknown
BCM5704 (0x2100): irq 5 address 00:12:79:d2:e2:fc
brgphy1 at bge1 phy 1: BCM5704 10/100/1000baseT PHY, rev. 0
ppb2 at pci1 dev 0 function 2 "Intel PCIE-PCIE" rev 0x09
pci3 at ppb2 bus 3
ppb3 at pci0 dev 6 function 0 "Intel E7710 MCH PCIE" rev 0x0c
pci4 at ppb3 bus 4
ppb4 at pci4 dev 0 function 0 "Intel PCIE-PCIE" rev 0x09
pci5 at ppb4 bus 5
ppb5 at pci5 dev 1 function 0 "IBM PCIX-PCIX" rev 0x03
pci6 at ppb5 bus 6
ami0 at pci6 dev 0 function 0 "Symbios Logic MegaRAID 320" rev 0x02: irq
5 Intel SRCU42X/32b
ami0: FW 413Y, BIOS vH420, 512MB RAM
ami0: 2 channels, 0 FC loops, 1 logical drives
scsibus0 at ami0: 40 targets
sd0 at scsibus0 targ 0 lun 0: <AMI, Host drive #00, > SCSI2 0/direct fixed
sd0: 205992MB, 26260 cyl, 255 head, 63 sec, 512 bytes/sec, 421871616 sec
total
ppb6 at pci4 dev 0 function 2 "Intel PCIE-PCIE" rev 0x09
pci7 at ppb6 bus 7
uhci0 at pci0 dev 29 function 0 "Intel 82801EB/ER USB" rev 0x02: irq 5
usb0 at uhci0: USB revision 1.0
uhub0 at usb0
uhub0: Intel UHCI root hub, class 9/0, rev 1.00/1.00, addr 1
uhub0: 2 ports with 2 removable, self powered
uhci1 at pci0 dev 29 function 1 "Intel 82801EB/ER USB" rev 0x02: irq 5
usb1 at uhci1: USB revision 1.0
uhub1 at usb1
uhub1: Intel UHCI root hub, class 9/0, rev 1.00/1.00, addr 1
uhub1: 2 ports with 2 removable, self powered
uhci2 at pci0 dev 29 function 2 "Intel 82801EB/ER USB" rev 0x02: irq 5
usb2 at uhci2: USB revision 1.0
uhub2 at usb2
uhub2: Intel UHCI root hub, class 9/0, rev 1.00/1.00, addr 1
uhub2: 2 ports with 2 removable, self powered
uhci3 at pci0 dev 29 function 3 "Intel 82801EB/ER USB" rev 0x02: irq 5
usb3 at uhci3: USB revision 1.0
uhub3 at usb3
uhub3: Intel UHCI root hub, class 9/0, rev 1.00/1.00, addr 1
uhub3: 2 ports with 2 removable, self powered
ehci0 at pci0 dev 29 function 7 "Intel 82801EB/ER USB" rev 0x02: irq 5
ehci0: EHCI version 1.0
ehci0: companion controllers, 2 ports each: uhci0 uhci1 uhci2 uhci3
usb4 at ehci0: USB revision 2.0
uhub4 at usb4
uhub4: Intel EHCI root hub, class 9/0, rev 2.00/1.00, addr 1
uhub4: single transaction translator
uhub4: 8 ports with 8 removable, self powered
ppb7 at pci0 dev 30 function 0 "Intel 82801BA AGP" rev 0xc2
pci8 at ppb7 bus 8
vga1 at pci8 dev 3 function 0 "ATI Rage XL" rev 0x27
wsdisplay0 at vga1: console (80x25, vt100 emulation)
wsdisplay0: screen 1-5 added (80x25, vt100 emulation)
"Compaq iLo Processor" rev 0x01 at pci8 dev 4 function 0 not configured
"Compaq iLo Controller" rev 0x01 at pci8 dev 4 function 2 not configured
ichpcib0 at pci0 dev 31 function 0 "Intel 82801EB/ER LPC" rev 0x02
pciide0 at pci0 dev 31 function 1 "Intel 82801EB/ER IDE" rev 0x02: DMA,
channel 0 configured to compatibility, channel 1 configured to compatibility
atapiscsi0 at pciide0 channel 0 drive 0
scsibus1 at atapiscsi0: 2 targets
cd0 at scsibus1 targ 0 lun 0: <TEAC, DV-28E-C, B.4F> SCSI0 5/cdrom removable
cd0(pciide0:0:0): using PIO mode 4, Ultra-DMA mode 1
pciide0: channel 1 disabled (no drives)
isa0 at ichpcib0
isadma0 at isa0
pckbc0 at isa0 port 0x60/5
pckbd0 at pckbc0 (kbd slot)
pckbc0: using irq 1 for kbd slot
wskbd0 at pckbd0 (mux 1 ignored for console): console keyboard, using
wsdisplay0
pmsi0 at pckbc0 (aux slot)
pckbc0: using irq 12 for aux slot
wsmouse0 at pmsi0 mux 0
pcppi0 at isa0 port 0x61
midi0 at pcppi0: <PC speaker>
sysbeep0 at pcppi0
npx0 at isa0 port 0xf0/16: using exception 16
pccom0 at isa0 port 0x3f8/8 irq 4: ns16550a, 16 byte fifo
pccom1 at isa0 port 0x2f8/8 irq 3: ns16550a, 16 byte fifo
fdc0 at isa0 port 0x3f0/6 irq 6 drq 2
fd0 at fdc0 drive 0: 1.44MB 80 cyl, 2 head, 18 sec
biomask efe5 netmask efe5 ttymask ffe7
pctr: user-level cycle counter enabled
dkcsum: sd0 matched BIOS disk 80
root on sd0a
rootdev=0x400 rrootdev=0xd00 rawdev=0xd02