2004-01-08 21:38:36

by Mukker, Atul

[permalink] [raw]
Subject: RE: [PATCH] LSI Logic MegaRAID3 PCI ID [Was: MegaRAID on AMD64und er 2.6.1]

I have not followed this thread completly yet but both
PCI_DEVICE_ID_MEGARAID and PCI_DEVICE_ID_MEGARAID3 are valid and both should
be present. Look for their definitions in the header file or pci_ids.h

Thanks
-Atul Mukker
LSI Logic

> -----Original Message-----
> From: Chris Meadors [mailto:[email protected]]
> Sent: Thursday, January 08, 2004 3:30 PM
> To: Christoph Hellwig
> Cc: Linux Kernel; Linus Torvalds
> Subject: Re: [PATCH] LSI Logic MegaRAID3 PCI ID [Was: MegaRAID on
> AMD64under 2.6.1]
>
>
> 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
>


2004-01-08 22:01:18

by Chris Meadors

[permalink] [raw]
Subject: RE: [PATCH] LSI Logic MegaRAID3 PCI ID [Was: MegaRAID on AMD64und er 2.6.1]

On Thu, 2004-01-08 at 16:38, Mukker, Atul wrote:
> I have not followed this thread completly yet but both
> PCI_DEVICE_ID_MEGARAID and PCI_DEVICE_ID_MEGARAID3 are valid and both should
> be present. Look for their definitions in the header file or pci_ids.h

Yes, both of those are valid device IDs (which is probably why the
dropped 3 didn't get noticed right away, it still compiled). But are
there any cards out there that bear LSI Logic's vendor ID (1000) and the
MegaRAID version 1 device ID (9010)? I'm thinking not.

Since LSI just started making MegaRAID cards at version 3. That is what
I ment was invalid, the full line, LSI + MEGARAID. All cards with
LSI_LOGIC as the vendor will be MEGARAID3 (1960).

The older version of megaraid.c didn't include an LSI + MEGARAID, but
did have an LSI + MEGARAID3. The new version was the other way around,
and didn't detect my card any longer. In my first patch, I just added a
new ID. But after a little thinking and back tracking, I figured it was
probably a copy and paste error, and the '3' was dropped from the device
ID. A new defination wasn't needed, just a correction to the mis-copied
one.

--
Chris