Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754096Ab1BHMZT (ORCPT ); Tue, 8 Feb 2011 07:25:19 -0500 Received: from mail-ew0-f46.google.com ([209.85.215.46]:61026 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754077Ab1BHMZP (ORCPT ); Tue, 8 Feb 2011 07:25:15 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:in-reply-to:references:subject; b=KcTy6iiIUvBvBiIIQEslF8GICjpCe8wYKCwyWGeLa3RTXHR1vxgI8cocYySAXfJL7X saxr8guYm/FUiAc/EbHbyLuTpybQ1y6VQ7Y/+IWNrGTOme/UGQQdJBKlHfuXIERH7sVT 8OnJr3NVcgPXBOsMSV7c+0Uu12hTLB+z9r8qc= From: Bartlomiej Zolnierkiewicz To: linux-ide@vger.kernel.org Cc: Bartlomiej Zolnierkiewicz , linux-kernel@vger.kernel.org Date: Tue, 08 Feb 2011 13:24:46 +0100 Message-Id: <20110208122446.19110.16806.sendpatchset@linux-mhg7.site> In-Reply-To: <20110208122314.19110.4092.sendpatchset@linux-mhg7.site> References: <20110208122314.19110.4092.sendpatchset@linux-mhg7.site> Subject: [PATCH 10/20] pata_radisys: unify code for programming PIO and MWDMA timings Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4827 Lines: 146 >From 656a1d1e17b035c7de7e7ea602f03724fdcbb336 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Tue, 8 Feb 2011 12:39:26 +0100 Subject: [PATCH 10/20] pata_radisys: unify code for programming PIO and MWDMA timings Besides making things noticably simpler it results in ~6% decrease in the driver LOC count and also ~1% decrease in the driver binary size (as measured on x86-32). Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ata/pata_radisys.c | 66 ++++++++++++++++--------------------------- 1 files changed, 25 insertions(+), 41 deletions(-) diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c index 8574b31..e85bb38 100644 --- a/drivers/ata/pata_radisys.c +++ b/drivers/ata/pata_radisys.c @@ -26,20 +26,9 @@ #define DRV_NAME "pata_radisys" #define DRV_VERSION "0.4.4" -/** - * radisys_set_piomode - Initialize host controller PATA PIO timings - * @ap: ATA port - * @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 radisys_set_piomode (struct ata_port *ap, struct ata_device *adev) +static void radisys_set_timings(struct ata_port *ap, struct ata_device *adev, + u8 pio, bool use_mwdma) { - unsigned int pio = adev->pio_mode - XFER_PIO_0; struct pci_dev *dev = to_pci_dev(ap->host->dev); u16 idetm_data; int control = 0; @@ -52,7 +41,7 @@ static void radisys_set_piomode (struct ata_port *ap, struct ata_device *adev) */ static const /* ISP RTC */ - u8 timings[][2] = { { 0, 0 }, /* Check me */ + u8 timings[][2] = { { 0, 0 }, { 0, 0 }, { 1, 1 }, { 2, 2 }, @@ -62,6 +51,10 @@ static void radisys_set_piomode (struct ata_port *ap, struct ata_device *adev) control |= 1; /* TIME1 enable */ if (ata_pio_need_iordy(adev)) control |= 2; /* IE IORDY */ + /* If the drive MWDMA is faster than it can do PIO then + we must force PIO0 for PIO cycles. */ + if (use_mwdma && adev->pio_mode < (XFER_PIO_0 + pio)) + control = 1; pci_read_config_word(dev, 0x40, &idetm_data); @@ -78,6 +71,22 @@ static void radisys_set_piomode (struct ata_port *ap, struct ata_device *adev) } /** + * radisys_set_piomode - Initialize host controller PATA PIO timings + * @ap: ATA port + * @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 radisys_set_piomode(struct ata_port *ap, struct ata_device *adev) +{ + radisys_set_timings(ap, adev, adev->pio_mode - XFER_PIO_0, 0); +} + +/** * radisys_set_dmamode - Initialize host controller PATA DMA timings * @ap: Port whose timings we are configuring * @adev: Device to program @@ -91,22 +100,10 @@ static void radisys_set_piomode (struct ata_port *ap, struct ata_device *adev) static void radisys_set_dmamode (struct ata_port *ap, struct ata_device *adev) { struct pci_dev *dev = to_pci_dev(ap->host->dev); - u16 idetm_data; u8 udma_enable; - static const /* ISP RTC */ - u8 timings[][2] = { { 0, 0 }, - { 0, 0 }, - { 1, 1 }, - { 2, 2 }, - { 3, 3 }, }; - - /* - * MWDMA is driven by the PIO timings. We must also enable - * IORDY unconditionally. - */ + /* MWDMA is driven by the PIO timings. */ - pci_read_config_word(dev, 0x40, &idetm_data); pci_read_config_byte(dev, 0x48, &udma_enable); if (adev->dma_mode < XFER_UDMA_0) { @@ -115,20 +112,8 @@ static void radisys_set_dmamode (struct ata_port *ap, struct ata_device *adev) XFER_PIO_0, XFER_PIO_3, XFER_PIO_4 }; int pio = needed_pio[mwdma] - XFER_PIO_0; - int control = 3; /* IORDY|TIME0 */ - - /* If the drive MWDMA is faster than it can do PIO then - we must force PIO0 for PIO cycles. */ - - if (adev->pio_mode < needed_pio[mwdma]) - control = 1; - /* Mask out the relevant control and timing bits we will load. Also - clear the other drive TIME register as a precaution */ - - idetm_data &= 0xCCCC; - idetm_data |= control << (4 * adev->devno); - idetm_data |= (timings[pio][0] << 12) | (timings[pio][1] << 8); + radisys_set_timings(ap, adev, pio, 1); udma_enable &= ~(1 << adev->devno); } else { @@ -147,7 +132,6 @@ static void radisys_set_dmamode (struct ata_port *ap, struct ata_device *adev) udma_enable |= (1 << adev->devno); } - pci_write_config_word(dev, 0x40, idetm_data); pci_write_config_byte(dev, 0x48, udma_enable); /* Track which port is configured */ -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/