[PATCH 2.6.14-rc1] Fix broken NVIDIA device ID in sata_nv

[PATCH 2.6.14-rc1] Fix broken NVIDIA device ID in sata_nv

[Andy Currid]

Please apply this patch that corrects an NVIDIA SATA device ID in
2.6.14-rc1.

Thanks

Andy
--


Signed-off-by: Andy Currid <acurrid@nvidia.com>

diff -upr linux-2.6.14-rc1/drivers/scsi/sata_nv.c
linux-2.6.14-rc1devel/drivers/scsi/sata_nv.c
--- linux-2.6.14-rc1/drivers/scsi/sata_nv.c	2005-09-16
18:48:18.000000000 -0700
+++ linux-2.6.14-rc1devel/drivers/scsi/sata_nv.c	2005-09-16
18:49:38.000000000 -0700
@@ -158,6 +158,8 @@ static struct pci_device_id nv_pci_tbl[]
 		PCI_ANY_ID, PCI_ANY_ID, 0, 0, MCP51 },
 	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA,
 		PCI_ANY_ID, PCI_ANY_ID, 0, 0, MCP55 },
+	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA2,
+		PCI_ANY_ID, PCI_ANY_ID, 0, 0, MCP55 },
 	{ PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
 		PCI_ANY_ID, PCI_ANY_ID,
 		PCI_CLASS_STORAGE_IDE<<8, 0xffff00, GENERIC },
diff -upr linux-2.6.14-rc1/include/linux/pci_ids.h
linux-2.6.14-rc1devel/include/linux/pci_ids.h
--- linux-2.6.14-rc1/include/linux/pci_ids.h	2005-09-16
18:48:20.000000000 -0700
+++ linux-2.6.14-rc1devel/include/linux/pci_ids.h	2005-09-16
18:49:18.000000000 -0700
@@ -1249,7 +1249,8 @@
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA	0x0266
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA2	0x0267
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE	0x036E
-#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA	0x036F
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA	0x037E
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA2	0x037F
 #define PCI_DEVICE_ID_NVIDIA_NVENET_12		0x0268
 #define PCI_DEVICE_ID_NVIDIA_NVENET_13		0x0269
 #define PCI_DEVICE_ID_NVIDIA_MCP51_AUDIO	0x026B

Re: [PATCH 2.6.14-rc1] Fix broken NVIDIA device ID in sata_nv

[Jeff Garzik]

Andy Currid wrote:
> Please apply this patch that corrects an NVIDIA SATA device ID in
> 2.6.14-rc1.

> @@ -158,6 +158,8 @@ static struct pci_device_id nv_pci_tbl[]
>  		PCI_ANY_ID, PCI_ANY_ID, 0, 0, MCP51 },
>  	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA,
>  		PCI_ANY_ID, PCI_ANY_ID, 0, 0, MCP55 },
> +	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA2,
> +		PCI_ANY_ID, PCI_ANY_ID, 0, 0, MCP55 },
>  	{ PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
>  		PCI_ANY_ID, PCI_ANY_ID,
>  		PCI_CLASS_STORAGE_IDE<<8, 0xffff00, GENERIC },

I am applying this patch, but note that it does not "fix" anything.  It 
simply adds a new PCI ID, for additional hardware support.

	Jeff

Re: [PATCH 2.6.14-rc1] Fix broken NVIDIA device ID in sata_nv

[Jeff Garzik]

also, your patch was word-wrapped by your mailer...

RE: [PATCH 2.6.14-rc1] Fix broken NVIDIA device ID in sata_nv

[Andy Currid]

Jeff

It fixes something if you apply the entire patch that I posted. I
changed the #defines for MCP55_SATA and MCP55_SATA2 in pci_ids.h.

The patch didn't appear word-wrapped in what I saw get reflected back to
me from LKML. Andrew Morton accepted it without comment.

Let me now if you want me to resubmit.

Thanks

Andy

> -----Original Message-----
> From: Jeff Garzik [mailto:jgarzik@pobox.com] 
> Sent: Wednesday, September 21, 2005 19:37
> To: Andy Currid
> Cc: linux-kernel@vger.kernel.org
> Subject: Re: [PATCH 2.6.14-rc1] Fix broken NVIDIA device ID in sata_nv
> 
> Andy Currid wrote:
> > Please apply this patch that corrects an NVIDIA SATA device ID in
> > 2.6.14-rc1.
> 
> > @@ -158,6 +158,8 @@ static struct pci_device_id nv_pci_tbl[]
> >  		PCI_ANY_ID, PCI_ANY_ID, 0, 0, MCP51 },
> >  	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA,
> >  		PCI_ANY_ID, PCI_ANY_ID, 0, 0, MCP55 },
> > +	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA2,
> > +		PCI_ANY_ID, PCI_ANY_ID, 0, 0, MCP55 },
> >  	{ PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
> >  		PCI_ANY_ID, PCI_ANY_ID,
> >  		PCI_CLASS_STORAGE_IDE<<8, 0xffff00, GENERIC },
> 
> I am applying this patch, but note that it does not "fix" 
> anything.  It 
> simply adds a new PCI ID, for additional hardware support.
> 
> 	Jeff
> 
> 
>