[patch] Fix support for SiS5581/5582/5596 IDE

[patch] Fix support for SiS5581/5582/5596 IDE

[Vojtech Pavlik]

[-- Attachment #1: Type: text/plain, Size: 316 bytes --]

Hi!

The last patch for SiS96* also added support for SiS5581, SiS5582 and
SiS5596. However, the PCI IDs for these three chips were incorrect by
mistake (cut and paste problem). This patch, on top of the previous one
fixes it, and thus adds proper support for these old chips.

-- 
Vojtech Pavlik
SuSE Labs, SuSE CR

[-- Attachment #2: sis5581-2.4.diff --]
[-- Type: text/plain, Size: 1736 bytes --]

ChangeSet@1.1213, 2003-05-16 15:52:40+02:00, vojtech@suse.cz
  sis5513.c: Fix newly added SiS55** PCI IDs.


 drivers/ide/pci/sis5513.c |    9 ++++-----
 include/linux/pci_ids.h   |    3 +++
 2 files changed, 7 insertions(+), 5 deletions(-)


diff -Nru a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
--- a/drivers/ide/pci/sis5513.c	Fri May 16 15:53:18 2003
+++ b/drivers/ide/pci/sis5513.c	Fri May 16 15:53:18 2003
@@ -105,12 +105,11 @@
 	{ "SiS5600",	PCI_DEVICE_ID_SI_5600,	ATA_33   },
 	{ "SiS5598",	PCI_DEVICE_ID_SI_5598,	ATA_33   },
 	{ "SiS5597",	PCI_DEVICE_ID_SI_5597,	ATA_33   },
-	{ "SiS5592",	PCI_DEVICE_ID_SI_5591,	ATA_33   },
-	{ "SiS5591",	PCI_DEVICE_ID_SI_5591,	ATA_33   },
-	{ "SiS5581",	PCI_DEVICE_ID_SI_5571,	ATA_33   },
-	{ "SiS5582",	PCI_DEVICE_ID_SI_5571,	ATA_33   },
+	{ "SiS5591/2",	PCI_DEVICE_ID_SI_5591,	ATA_33   },
+	{ "SiS5582",	PCI_DEVICE_ID_SI_5582,	ATA_33   },
+	{ "SiS5581",	PCI_DEVICE_ID_SI_5581,	ATA_33   },
 
-	{ "SiS5596",	PCI_DEVICE_ID_SI_5597,	ATA_16   },
+	{ "SiS5596",	PCI_DEVICE_ID_SI_5596,	ATA_16   },
 	{ "SiS5571",	PCI_DEVICE_ID_SI_5571,	ATA_16   },
 	{ "SiS551x",	PCI_DEVICE_ID_SI_5511,	ATA_16   },
 };
diff -Nru a/include/linux/pci_ids.h b/include/linux/pci_ids.h
--- a/include/linux/pci_ids.h	Fri May 16 15:53:18 2003
+++ b/include/linux/pci_ids.h	Fri May 16 15:53:18 2003
@@ -521,7 +521,10 @@
 #define PCI_DEVICE_ID_SI_5513		0x5513
 #define PCI_DEVICE_ID_SI_5518		0x5518
 #define PCI_DEVICE_ID_SI_5571		0x5571
+#define PCI_DEVICE_ID_SI_5581		0x5581
+#define PCI_DEVICE_ID_SI_5582		0x5582
 #define PCI_DEVICE_ID_SI_5591		0x5591
+#define PCI_DEVICE_ID_SI_5596		0x5596
 #define PCI_DEVICE_ID_SI_5597		0x5597
 #define PCI_DEVICE_ID_SI_5598		0x5598
 #define PCI_DEVICE_ID_SI_5600		0x5600

[-- Attachment #3: sis5581-2.5.diff --]
[-- Type: text/plain, Size: 1736 bytes --]

ChangeSet@1.1151, 2003-05-16 15:54:27+02:00, vojtech@suse.cz
  sis5513.c: Fix newly added SiS55** PCI IDs.


 drivers/ide/pci/sis5513.c |    9 ++++-----
 include/linux/pci_ids.h   |    3 +++
 2 files changed, 7 insertions(+), 5 deletions(-)


diff -Nru a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
--- a/drivers/ide/pci/sis5513.c	Fri May 16 15:57:07 2003
+++ b/drivers/ide/pci/sis5513.c	Fri May 16 15:57:07 2003
@@ -105,12 +105,11 @@
 	{ "SiS5600",	PCI_DEVICE_ID_SI_5600,	ATA_33   },
 	{ "SiS5598",	PCI_DEVICE_ID_SI_5598,	ATA_33   },
 	{ "SiS5597",	PCI_DEVICE_ID_SI_5597,	ATA_33   },
-	{ "SiS5592",	PCI_DEVICE_ID_SI_5591,	ATA_33   },
-	{ "SiS5591",	PCI_DEVICE_ID_SI_5591,	ATA_33   },
-	{ "SiS5581",	PCI_DEVICE_ID_SI_5571,	ATA_33   },
-	{ "SiS5582",	PCI_DEVICE_ID_SI_5571,	ATA_33   },
+	{ "SiS5591/2",	PCI_DEVICE_ID_SI_5591,	ATA_33   },
+	{ "SiS5582",	PCI_DEVICE_ID_SI_5582,	ATA_33   },
+	{ "SiS5581",	PCI_DEVICE_ID_SI_5581,	ATA_33   },
 
-	{ "SiS5596",	PCI_DEVICE_ID_SI_5597,	ATA_16   },
+	{ "SiS5596",	PCI_DEVICE_ID_SI_5596,	ATA_16   },
 	{ "SiS5571",	PCI_DEVICE_ID_SI_5571,	ATA_16   },
 	{ "SiS551x",	PCI_DEVICE_ID_SI_5511,	ATA_16   },
 };
diff -Nru a/include/linux/pci_ids.h b/include/linux/pci_ids.h
--- a/include/linux/pci_ids.h	Fri May 16 15:57:07 2003
+++ b/include/linux/pci_ids.h	Fri May 16 15:57:07 2003
@@ -577,7 +577,10 @@
 #define PCI_DEVICE_ID_SI_5513		0x5513
 #define PCI_DEVICE_ID_SI_5518		0x5518
 #define PCI_DEVICE_ID_SI_5571		0x5571
+#define PCI_DEVICE_ID_SI_5581		0x5581
+#define PCI_DEVICE_ID_SI_5582		0x5582
 #define PCI_DEVICE_ID_SI_5591		0x5591
+#define PCI_DEVICE_ID_SI_5596		0x5596
 #define PCI_DEVICE_ID_SI_5597		0x5597
 #define PCI_DEVICE_ID_SI_5598		0x5598
 #define PCI_DEVICE_ID_SI_5600		0x5600

Re: [patch] Fix support for SiS5581/5582/5596 IDE

[Lionel Bouton]

Vojtech Pavlik wrote:

>Hi!
>
>The last patch for SiS96* also added support for SiS5581, SiS5582 and
>SiS5596. However, the PCI IDs for these three chips were incorrect by
>mistake (cut and paste problem). This patch, on top of the previous one
>fixes it, and thus adds proper support for these old chips.
>  
>

Thanks for the work.
I've yet to read carefully each change (will do this week-end), but I 
agree on the principles.

The only thing that disturbed me was the removal of the DEBUG code (as 
it often helped me find out bugs and understand new chips' behavior) but 
I think it's best for me to maintain a patch which adds this code in the 
very rare cases where it can be usefull.

LB.

Re: [patch] Fix support for SiS5581/5582/5596 IDE

[Vojtech Pavlik]

On Fri, May 16, 2003 at 04:13:17PM +0200, Lionel Bouton wrote:

> >The last patch for SiS96* also added support for SiS5581, SiS5582 and
> >SiS5596. However, the PCI IDs for these three chips were incorrect by
> >mistake (cut and paste problem). This patch, on top of the previous one
> >fixes it, and thus adds proper support for these old chips.
> 
> Thanks for the work.
> I've yet to read carefully each change (will do this week-end), but I 
> agree on the principles.

Great. And thanks for veryfing the patch.

> The only thing that disturbed me was the removal of the DEBUG code (as 
> it often helped me find out bugs and understand new chips' behavior) but 
> I think it's best for me to maintain a patch which adds this code in the 
> very rare cases where it can be usefull.
 
I sort of expected that when I was removing it. ;) Debugging code comes
very handy when one runs into problems, but clutters up the source in
all other cases. So the final decision to keep it or have a separate
debug patch is of course in your hands. 

-- 
Vojtech Pavlik
SuSE Labs, SuSE CR