Messages in this thread Patch in this message | | | Subject | Re: [PATCH] LSI Logic MegaRAID3 PCI ID [Was: MegaRAID on AMD64 under 2.6.1] | From | Chris Meadors <> | Date | Thu, 08 Jan 2004 15:29:59 -0500 |
| |
On Thu, 2004-01-08 at 12:19, Chris Meadors wrote: > On Thu, 2004-01-08 at 11:55, Christoph Hellwig wrote: > > On Thu, Jan 08, 2004 at 11:51:58AM -0500, Chris Meadors wrote: > > > i.e. PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_AMI_MEGARAID3 > > > > > > When I added the lines for that combination to megaraid_pci_tbl[], the > > > driver found the card. So, I'm cool now. > > > > Care to send a patch to Linus to add it? And my apologies for losing > > that entry. > > Sure thing, it is attatched, as I fear the white space mangling > abilities of my MUA.
(Replying to myself with an updated version of the patch, apply this one instead.)
I was wondering how the ID got lost. I noticed that the file was pretty much rewriten (the -rc patch is just a huge number of removes, followed by an equally large number of adds). So I started looking at the two files side by side, wondering if any other IDs were missed. Then I think I spotted what happened. In the -rc patch, there is an ID pair for, "PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_AMI_MEGARAID". Since LSI just starting making MegaRAID cards, there would have never been a device produced with that ID. The line I added in my patch was for the MEGARAID3. Looking at the older version of the file showed just as I guessed, there wasn't an LSI_LOGIC MEGARAID. I'm thinking the '3' got dropped in the conversion between the old and new files.
So, attached is a second version of this patch. Instead of adding a totally new PCI ID, I'm just removing the incorrect LSI MEGARAID, and replacing it with the LSI MEGARAID3. I've also diffed against 2.6.1-rc3 this time (but megaraid.c wasn't touched between -rc2 and 3).
-- Chris --- linux-2.6.1-rc3.orig/drivers/scsi/megaraid.c 2004-01-08 12:14:51.000000000 -0500 +++ linux-2.6.1-rc3/drivers/scsi/megaraid.c 2004-01-08 12:01:24.000000000 -0500 @@ -5093,7 +5093,7 @@ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_AMI_MEGARAID3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, - {PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_AMI_MEGARAID, + {PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_AMI_MEGARAID3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {0,} }; | |