lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pata_cmd64x: Set up MWDMA modes properly

Browse Source 
Set the MWDMA timing by updating the correct registers.  Split the PIO path as
this is mostly shared code.  Wants testing.

Signed-off-by: Alan Cox <alan@redhat.com>
Tested-by: Mikael Pettersson <mikpe@it.uu.se>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Alan Cox
2007-08-10 13:59:49 -07:00
committed by Jeff Garzik
parent 4f34337b1f
commit 05d1efffdc
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/ata/pata_cmd64x.c
View File

@@ -31,7 +31,7 @@
#include <linux/libata.h> #include <linux/libata.h>
#define DRV_NAME "pata_cmd64x" #define DRV_NAME "pata_cmd64x"
#define DRV_VERSION "0.2.4" #define DRV_VERSION "0.2.5"
/* /*
* CMD64x specific registers definition. * CMD64x specific registers definition.
@@ -88,14 +88,15 @@ static int cmd648_cable_detect(struct ata_port *ap)
} }
/** /**
* cmd64x_set_piomode - set initial PIO mode data * cmd64x_set_piomode - set PIO and MWDMA timing
* @ap: ATA interface * @ap: ATA interface
* @adev: ATA device * @adev: ATA device
* @mode: mode
* *
* Called to do the PIO mode setup. * Called to do the PIO and MWDMA mode setup.
*/ */
static void cmd64x_set_piomode(struct ata_port *ap, struct ata_device *adev) static void cmd64x_set_timing(struct ata_port *ap, struct ata_device *adev, u8 mode)
{ {
struct pci_dev *pdev = to_pci_dev(ap->host->dev); struct pci_dev *pdev = to_pci_dev(ap->host->dev);
struct ata_timing t; struct ata_timing t;
@@ -117,8 +118,9 @@ static void cmd64x_set_piomode(struct ata_port *ap, struct ata_device *adev)
int arttim = arttim_port[ap->port_no][adev->devno]; int arttim = arttim_port[ap->port_no][adev->devno];
int drwtim = drwtim_port[ap->port_no][adev->devno]; int drwtim = drwtim_port[ap->port_no][adev->devno];
/* ata_timing_compute is smart and will produce timings for MWDMA
if (ata_timing_compute(adev, adev->pio_mode, &t, T, 0) < 0) { that don't violate the drives PIO capabilities. */
if (ata_timing_compute(adev, mode, &t, T, 0) < 0) {
printk(KERN_ERR DRV_NAME ": mode computation failed.\n"); printk(KERN_ERR DRV_NAME ": mode computation failed.\n");
return; return;
} }
@@ -167,6 +169,20 @@ static void cmd64x_set_piomode(struct ata_port *ap, struct ata_device *adev)
pci_write_config_byte(pdev, drwtim, (t.active << 4) | t.recover); pci_write_config_byte(pdev, drwtim, (t.active << 4) | t.recover);
} }
/**
* cmd64x_set_piomode - set initial PIO mode data
* @ap: ATA interface
* @adev: ATA device
*
* Used when configuring the devices ot set the PIO timings. All the
* actual work is done by the PIO/MWDMA setting helper
*/
static void cmd64x_set_piomode(struct ata_port *ap, struct ata_device *adev)
{
cmd64x_set_timing(ap, adev, adev->pio_mode);
}
/** /**
* cmd64x_set_dmamode - set initial DMA mode data * cmd64x_set_dmamode - set initial DMA mode data
* @ap: ATA interface * @ap: ATA interface
@@ -180,9 +196,6 @@ static void cmd64x_set_dmamode(struct ata_port *ap, struct ata_device *adev)
static const u8 udma_data[] = { static const u8 udma_data[] = {
0x30, 0x20, 0x10, 0x20, 0x10, 0x00 0x30, 0x20, 0x10, 0x20, 0x10, 0x00
}; };
static const u8 mwdma_data[] = {
0x30, 0x20, 0x10
};
struct pci_dev *pdev = to_pci_dev(ap->host->dev); struct pci_dev *pdev = to_pci_dev(ap->host->dev);
u8 regU, regD; u8 regU, regD;
@@ -208,8 +221,10 @@ static void cmd64x_set_dmamode(struct ata_port *ap, struct ata_device *adev)
regU |= 1 << adev->devno; /* UDMA on */ regU |= 1 << adev->devno; /* UDMA on */
if (adev->dma_mode > 2) /* 15nS timing */ if (adev->dma_mode > 2) /* 15nS timing */
regU |= 4 << adev->devno; regU |= 4 << adev->devno;
} else } else {
regD |= mwdma_data[adev->dma_mode - XFER_MW_DMA_0] << shift; regU &= ~ (1 << adev->devno); /* UDMA off */
cmd64x_set_timing(ap, adev, adev->dma_mode);
}
regD |= 0x20 << adev->devno; regD |= 0x20 << adev->devno;