[PATCH] pata_marvell: fix cable detection - take 2

[PATCH] pata_marvell: fix cable detection - take 2

[Arnaud Patard]

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


Last time I looked at the cable detection code, I fixed the "always
detect cable as sata cable" case, but this is not enough. I didn't
notice that the 80-pin cable was seen as a 40-pin cable.
The appended patch fixes that.

Signed-off-by: Arnaud Patard <apatard@mandriva.com>
---

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: pata_marvell_fix_cable_detection_take2.patch --]
[-- Type: text/x-patch, Size: 534 bytes --]

Index: libata-dev/drivers/ata/pata_marvell.c
===================================================================
--- libata-dev.orig/drivers/ata/pata_marvell.c
+++ libata-dev/drivers/ata/pata_marvell.c
@@ -57,11 +57,10 @@ static int marvell_pre_reset(struct ata_
 	switch(ap->port_no)
 	{
 	case 0:
-		/* Might be backward, docs unclear */
 		if (inb(ap->ioaddr.bmdma_addr + 1) & 1)
-			ap->cbl = ATA_CBL_PATA80;
-		else
 			ap->cbl = ATA_CBL_PATA40;
+		else
+			ap->cbl = ATA_CBL_PATA80;
 		break;
 
 	case 1: /* Legacy SATA port */

Re: [PATCH] pata_marvell: fix cable detection - take 2

[Alan Cox]

On Mon, Nov 20, 2006 at 09:20:44PM +0100, Arnaud Patard wrote:
> 
> Last time I looked at the cable detection code, I fixed the "always
> detect cable as sata cable" case, but this is not enough. I didn't
> notice that the 80-pin cable was seen as a 40-pin cable.
> The appended patch fixes that.

Thanks - the docs were a bit blank on which was which - have you checked
this now detects right both ways around ?

Re: [PATCH] pata_marvell: fix cable detection - take 2

[Arnaud Patard]

Alan Cox <alan@redhat.com> writes:

> On Mon, Nov 20, 2006 at 09:20:44PM +0100, Arnaud Patard wrote:
>> 
>> Last time I looked at the cable detection code, I fixed the "always
>> detect cable as sata cable" case, but this is not enough. I didn't
>> notice that the 80-pin cable was seen as a 40-pin cable.
>> The appended patch fixes that.
>
> Thanks - the docs were a bit blank on which was which - have you checked
> this now detects right both ways around ?

yeah, I've tested on two boxes, with 40-pin and 80-pin cables :)