Re: [PATCH 09/20] pata_oldpiix: unify code for programming PIO and MWDMA timings
From: Sergei Shtylyov <hidden>
Date: 2011-02-20 14:54:20
Also in:
lkml
Hello. On 08-02-2011 15:24, Bartlomiej Zolnierkiewicz wrote:
From 30f6c60ad1e2f9c640352b74279fdf8a930847bf Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz<bzolnier@gmail.com> Date: Tue, 8 Feb 2011 12:39:26 +0100 Subject: [PATCH 09/20] pata_oldpiix: unify code for programming PIO and MWDMA timings
Besides making things noticably simpler it results in ~12% decrease in the driver LOC count and also ~5% decrease in the driver binary size (as measured on x86-32).
Signed-off-by: Bartlomiej Zolnierkiewicz<bzolnier@gmail.com>
[...]
quoted hunk ↗ jump to hunk
diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c index b811c16..433d2fc 100644 --- a/drivers/ata/pata_oldpiix.c +++ b/drivers/ata/pata_oldpiix.c
[...]
quoted hunk ↗ jump to hunk
@@ -82,14 +71,18 @@ static void oldpiix_set_piomode (struct ata_port *ap, struct ata_device *adev) { 2, 1 }, { 2, 3 }, }; - if (pio> 1) + if (pio > 1 || use_mwdma)
'use_mwdma' check is superfluous...
control |= 1; /* TIME */ - if (ata_pio_need_iordy(adev)) + if (ata_pio_need_iordy(adev) || use_mwdma) control |= 2; /* IE */ - /* Intel specifies that the prefetch/posting is for disk only */ if (adev->class == ATA_DEV_ATA) control |= 4; /* PPE */ + /* If the drive MWDMA is faster than it can do PIO then + we must force PIO into PIO0 */
Please fix the comment style.
+ if (use_mwdma && adev->pio_mode < (XFER_PIO_0 + pio))
Parens not needed around +.
quoted hunk ↗ jump to hunk
+ /* Enable DMA timing only */ + control |= 8; /* PIO cycles in PIO0 */ pci_read_config_word(dev, idetm_port,&idetm_data);@@ -113,6 +106,22 @@ static void oldpiix_set_piomode (struct ata_port *ap, struct ata_device *adev) } /** + * oldpiix_set_piomode - Initialize host controller PATA PIO timings + * @ap: Port whose timings we are configuring + * @adev: Device whose timings we are configuring + * + * Set PIO mode for device, in host controller PCI config space. + * + * LOCKING: + * None (inherited from caller). + */ + +static void oldpiix_set_piomode(struct ata_port *ap, struct ata_device *adev) +{ + oldpiix_set_timings(ap, adev, adev->pio_mode - XFER_PIO_0, 0);
s/0/false/?
quoted hunk ↗ jump to hunk
+} + +/** * oldpiix_set_dmamode - Initialize host controller PATA DMA timings * @ap: Port whose timings we are configuring * @adev: Device to program@@ -125,58 +134,15 @@ static void oldpiix_set_piomode (struct ata_port *ap, struct ata_device *adev)
[...]
+ oldpiix_set_timings(ap, adev, pio, 1);
s/1/true/?
WBR, Sergei