[PATCH] pata_cmd64x: Correct the speed ranges

[PATCH] pata_cmd64x: Correct the speed ranges

[Alan Cox]

I must have been half asleep when doing the original code

Signed-off-by: Alan Cox <alan@redhat.com>

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.23rc1-mm1/drivers/ata/pata_cmd64x.c linux-2.6.23rc1-mm1/drivers/ata/pata_cmd64x.c
--- linux.vanilla-2.6.23rc1-mm1/drivers/ata/pata_cmd64x.c	2007-07-26 15:01:52.915752536 +0100
+++ linux-2.6.23rc1-mm1/drivers/ata/pata_cmd64x.c	2007-07-26 15:18:38.486882488 +0100
@@ -31,7 +31,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_cmd64x"
-#define DRV_VERSION "0.2.3"
+#define DRV_VERSION "0.2.4"
 
 /*
  * CMD64x specific registers definition.
@@ -397,7 +397,7 @@
 			.flags = ATA_FLAG_SLAVE_POSS,
 			.pio_mask = 0x1f,
 			.mwdma_mask = 0x07,
-			.udma_mask = ATA_UDMA1,
+			.udma_mask = ATA_UDMA2,
 			.port_ops = &cmd64x_port_ops
 		},
 		{	/* CMD 646 rev 1  */
@@ -412,7 +412,7 @@
 			.flags = ATA_FLAG_SLAVE_POSS,
 			.pio_mask = 0x1f,
 			.mwdma_mask = 0x07,
-			.udma_mask = ATA_UDMA2,
+			.udma_mask = ATA_UDMA4,
 			.port_ops = &cmd648_port_ops
 		},
 		{	/* CMD 649 */
@@ -420,7 +420,7 @@
 			.flags = ATA_FLAG_SLAVE_POSS,
 			.pio_mask = 0x1f,
 			.mwdma_mask = 0x07,
-			.udma_mask = ATA_UDMA3,
+			.udma_mask = ATA_UDMA5,
 			.port_ops = &cmd648_port_ops
 		}
 	};

Re: [PATCH] pata_cmd64x: Correct the speed ranges

[Sergei Shtylyov]

Hello.

Alan Cox wrote:

> I must have been half asleep when doing the original code

> Signed-off-by: Alan Cox <alan@redhat.com>

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

> diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.23rc1-mm1/drivers/ata/pata_cmd64x.c linux-2.6.23rc1-mm1/drivers/ata/pata_cmd64x.c
> --- linux.vanilla-2.6.23rc1-mm1/drivers/ata/pata_cmd64x.c	2007-07-26 15:01:52.915752536 +0100
> +++ linux-2.6.23rc1-mm1/drivers/ata/pata_cmd64x.c	2007-07-26 15:18:38.486882488 +0100
[...]
> @@ -397,7 +397,7 @@
>  			.flags = ATA_FLAG_SLAVE_POSS,
>  			.pio_mask = 0x1f,
>  			.mwdma_mask = 0x07,

    Note that MWDMA programming is still borken in the libata driver (fixed 
now in the IDE driver).

> -			.udma_mask = ATA_UDMA1,
> +			.udma_mask = ATA_UDMA2,
>  			.port_ops = &cmd64x_port_ops
>  		},
>  		{	/* CMD 646 rev 1  */

MBR, Sergei

Re: [PATCH] pata_cmd64x: Correct the speed ranges

[Mikael Pettersson]

On Thu, 26 Jul 2007 18:43:01 +0100, Alan Cox wrote:
> I must have been half asleep when doing the original code
> 
> Signed-off-by: Alan Cox <alan@redhat.com>
> 
[patch to fix .udma_mask in pata_cmd64x omitted]

This fix inspired me to finally try to convert my Sun Ultra5
(sparc64) with a CMD646 [1095:0646 rev 03] to libata.

With pata_cmd64x the machine has so far survived a usual
boot/mrproper/reconfig/make/install/reboot kernel update
cycle without any issues, and performance seems to be the
same as with the old IDE driver.

/Mikael

scsi0 : pata_cmd64x
scsi1 : pata_cmd64x
ata1: PATA max MWDMA2 cmd 0x000001fe02c00000 ctl 0x000001fe02c0000a bmdma 0x000001fe02c00020 irq 14
ata2: PATA max MWDMA2 cmd 0x000001fe02c00010 ctl 0x000001fe02c0001a bmdma 0x000001fe02c00028 irq 14
ata1.00: ATA-4: ST320420A, 3.21, max UDMA/66
ata1.00: 39851760 sectors, multi 0: LBA 
pata_cmd64x: active 3 recovery 1 setup 1.
ata1.00: configured for MWDMA2
ata2.00: ATAPI: CRD-8483B, 1.00, max UDMA/33
pata_cmd64x: active 3 recovery 1 setup 1.
ata2.00: configured for MWDMA2
scsi 0:0:0:0: Direct-Access     ATA      ST320420A        3.21 PQ: 0 ANSI: 5
sd 0:0:0:0: [sda] 39851760 512-byte hardware sectors (20404 MB)
sd 0:0:0:0: [sda] Write Protect is off
sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
sd 0:0:0:0: [sda] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
sd 0:0:0:0: [sda] 39851760 512-byte hardware sectors (20404 MB)
sd 0:0:0:0: [sda] Write Protect is off
sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
sd 0:0:0:0: [sda] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
 sda: sda1 sda2 sda3 sda4 sda5
sd 0:0:0:0: [sda] Attached SCSI disk
scsi 1:0:0:0: CD-ROM            LG       CD-ROM CRD-8483B 1.00 PQ: 0 ANSI: 5

Re: [PATCH] pata_cmd64x: Correct the speed ranges

[Sergei Shtylyov]

Mikael Pettersson wrote:

> This fix inspired me to finally try to convert my Sun Ultra5
> (sparc64) with a CMD646 [1095:0646 rev 03] to libata.

> With pata_cmd64x the machine has so far survived a usual
> boot/mrproper/reconfig/make/install/reboot kernel update
> cycle without any issues, and performance seems to be the
> same as with the old IDE driver.

> /Mikael
> 
> scsi0 : pata_cmd64x
> scsi1 : pata_cmd64x
> ata1: PATA max MWDMA2 cmd 0x000001fe02c00000 ctl 0x000001fe02c0000a bmdma 0x000001fe02c00020 irq 14
> ata2: PATA max MWDMA2 cmd 0x000001fe02c00010 ctl 0x000001fe02c0001a bmdma 0x000001fe02c00028 irq 14
> ata1.00: ATA-4: ST320420A, 3.21, max UDMA/66
> ata1.00: 39851760 sectors, multi 0: LBA 
> pata_cmd64x: active 3 recovery 1 setup 1.
> ata1.00: configured for MWDMA2
> ata2.00: ATAPI: CRD-8483B, 1.00, max UDMA/33
> pata_cmd64x: active 3 recovery 1 setup 1.
> ata2.00: configured for MWDMA2
[...]

    Note that the olde driver has MWDMA fixed, and the new one has it still 
borken, yet MWDMA2 is the mode you're using.

MBR, Sergei

Re: [PATCH] pata_cmd64x: Correct the speed ranges

[Jeff Garzik]

Sergei Shtylyov wrote:
>    Note that the olde driver has MWDMA fixed, and the new one has it 
> still borken, yet MWDMA2 is the mode you're using.


What about MWDMA is broken?

	Jeff

Re: [PATCH] pata_cmd64x: Correct the speed ranges

[Sergei Shtylyov]

Hello.

Jeff Garzik wrote:

>>    Note that the olde driver has MWDMA fixed, and the new one has it 
>> still borken, yet MWDMA2 is the mode you're using.

> What about MWDMA is broken?

    The code that "sets" MWDMA timings is completely bogus -- I've already 
reported that before. And now I've fixed this in the old IDE driver at last.

>     Jeff

MBR, Sergei

Re: [PATCH] pata_cmd64x: Correct the speed ranges

[Jeff Garzik]

Sergei Shtylyov wrote:
> Hello.
> 
> Jeff Garzik wrote:
> 
>>>    Note that the olde driver has MWDMA fixed, and the new one has it 
>>> still borken, yet MWDMA2 is the mode you're using.
> 
>> What about MWDMA is broken?
> 
>    The code that "sets" MWDMA timings is completely bogus -- I've 
> already reported that before. And now I've fixed this in the old IDE 
> driver at last.

In what way is it completely bogus?

	Jeff

Re: [PATCH] pata_cmd64x: Correct the speed ranges

[Sergei Shtylyov]

Hello.

Jeff Garzik wrote:

>>>>    Note that the olde driver has MWDMA fixed, and the new one has it 
>>>> still borken, yet MWDMA2 is the mode you're using.

>>> What about MWDMA is broken?

>>    The code that "sets" MWDMA timings is completely bogus -- I've 
>> already reported that before. And now I've fixed this in the old IDE 
>> driver at last.

> In what way is it completely bogus?

    It writes these "timings" (they are incorrect too) to the BMIDE status 
reg. Bogus enough? ;-)

>     Jeff

MBR, Sergei

Re: [PATCH] pata_cmd64x: Correct the speed ranges

[Jeff Garzik]

Alan Cox wrote:
> I must have been half asleep when doing the original code
> 
> Signed-off-by: Alan Cox <alan@redhat.com>

applied to #upstream-fixes