[patch] Add more device IDs for supporting ATI SB700 SATA controller completely

[patch] Add more device IDs for supporting ATI SB700 SATA controller completely

[Henry Su]

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

From: henry.su@amd.com

The sata controller device ID will be different according to the onchip
 sata type setting in system BIOS:
Device                                                                 Device ID
SATA in IDE mode                                             0x4390
SATA in AHCI mode                                           0x4391
SATA in RAID mode with non-Raid 5 driver  0x4392
SATA in RAID mode with Raid 5 driver          0x4393

Signed-off-by: henry.su@amd.com
----------------------------------------------
diff -Nur linux-2.6.22.1.orig/drivers/ata/ahci.c linux-2.6.22.1/drivers/ata/ahci.c
--- linux-2.6.22.1.orig/drivers/ata/ahci.c      2007-07-13 10:39:27.854093200 +0800
+++ linux-2.6.22.1/drivers/ata/ahci.c   2007-07-13 10:52:58.625022700 +0800
@@ -399,7 +399,10 @@

        /* ATI */
        { PCI_VDEVICE(ATI, 0x4380), board_ahci_sb600 }, /* ATI SB600 */
-       { PCI_VDEVICE(ATI, 0x4390), board_ahci_sb600 }, /* ATI SB700 */
+       { PCI_VDEVICE(ATI, 0x4390), board_ahci_sb600 }, /* ATI SB700 IDE */
+       { PCI_VDEVICE(ATI, 0x4391), board_ahci_sb600 }, /* ATI SB700 AHCI */
+       { PCI_VDEVICE(ATI, 0x4392), board_ahci_sb600 }, /* ATI SB700 nor-raid5 */
+       { PCI_VDEVICE(ATI, 0x4393), board_ahci_sb600 }, /* ATI SB700 raid5 */

        /* VIA */
        { PCI_VDEVICE(VIA, 0x3349), board_ahci_vt8251 }, /* VIA VT8251 */

[-- Attachment #2: sb700sataids.patch --]
[-- Type: application/octet-stream, Size: 775 bytes --]

diff -Nur linux-2.6.22.1.orig/drivers/ata/ahci.c linux-2.6.22.1/drivers/ata/ahci.c
--- linux-2.6.22.1.orig/drivers/ata/ahci.c	2007-07-13 10:39:27.854093200 +0800
+++ linux-2.6.22.1/drivers/ata/ahci.c	2007-07-13 10:52:58.625022700 +0800
@@ -399,7 +399,10 @@
 
 	/* ATI */
 	{ PCI_VDEVICE(ATI, 0x4380), board_ahci_sb600 }, /* ATI SB600 */
-	{ PCI_VDEVICE(ATI, 0x4390), board_ahci_sb600 }, /* ATI SB700 */
+	{ PCI_VDEVICE(ATI, 0x4390), board_ahci_sb600 }, /* ATI SB700 IDE */
+	{ PCI_VDEVICE(ATI, 0x4391), board_ahci_sb600 }, /* ATI SB700 AHCI */
+	{ PCI_VDEVICE(ATI, 0x4392), board_ahci_sb600 }, /* ATI SB700 nor-raid5 */
+	{ PCI_VDEVICE(ATI, 0x4393), board_ahci_sb600 }, /* ATI SB700 raid5 */
 
 	/* VIA */
 	{ PCI_VDEVICE(VIA, 0x3349), board_ahci_vt8251 }, /* VIA VT8251 */

[patch] SB700 contains more than one IDE channel

[Shane Huang]

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

From: shane.huang@amd.com

SB700 supports one physical IDE channel, but SB700 SATA controller
supports combined mode. When the SATA combined mode is enabled,
two SATA ports(port4 and port5) share one IDE channel from IDE
controller, and PATA will share the other IDE channel.

Our previous patch adding SB700 IDE device ID only support one
IDE channel, which contains bug. The attached patch fix the bug.


Signed-off-by: shane.huang@amd.com
----------------------------------------------
diff -ruN linux-2.6.23-rc5_orig/drivers/ide/pci/atiixp.c
linux-2.6.23-rc5/drivers/ide/pci/atiixp.c
--- linux-2.6.23-rc5_orig/drivers/ide/pci/atiixp.c	2007-09-01
14:08:24.000000000 +0800
+++ linux-2.6.23-rc5/drivers/ide/pci/atiixp.c	2007-09-28
00:35:55.000000000 +0800
@@ -325,7 +325,7 @@
 	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP300_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0},
 	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0},
 	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 1},
-	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 1},
+	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0},
 	{ 0, },
 };
 MODULE_DEVICE_TABLE(pci, atiixp_pci_tbl);




[-- Attachment #2: SB700_2_IDE_Channels.patch --]
[-- Type: application/octet-stream, Size: 780 bytes --]

diff -ruN linux-2.6.23-rc5_orig/drivers/ide/pci/atiixp.c linux-2.6.23-rc5/drivers/ide/pci/atiixp.c
--- linux-2.6.23-rc5_orig/drivers/ide/pci/atiixp.c	2007-09-01 14:08:24.000000000 +0800
+++ linux-2.6.23-rc5/drivers/ide/pci/atiixp.c	2007-09-28 00:35:55.000000000 +0800
@@ -325,7 +325,7 @@
 	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP300_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
-	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
+	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{ 0, },
 };
 MODULE_DEVICE_TABLE(pci, atiixp_pci_tbl);

Re: [patch] SB700 contains more than one IDE channel

[Sergei Shtylyov]

Hello.

Shane Huang wrote:

> SB700 supports one physical IDE channel, but SB700 SATA controller
> supports combined mode. When the SATA combined mode is enabled,
> two SATA ports(port4 and port5) share one IDE channel from IDE
> controller, and PATA will share the other IDE channel.

> Our previous patch adding SB700 IDE device ID only support one
> IDE channel, which contains bug. The attached patch fix the bug.

> Signed-off-by: shane.huang@amd.com

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>

> ----------------------------------------------
> diff -ruN linux-2.6.23-rc5_orig/drivers/ide/pci/atiixp.c
> linux-2.6.23-rc5/drivers/ide/pci/atiixp.c
> --- linux-2.6.23-rc5_orig/drivers/ide/pci/atiixp.c	2007-09-01
> 14:08:24.000000000 +0800
> +++ linux-2.6.23-rc5/drivers/ide/pci/atiixp.c	2007-09-28
> 00:35:55.000000000 +0800
> @@ -325,7 +325,7 @@
>  	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP300_IDE, PCI_ANY_ID,
> PCI_ANY_ID, 0, 0, 0},
>  	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_IDE, PCI_ANY_ID,
> PCI_ANY_ID, 0, 0, 0},
>  	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_IDE, PCI_ANY_ID,
> PCI_ANY_ID, 0, 0, 1},
> -	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_IDE, PCI_ANY_ID,
> PCI_ANY_ID, 0, 0, 1},
> +	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_IDE, PCI_ANY_ID,
> PCI_ANY_ID, 0, 0, 0},
>  	{ 0, },
>  };
>  MODULE_DEVICE_TABLE(pci, atiixp_pci_tbl);

    The inlined patch has suffered from word wrapping, and the attached one 
luckily didn't; yet the attachment has a wrong MIME type -- patches should be 
text/plain.

MBR, Sergei

RE: [patch] SB700 contains more than one IDE channel

[Shane Huang]

Hi Sergei:

Thanks for your reply.

>     The inlined patch has suffered from word wrapping, 

OK, I think the cause is my mail client MS outlook's setting.
I try to change my outlook settings and attach the patch again at the
end of this mail. Please check it again.

> and the attached one
> luckily didn't; yet the attachment has a wrong MIME type -- patches
should be
> text/plain.

As to this case, I don't know why. The patch was generated with diff on
linux,
and copied to my windows mail machine to be sent. All my previous
patches
with the same method do NOT meet such problem.
So if the patch in this mail does not work either, would you please help
to
change and apply it for me? So that we can save some time, otherwise
I'll
have to try to use gmail to send it at home.

Thanks
Best Regards
Shane


Signed-off-by: shane.huang@amd.com
----------------------------------------------
diff -ruN linux-2.6.23-rc5_orig/drivers/ide/pci/atiixp.c
linux-2.6.23-rc5/drivers/ide/pci/atiixp.c
--- linux-2.6.23-rc5_orig/drivers/ide/pci/atiixp.c	2007-09-01
14:08:24.000000000 +0800
+++ linux-2.6.23-rc5/drivers/ide/pci/atiixp.c	2007-09-28
00:35:55.000000000 +0800
@@ -325,7 +325,7 @@
 	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP300_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0},
 	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0},
 	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 1},
-	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 1},
+	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0},
 	{ 0, },
 };
 MODULE_DEVICE_TABLE(pci, atiixp_pci_tbl);

Re: [patch] SB700 contains more than one IDE channel

[Bartlomiej Zolnierkiewicz]

On Thursday 27 September 2007, Shane Huang wrote:
> From: shane.huang@amd.com
> 
> SB700 supports one physical IDE channel, but SB700 SATA controller
> supports combined mode. When the SATA combined mode is enabled,
> two SATA ports(port4 and port5) share one IDE channel from IDE
> controller, and PATA will share the other IDE channel.
> 
> Our previous patch adding SB700 IDE device ID only support one
> IDE channel, which contains bug. The attached patch fix the bug.
> 
> 
> Signed-off-by: shane.huang@amd.com

applied

The inlined patch was word-wrapped and the attached one lacked patch
description so manual fixing was required anyway.  Not a big problem
but next time please try to use some known-to-be-good mail client to
inline patches.

Thanks,
Bart