Subject: CVS commit: [netbsd-3] src
To: None <>
From: Matthias Scheler <>
List: source-changes
Date: 12/15/2005 20:08:01
Module Name:	src
Committed By:	tron
Date:		Thu Dec 15 20:08:01 UTC 2005

Modified Files:
	src/share/man/man4 [netbsd-3]: amr.4
	src/sys/dev/pci [netbsd-3]: amr.c pcidevs

Log Message:
Pull up following revision(s) (requested by jonathan in ticket #1047):
	share/man/man4/amr.4: revision 1.11
	sys/dev/pci/amr.c: revision 1.31
	sys/dev/pci/pcidevs: revision 1.746 via patch
Add pcidevs entries and support to  amr(4) for newer LSI MegaRAID devices,
including the LSI MegaRAID SCSI 320-0x, 320-2x, 320-4x, 320-1E, 320-2E,
the LSI MegaRAID SATA 300-6x and 300-8x.
Tested on an LSI MegaRAID SATA 300-8x, which confirms private advice
that after PCI-IDs to our amr(4) driver, the newer LSI MegaRAID cards
will Just Work
The Linux megaraid2 driver accepts various Intel cards with the same
pci-device IDs as the LSI MegaRAID cards, treating them exaclty as the
above-listed LSI cards. Rework our amr(4) driver to also match and
attach those device-ID if seen with an Intel vendor-ID. Add the
Intel-vendor PCI decice-ids to pcidevs, so that PCI_VERBOSE will
correctly identify the Intel cards.
Update src/share/man/man4/amr.4 to list the newly-supported cards.
(NB: I don't have the LSI SCSI or any Intel cards to test, just the
LSI SATA, which works fine for me.)

To generate a diff of this commit:
cvs rdiff -r1.10 -r1.10.2.1 src/share/man/man4/amr.4
cvs rdiff -r1.25 -r1.25.2.1 src/sys/dev/pci/amr.c
cvs rdiff -r1.701.2.16 -r1.701.2.17 src/sys/dev/pci/pcidevs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.