LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
To: linux-ide@vger.kernel.org
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH 09/20] pata_oldpiix: unify code for programming PIO and MWDMA timings
Date: Tue, 08 Feb 2011 13:24:38 +0100	[thread overview]
Message-ID: <20110208122438.19110.37982.sendpatchset@linux-mhg7.site> (raw)
In-Reply-To: <20110208122314.19110.4092.sendpatchset@linux-mhg7.site>

>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>
---
 drivers/ata/pata_oldpiix.c |   88 +++++++++++++------------------------------
 1 files changed, 27 insertions(+), 61 deletions(-)

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
@@ -50,20 +50,9 @@ static int oldpiix_pre_reset(struct ata_link *link, unsigned long deadline)
 	return ata_sff_prereset(link, deadline);
 }
 
-/**
- *	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)
+static void oldpiix_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);
 	unsigned int idetm_port= ap->port_no ? 0x42 : 0x40;
 	u16 idetm_data;
@@ -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)
 		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 */
+	if (use_mwdma && adev->pio_mode < (XFER_PIO_0 + pio))
+		/* 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);
+}
+
+/**
  *	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)
 
 static void oldpiix_set_dmamode (struct ata_port *ap, struct ata_device *adev)
 {
-	struct pci_dev *dev	= to_pci_dev(ap->host->dev);
-	u8 idetm_port		= ap->port_no ? 0x42 : 0x40;
-	u16 idetm_data;
-
-	static const	 /* ISP  RTC */
-	u8 timings[][2]	= { { 0, 0 },
-			    { 0, 0 },
-			    { 1, 0 },
-			    { 2, 1 },
-			    { 2, 3 }, };
-
-	/*
-	 * MWDMA is driven by the PIO timings. We must also enable
-	 * IORDY unconditionally along with TIME1. PPE has already
-	 * been set when the PIO timing was set.
-	 */
+	/* MWDMA is driven by the PIO timings. */
 
 	unsigned int mwdma	= adev->dma_mode - XFER_MW_DMA_0;
-	unsigned int control;
 	const unsigned int needed_pio[3] = {
 		XFER_PIO_0, XFER_PIO_3, XFER_PIO_4
 	};
 	int pio = needed_pio[mwdma] - XFER_PIO_0;
 
-	pci_read_config_word(dev, idetm_port, &idetm_data);
-
-	control = 3;	/* IORDY|TIME0 */
-	/* Intel specifies that the PPE functionality is for disk only */
-	if (adev->class == ATA_DEV_ATA)
-		control |= 4;	/* PPE enable */
-
-	/* If the drive MWDMA is faster than it can do PIO then
-	   we must force PIO into PIO0 */
-
-	if (adev->pio_mode < needed_pio[mwdma])
-		/* Enable DMA timing only */
-		control |= 8;	/* PIO cycles in PIO0 */
-
-	/* Mask out the relevant control and timing bits we will load. Also
-	   clear the other drive TIME register as a precaution */
-	if (adev->devno == 0) {
-		idetm_data &= 0xCCE0;
-		idetm_data |= control;
-	} else {
-		idetm_data &= 0xCC0E;
-		idetm_data |= (control << 4);
-	}
-	idetm_data |= (timings[pio][0] << 12) | (timings[pio][1] << 8);
-	pci_write_config_word(dev, idetm_port, idetm_data);
-
-	/* Track which port is configured */
-	ap->private_data = adev;
+	oldpiix_set_timings(ap, adev, pio, 1);
 }
 
 /**
-- 
1.7.1


  parent reply	other threads:[~2011-02-08 12:24 UTC|newest]

Thread overview: 68+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-08 12:23 [PATCHSET] ata: rework support for PIIX-alike PATA controllers Bartlomiej Zolnierkiewicz
2011-02-08 12:23 ` [PATCH 01/20] ata_piix: SITRE handling fix Bartlomiej Zolnierkiewicz
2011-02-08 13:04   ` Alan Cox
2011-02-08 13:02     ` Bartlomiej Zolnierkiewicz
2011-02-08 12:23 ` [PATCH 02/20] ata_piix: unify code for programming PIO and MWDMA timings Bartlomiej Zolnierkiewicz
2011-02-20 13:36   ` Sergei Shtylyov
2011-02-20 18:59     ` Alan Cox
2011-02-20 20:42       ` Sergei Shtylyov
2011-02-20 21:07         ` Alan Cox
2011-02-21 11:38           ` Sergei Shtylyov
2011-02-21 11:53             ` Sergei Shtylyov
2011-02-21 12:00               ` Alan Cox
2011-02-21 11:58             ` Alan Cox
2011-02-21 11:59               ` Sergei Shtylyov
2011-02-08 12:23 ` [PATCH 03/20] pata_efar: fix register naming used in efar_set_piomode() Bartlomiej Zolnierkiewicz
2011-02-08 12:24 ` [PATCH 04/20] pata_efar: unify code for programming PIO and MWDMA timings Bartlomiej Zolnierkiewicz
2011-02-20 14:32   ` Sergei Shtylyov
2011-02-08 12:24 ` [PATCH 05/20] pata_efar: always program master_data before slave_data Bartlomiej Zolnierkiewicz
2011-02-08 13:07   ` Alan Cox
2011-02-08 13:16     ` Bartlomiej Zolnierkiewicz
2011-02-08 13:25       ` Alan Cox
2011-02-08 13:28         ` Bartlomiej Zolnierkiewicz
2011-02-08 13:39           ` Alan Cox
2011-02-08 13:57             ` Bartlomiej Zolnierkiewicz
2011-02-08 14:12               ` Alan Cox
2011-02-08 14:32                 ` Bartlomiej Zolnierkiewicz
2011-02-08 13:38         ` Sergei Shtylyov
2011-02-19  9:25           ` Bartlomiej Zolnierkiewicz
2011-02-19 16:48             ` Alan Cox
2011-02-20 10:38               ` Bartlomiej Zolnierkiewicz
2011-02-20 11:36                 ` Alan Cox
2011-02-21 20:06             ` Jeff Garzik
2011-02-22  9:19               ` Bartlomiej Zolnierkiewicz
2011-02-22 11:14                 ` Alan Cox
2011-02-23  8:45                   ` Bartlomiej Zolnierkiewicz
2011-02-23  8:53                     ` Bartlomiej Zolnierkiewicz
2011-02-23 10:17                       ` Bartlomiej Zolnierkiewicz
2011-02-23  9:14                     ` Alan Cox
2011-02-23 10:28                       ` Bartlomiej Zolnierkiewicz
2011-02-23 10:36                         ` Alan Cox
2011-02-24 17:53                         ` Alan Cox
2011-02-10 14:23   ` Sergei Shtylyov
2011-02-10 17:14     ` Bartlomiej Zolnierkiewicz
2011-02-10 17:55       ` Sergei Shtylyov
2011-02-08 12:24 ` [PATCH 06/20] pata_it8213: fix register naming used in it8213_set_piomode() Bartlomiej Zolnierkiewicz
2011-02-08 12:24 ` [PATCH 07/20] pata_it8213: unify code for programming PIO and MWDMA timings Bartlomiej Zolnierkiewicz
2011-02-20 14:37   ` Sergei Shtylyov
2011-02-08 12:24 ` [PATCH 08/20] pata_it8213: add UDMA100 and UDMA133 support Bartlomiej Zolnierkiewicz
2011-02-08 12:24 ` Bartlomiej Zolnierkiewicz [this message]
2011-02-20 14:52   ` [PATCH 09/20] pata_oldpiix: unify code for programming PIO and MWDMA timings Sergei Shtylyov
2011-02-08 12:24 ` [PATCH 10/20] pata_radisys: " Bartlomiej Zolnierkiewicz
2011-02-20 15:01   ` Sergei Shtylyov
2011-02-08 12:24 ` [PATCH 11/20] pata_rdc: " Bartlomiej Zolnierkiewicz
2011-02-08 12:25 ` [PATCH 12/20] pata_rdc: parallel scanning needs an extra locking Bartlomiej Zolnierkiewicz
2011-02-20 15:04   ` Sergei Shtylyov
2011-02-08 12:25 ` [PATCH 13/20] pata_rdc: add Power Management support Bartlomiej Zolnierkiewicz
2011-02-08 12:25 ` [PATCH 14/20] pata_oldpiix: add locking for parallel scanning Bartlomiej Zolnierkiewicz
2011-02-10 14:28   ` Sergei Shtylyov
2011-02-08 12:25 ` [PATCH 15/20] pata_oldpiix: enable parallel scan Bartlomiej Zolnierkiewicz
2011-02-08 12:25 ` [PATCH 16/20] ata_piix: add EFAR SLC90E66 support Bartlomiej Zolnierkiewicz
2011-02-08 13:13   ` Alan Cox
2011-02-08 13:27     ` Bartlomiej Zolnierkiewicz
2011-02-08 13:38       ` Alan Cox
2011-02-08 14:01         ` Bartlomiej Zolnierkiewicz
2011-02-08 12:25 ` [PATCH 17/20] ata_piix: add IT8213 support Bartlomiej Zolnierkiewicz
2011-02-08 12:25 ` [PATCH 18/20] ata_piix: add RDC support Bartlomiej Zolnierkiewicz
2011-02-08 12:25 ` [PATCH 19/20] ata_piix: add Intel old PIIX support Bartlomiej Zolnierkiewicz
2011-02-08 12:26 ` [PATCH 20/20] ata_piix: add Radisys R82600 support Bartlomiej Zolnierkiewicz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110208122438.19110.37982.sendpatchset@linux-mhg7.site \
    --to=bzolnier@gmail.com \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --subject='Re: [PATCH 09/20] pata_oldpiix: unify code for programming PIO and MWDMA timings' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).