leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pata_marvell: Cable and reset fixes

Browse Source 
There are two changes here. Firstly we switch to a cable detect method,
secondly the old code forgot to call ata_std_prereset() but somehow
managed to work anyway. Fix the missing call.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Alan Cox 2007-03-07 16:48:09 +00:00 committed by Jeff Garzik
parent 5816fbbf22
commit 307c6054ad
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/ata/pata_marvell.c
View File

@ -20,7 +20,7 @@
#include <linux/ata.h> #include <linux/ata.h>
#define DRV_NAME "pata_marvell" #define DRV_NAME "pata_marvell"
#define DRV_VERSION "0.1.1" #define DRV_VERSION "0.1.4"
/** /**
* marvell_pre_reset - check for 40/80 pin * marvell_pre_reset - check for 40/80 pin
@ -52,22 +52,23 @@ static int marvell_pre_reset(struct ata_port *ap)
if ((pdev->device == 0x6145) && (ap->port_no == 0) && if ((pdev->device == 0x6145) && (ap->port_no == 0) &&
(!(devices & 0x10))) /* PATA enable ? */ (!(devices & 0x10))) /* PATA enable ? */
return -ENOENT; return -ENOENT;
return ata_std_prereset(ap);
}
static int marvell_cable_detect(struct ata_port *ap)
{
/* Cable type */ /* Cable type */
switch(ap->port_no) switch(ap->port_no)
{ {
case 0: case 0:
if (ioread8(ap->ioaddr.bmdma_addr + 1) & 1) if (ioread8(ap->ioaddr.bmdma_addr + 1) & 1)
ap->cbl = ATA_CBL_PATA40; return ATA_CBL_PATA40;
else return ATA_CBL_PATA80;
ap->cbl = ATA_CBL_PATA80;
break;
case 1: /* Legacy SATA port */ case 1: /* Legacy SATA port */
ap->cbl = ATA_CBL_SATA; return ATA_CBL_SATA;
break;
} }
return ata_std_prereset(ap); BUG();
return 0; /* Our BUG macro needs the right markup */
} }
/** /**
@ -123,6 +124,7 @@ static const struct ata_port_operations marvell_ops = {
.thaw = ata_bmdma_thaw, .thaw = ata_bmdma_thaw,
.error_handler = marvell_error_handler, .error_handler = marvell_error_handler,
.post_internal_cmd = ata_bmdma_post_internal_cmd, .post_internal_cmd = ata_bmdma_post_internal_cmd,
.cable_detect = marvell_cable_detect,
/* BMDMA handling is PCI ATA format, use helpers */ /* BMDMA handling is PCI ATA format, use helpers */
.bmdma_setup = ata_bmdma_setup, .bmdma_setup = ata_bmdma_setup,