LinuxLists.cc - [PATCH] Add IDE mode support for SB600 SATA

2006-11-22 22:27:05

Subject: [PATCH] Add IDE mode support for SB600 SATA

ATI SB600 SATA controller supports 4 modes: Legacy IDE, Native IDE, AHCI and RAID. Legacy/Native IDE mode is designed for compatibility with some old OS without AHCI driver but looses SATAII/AHCI features such as NCQ. This patch provides users with two options when the SB600 SATA is set as IDE mode by BIOS:
1. Setting the controller back to AHCI mode and using ahci as its driver.
2. Using the controller as a normal IDE.
What's more, without this patch, ahci driver always tries to claim all 4 modes of SB600 SATA, but fails in legacy IDE mode.

Signed-off-by: [email protected]
-------
diff -Nur linux-2.6.19-rc6-git4.orig/drivers/ata/ahci.c linux-2.6.19-rc6-git4/drivers/ata/ahci.c
--- linux-2.6.19-rc6-git4.orig/drivers/ata/ahci.c 2006-11-23 13:36:52.000000000 +0800
+++ linux-2.6.19-rc6-git4/drivers/ata/ahci.c 2006-11-23 13:50:13.000000000 +0800
@@ -323,7 +323,14 @@
{ PCI_VDEVICE(JMICRON, 0x2366), board_ahci }, /* JMicron JMB366 */

/* ATI */
+#ifdef CONFIG_SB600_AHCI_IDE
{ PCI_VDEVICE(ATI, 0x4380), board_ahci }, /* ATI SB600 non-raid */
+#else
+ { PCI_VENDOR_ID_ATI, 0x4380, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_RAID<<8, 0xffff00,
+ board_ahci },
+ { PCI_VENDOR_ID_ATI, 0x4380, PCI_ANY_ID, PCI_ANY_ID, 0x010600, 0xffff00,
+ board_ahci },
+#endif
{ PCI_VDEVICE(ATI, 0x4381), board_ahci }, /* ATI SB600 raid */

/* VIA */
diff -Nur linux-2.6.19-rc6-git4.orig/drivers/ata/Kconfig linux-2.6.19-rc6-git4/drivers/ata/Kconfig
--- linux-2.6.19-rc6-git4.orig/drivers/ata/Kconfig 2006-11-23 13:36:52.000000000 +0800
+++ linux-2.6.19-rc6-git4/drivers/ata/Kconfig 2006-11-23 13:37:50.000000000 +0800
@@ -27,6 +27,18 @@

If unsure, say N.

+config SB600_AHCI_IDE
+ bool "ATI SB600 IDE mode of SATA controller support"
+ depends on SATA_AHCI
+ default y
+ help
+ ATI SB600 SATA controller supports 4 modes: Legacy IDE, Native
+ IDE, AHCI and RAID. If this option is enabled, the contoller
+ will run in AHCI mode and use ahci.ko as it's driver, otherwise
+ it will work as an IDE controller using atiixp.ko as it's driver.
+
+ If unsure, say y.
+
config SATA_SVW
tristate "ServerWorks Frodo / Apple K2 SATA support"
depends on PCI
diff -Nur linux-2.6.19-rc6-git4.orig/drivers/ide/pci/atiixp.c linux-2.6.19-rc6-git4/drivers/ide/pci/atiixp.c
--- linux-2.6.19-rc6-git4.orig/drivers/ide/pci/atiixp.c 2006-11-23 13:36:51.000000000 +0800
+++ linux-2.6.19-rc6-git4/drivers/ide/pci/atiixp.c 2006-11-23 13:38:08.000000000 +0800
@@ -318,7 +318,8 @@
hwif->drives[0].autodma = hwif->autodma;
}

-static void __devinit init_hwif_sb600_legacy(ide_hwif_t *hwif)
+#ifndef CONFIG_SB600_AHCI_IDE
+static void __devinit init_hwif_sb600_sata(ide_hwif_t *hwif)
{

hwif->atapi_dma = 1;
@@ -331,6 +332,7 @@
hwif->drives[0].autodma = hwif->autodma;
hwif->drives[1].autodma = hwif->autodma;
}
+#endif

static ide_pci_device_t atiixp_pci_info[] __devinitdata = {
{ /* 0 */
@@ -340,13 +342,16 @@
.autodma = AUTODMA,
.enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
.bootable = ON_BOARD,
- },{ /* 1 */
- .name = "ATI SB600 SATA Legacy IDE",
- .init_hwif = init_hwif_sb600_legacy,
+ },
+#ifndef CONFIG_SB600_AHCI_IDE
+ { /* 1 */
+ .name = "ATI SB600 SATA (IDE mode)",
+ .init_hwif = init_hwif_sb600_sata,
.channels = 2,
.autodma = AUTODMA,
.bootable = ON_BOARD,
}
+#endif
};

/**
@@ -368,7 +373,9 @@
{ 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, 0},
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, PCI_ANY_ID, PCI_ANY_ID, (PCI_CLASS_STORAGE_IDE<<8)|0x8a, 0xffff05, 1},
+#ifndef CONFIG_SB600_AHCI_IDE
+ { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_IDE<<8, 0xffff00, 1},
+#endif
{ 0, },
};
MODULE_DEVICE_TABLE(pci, atiixp_pci_tbl);
diff -Nur linux-2.6.19-rc6-git4.orig/drivers/pci/quirks.c linux-2.6.19-rc6-git4/drivers/pci/quirks.c
--- linux-2.6.19-rc6-git4.orig/drivers/pci/quirks.c 2006-11-23 13:36:52.000000000 +0800
+++ linux-2.6.19-rc6-git4/drivers/pci/quirks.c 2006-11-23 13:38:17.000000000 +0800
@@ -796,6 +796,25 @@
}
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_PCI_MASTER, quirk_mediagx_master );

+#ifdef CONFIG_SB600_AHCI_IDE
+static void __devinit quirk_sb600_sata(struct pci_dev *pdev)
+{
+ if ((pdev->class >> 8) == PCI_CLASS_STORAGE_IDE) {
+ u8 tmp;
+
+ pci_read_config_byte(pdev, 0x40, &tmp);
+ pci_write_config_byte(pdev, 0x40, tmp|1);
+ pci_write_config_byte(pdev, 0x9, 1);
+ pci_write_config_byte(pdev, 0xa, 6);
+ pci_write_config_byte(pdev, 0x40, tmp);
+
+ pdev->class = 0x010601;
+ }
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, quirk_sb600_sata);
+#endif
+
+
/*
* As per PCI spec, ignore base address registers 0-3 of the IDE controllers
* running in Compatible mode (bits 0 and 2 in the ProgIf for primary and

2006-11-23 02:26:25

by Andrew Morton

[permalink] [raw]

Subject: Re: [PATCH] Add IDE mode support for SB600 SATA

2006-11-23 02:32:07

by Andrew Morton

[permalink] [raw]

Subject: Re: [PATCH] Add IDE mode support for SB600 SATA

On Thu, 23 Nov 2006 06:23:50 +0800
"Conke Hu" <[email protected]> wrote:

> ATI SB600 SATA controller supports 4 modes: Legacy IDE, Native IDE, AHCI and RAID. Legacy/Native IDE mode is designed for compatibility with some old OS without AHCI driver but looses SATAII/AHCI features such as NCQ. This patch provides users with two options when the SB600 SATA is set as IDE mode by BIOS:
> 1. Setting the controller back to AHCI mode and using ahci as its driver.
> 2. Using the controller as a normal IDE.
> What's more, without this patch, ahci driver always tries to claim all 4 modes of SB600 SATA, but fails in legacy IDE mode.
>
> Signed-off-by: [email protected]
> -------
> diff -Nur linux-2.6.19-rc6-git4.orig/drivers/ata/ahci.c linux-2.6.19-rc6-git4/drivers/ata/ahci.c
> --- linux-2.6.19-rc6-git4.orig/drivers/ata/ahci.c 2006-11-23 13:36:52.000000000 +0800
> +++ linux-2.6.19-rc6-git4/drivers/ata/ahci.c 2006-11-23 13:50:13.000000000 +0800
> @@ -323,7 +323,14 @@
> { PCI_VDEVICE(JMICRON, 0x2366), board_ahci }, /* JMicron JMB366 */
>
> /* ATI */
> +#ifdef CONFIG_SB600_AHCI_IDE
> { PCI_VDEVICE(ATI, 0x4380), board_ahci }, /* ATI SB600 non-raid */
> +#else
> + { PCI_VENDOR_ID_ATI, 0x4380, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_RAID<<8, 0xffff00,
> + board_ahci },
> + { PCI_VENDOR_ID_ATI, 0x4380, PCI_ANY_ID, PCI_ANY_ID, 0x010600, 0xffff00,
> + board_ahci },
> +#endif

And your patch conflicts in mysterious ways with the below.

I've been sitting on this patch for three months. I don't know why.

From: "Anatoli Antonovitch" <[email protected]>

Automatically match the proper driver for different SATA/IDE modes of SB600
SATA controller: ahci for SATA/Native IDE/RAID modes and ATIIXP_IDE for legacy
mode.

Signed-off-by: Anatoli Antonovitch <[email protected]>
Cc: Jeff Garzik <[email protected]>
Cc: Alan Cox <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---

drivers/ata/ahci.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff -puN drivers/ata/ahci.c~ahci-ati-sb600-sata-support-for-various-modes drivers/ata/ahci.c
--- a/drivers/ata/ahci.c~ahci-ati-sb600-sata-support-for-various-modes
+++ a/drivers/ata/ahci.c
@@ -323,7 +323,12 @@ static const struct pci_device_id ahci_p
{ PCI_VDEVICE(JMICRON, 0x2366), board_ahci }, /* JMicron JMB366 */

/* ATI */
- { PCI_VDEVICE(ATI, 0x4380), board_ahci }, /* ATI SB600 non-raid */
+ { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, PCI_ANY_ID,
+ PCI_ANY_ID, 0x010600, 0xffff00, board_ahci }, /* ATI SB600 AHCI */
+ { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, PCI_ANY_ID,
+ PCI_ANY_ID, 0x010400, 0xffff00, board_ahci }, /* ATI SB600 raid */
+ { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, PCI_ANY_ID,
+ PCI_ANY_ID, (PCI_CLASS_STORAGE_IDE<<8)|0x8f, 0xffff05, board_ahci }, /* ATI SB600 native IDE */
{ PCI_VDEVICE(ATI, 0x4381), board_ahci }, /* ATI SB600 raid */

/* VIA */
_

2006-11-23 04:04:37

by Conke Hu

[permalink] [raw]

Subject: RE: [PATCH] Add IDE mode support for SB600 SATA

-----Original Message-----
From: Andrew Morton [mailto:[email protected]]
Sent: Thursday, November 23, 2006 10:31 AM
To: Conke Hu
Cc: [email protected]; Anatoli Antonovitch; Jeff Garzik; Tejun Heo
Subject: Re: [PATCH] Add IDE mode support for SB600 SATA

On Thu, 23 Nov 2006 06:23:50 +0800
"Conke Hu" <[email protected]> wrote:

> ATI SB600 SATA controller supports 4 modes: Legacy IDE, Native IDE, AHCI and RAID. Legacy/Native IDE mode is designed for compatibility with some old OS without AHCI driver but looses SATAII/AHCI features such as NCQ. This patch provides users with two options when the SB600 SATA is set as IDE mode by BIOS:
> 1. Setting the controller back to AHCI mode and using ahci as its driver.
> 2. Using the controller as a normal IDE.
> What's more, without this patch, ahci driver always tries to claim all 4 modes of SB600 SATA, but fails in legacy IDE mode.
>
> Signed-off-by: [email protected]
> -------
> diff -Nur linux-2.6.19-rc6-git4.orig/drivers/ata/ahci.c linux-2.6.19-rc6-git4/drivers/ata/ahci.c
> --- linux-2.6.19-rc6-git4.orig/drivers/ata/ahci.c 2006-11-23 13:36:52.000000000 +0800
> +++ linux-2.6.19-rc6-git4/drivers/ata/ahci.c 2006-11-23 13:50:13.000000000 +0800
> @@ -323,7 +323,14 @@
> { PCI_VDEVICE(JMICRON, 0x2366), board_ahci }, /* JMicron JMB366 */
>
> /* ATI */
> +#ifdef CONFIG_SB600_AHCI_IDE
> { PCI_VDEVICE(ATI, 0x4380), board_ahci }, /* ATI SB600 non-raid */
> +#else
> + { PCI_VENDOR_ID_ATI, 0x4380, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_RAID<<8, 0xffff00,
> + board_ahci },
> + { PCI_VENDOR_ID_ATI, 0x4380, PCI_ANY_ID, PCI_ANY_ID, 0x010600, 0xffff00,
> + board_ahci },
> +#endif

And your patch conflicts in mysterious ways with the below.

I've been sitting on this patch for three months. I don't know why.

From: "Anatoli Antonovitch" <[email protected]>

Automatically match the proper driver for different SATA/IDE modes of SB600 SATA controller: ahci for SATA/Native IDE/RAID modes and ATIIXP_IDE for legacy mode.

Signed-off-by: Anatoli Antonovitch <[email protected]>
Cc: Jeff Garzik <[email protected]>
Cc: Alan Cox <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---

drivers/ata/ahci.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff -puN drivers/ata/ahci.c~ahci-ati-sb600-sata-support-for-various-modes drivers/ata/ahci.c
--- a/drivers/ata/ahci.c~ahci-ati-sb600-sata-support-for-various-modes
+++ a/drivers/ata/ahci.c
@@ -323,7 +323,12 @@ static const struct pci_device_id ahci_p
{ PCI_VDEVICE(JMICRON, 0x2366), board_ahci }, /* JMicron JMB366 */

/* ATI */
- { PCI_VDEVICE(ATI, 0x4380), board_ahci }, /* ATI SB600 non-raid */
+ { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, PCI_ANY_ID,
+ PCI_ANY_ID, 0x010600, 0xffff00, board_ahci }, /* ATI SB600 AHCI */
+ { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, PCI_ANY_ID,
+ PCI_ANY_ID, 0x010400, 0xffff00, board_ahci }, /* ATI SB600 raid */
+ { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, PCI_ANY_ID,
+ PCI_ANY_ID, (PCI_CLASS_STORAGE_IDE<<8)|0x8f, 0xffff05, board_ahci },
+/* ATI SB600 native IDE */
{ PCI_VDEVICE(ATI, 0x4381), board_ahci }, /* ATI SB600 raid */

/* VIA */
_

Hi Andrew,
Thank you! I will re-write the patch since you think it is not reasonable.
There were 3 patches for sb600 sata controller, including the one you listed, but none is accepted, so I will re-create the patch until it is accepted.
(btw, I am sorry for using MS Outlook to reply this maillist. It seems we use different mail format, and I will switch to another email client next time.)

best regards,
conke

2006-11-23 11:07:16

by Alan

[permalink] [raw]

Subject: Re: [PATCH] Add IDE mode support for SB600 SATA

On Wed, 22 Nov 2006 18:26:10 -0800
Andrew Morton <[email protected]> wrote:

> I doubt if it's appropriate to do all this via ifdefs. Users don't compile
> their kernels - others compile them for the users. We need the one kernel
> binary to support both modes. Possible?

I'm not sure we do. What the Jmicron drivers do is

- If SATA (libata) is enabled (module or built in) then turn on AHCI
- If it is not enabled then support the chip fully in SFF mode via
drivers/ide

As the AHCI mode is fundamentally better (both with respect to standards
and to performance) this makes sense.

I think the SB600 should do the same - if support is in the
kernel/modules - then turn on AHCI mode. If not then don't. No user
options needed, no complex config questions.

Alan