[kernel] r16021 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

Ben Hutchings benh at alioth.debian.org
Tue Jul 27 04:45:47 UTC 2010 

Author: benh
Date: Tue Jul 27 04:45:42 2010
New Revision: 16021

Log:
pata_pdc202xx_old: Fix UDMA mode for PDC2024x and PDC2026x controllers (Closes: #590532)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/pata_pdc202xx_old-fix-UDMA-mode-for-PDC2026x-chipset.patch
   dists/sid/linux-2.6/debian/patches/bugfix/all/pata_pdc202xx_old-fix-UDMA-mode-for-Promise-UDMA33.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/19

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sun Jul 25 02:39:49 2010	(r16020)
+++ dists/sid/linux-2.6/debian/changelog	Tue Jul 27 04:45:42 2010	(r16021)
@@ -8,6 +8,8 @@
   * linux-base: Remove dependency on libapt-pkg-perl (Closes: #589996)
   * drm/i915: Enable low-power render writes on GEN3 hardware (915, 945,
     G33 and Atom "Pineview") (Closes: #590193, maybe others)
+  * pata_pdc202xx_old: Fix UDMA mode for PDC2024x and PDC2026x controllers
+    (Closes: #590532)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 24 Jul 2010 00:41:51 +0100
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/pata_pdc202xx_old-fix-UDMA-mode-for-PDC2026x-chipset.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/pata_pdc202xx_old-fix-UDMA-mode-for-PDC2026x-chipset.patch	Tue Jul 27 04:45:42 2010	(r16021)
@@ -0,0 +1,52 @@
+From: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
+Date: Sat, 13 Feb 2010 17:43:17 -0500
+Subject: [PATCH 2/2] pata_pdc202xx_old: fix UDMA mode for PDC2026x chipsets
+
+commit 750e519da7b3f470fe1b5b55c8d8f52d6d6371e4 upstream.
+
+PDC2026x chipsets need the same treatment as PDC20246 one.
+
+This is completely untested but will hopefully fix UDMA issues
+that people have been reporting against pata_pdc202xx_old for
+the last couple of years.
+
+Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
+Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
+---
+ drivers/ata/pata_pdc202xx_old.c |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c
+index 8d25bd5..2911120 100644
+--- a/drivers/ata/pata_pdc202xx_old.c
++++ b/drivers/ata/pata_pdc202xx_old.c
+@@ -35,7 +35,7 @@ static int pdc2026x_cable_detect(struct ata_port *ap)
+ 	return ATA_CBL_PATA80;
+ }
+ 
+-static void pdc20246_exec_command(struct ata_port *ap,
++static void pdc202xx_exec_command(struct ata_port *ap,
+ 				  const struct ata_taskfile *tf)
+ {
+ 	DPRINTK("ata%u: cmd 0x%X\n", ap->print_id, tf->command);
+@@ -281,7 +281,7 @@ static struct ata_port_operations pdc2024x_port_ops = {
+ 	.set_piomode		= pdc202xx_set_piomode,
+ 	.set_dmamode		= pdc202xx_set_dmamode,
+ 
+-	.sff_exec_command	= pdc20246_exec_command,
++	.sff_exec_command	= pdc202xx_exec_command,
+ };
+ 
+ static struct ata_port_operations pdc2026x_port_ops = {
+@@ -295,6 +295,8 @@ static struct ata_port_operations pdc2026x_port_ops = {
+ 	.dev_config		= pdc2026x_dev_config,
+ 
+ 	.port_start		= pdc2026x_port_start,
++
++	.sff_exec_command	= pdc202xx_exec_command,
+ };
+ 
+ static int pdc202xx_init_one(struct pci_dev *dev, const struct pci_device_id *id)
+-- 
+1.7.1
+

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/pata_pdc202xx_old-fix-UDMA-mode-for-Promise-UDMA33.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/pata_pdc202xx_old-fix-UDMA-mode-for-Promise-UDMA33.patch	Tue Jul 27 04:45:42 2010	(r16021)
@@ -0,0 +1,83 @@
+From: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
+Date: Sat, 13 Feb 2010 14:35:53 +0100
+Subject: [PATCH 1/2] pata_pdc202xx_old: fix UDMA mode for Promise UDMA33 cards
+
+commit a75032e8772d13dab5e3501413d7e14a148281b4 upstream.
+
+On Monday 04 January 2010 02:30:24 pm Russell King wrote:
+
+> Found the problem - getting rid of the read of the alt status register
+> after the command has been written fixes the UDMA CRC errors on write:
+>
+> @@ -676,7 +676,8 @@ void ata_sff_exec_command(struct ata_port *ap, const struct
+> ata_taskfile *tf)
+>         DPRINTK("ata%u: cmd 0x%X\n", ap->print_id, tf->command);
+>
+>         iowrite8(tf->command, ap->ioaddr.command_addr);
+> -       ata_sff_pause(ap);
+> +       ndelay(400);
+> +//     ata_sff_pause(ap);
+>  }
+>  EXPORT_SYMBOL_GPL(ata_sff_exec_command);
+>
+>
+> This rather makes sense.  The PDC20247 handles the UDMA part of the
+> protocol.  It has no way to tell the PDC20246 to wait while it suspends
+> UDMA, so that a normal register access can take place - the 246 ploughs
+> on with the register access without any regard to the state of the 247.
+>
+> If the drive immediately starts the UDMA protocol after a write to the
+> command register (as it probably will for the DMA WRITE command), then
+> we'll be accessing the taskfile in the middle of the UDMA setup, which
+> can't be good.  It's certainly a violation of the ATA specs.
+
+Fix it by adding custom ->sff_exec_command method for UDMA33 chipsets.
+
+Debugged-by: Russell King <rmk at arm.linux.org.uk>
+Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
+Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
+---
+ drivers/ata/pata_pdc202xx_old.c |   13 ++++++++++++-
+ 1 files changed, 12 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c
+index 2f3c9be..8d25bd5 100644
+--- a/drivers/ata/pata_pdc202xx_old.c
++++ b/drivers/ata/pata_pdc202xx_old.c
+@@ -2,7 +2,7 @@
+  * pata_pdc202xx_old.c 	- Promise PDC202xx PATA for new ATA layer
+  *			  (C) 2005 Red Hat Inc
+  *			  Alan Cox <alan at lxorguk.ukuu.org.uk>
+- *			  (C) 2007,2009 Bartlomiej Zolnierkiewicz
++ *			  (C) 2007,2009,2010 Bartlomiej Zolnierkiewicz
+  *
+  * Based in part on linux/drivers/ide/pci/pdc202xx_old.c
+  *
+@@ -35,6 +35,15 @@ static int pdc2026x_cable_detect(struct ata_port *ap)
+ 	return ATA_CBL_PATA80;
+ }
+ 
++static void pdc20246_exec_command(struct ata_port *ap,
++				  const struct ata_taskfile *tf)
++{
++	DPRINTK("ata%u: cmd 0x%X\n", ap->print_id, tf->command);
++
++	iowrite8(tf->command, ap->ioaddr.command_addr);
++	ndelay(400);
++}
++
+ /**
+  *	pdc202xx_configure_piomode	-	set chip PIO timing
+  *	@ap: ATA interface
+@@ -271,6 +280,8 @@ static struct ata_port_operations pdc2024x_port_ops = {
+ 	.cable_detect		= ata_cable_40wire,
+ 	.set_piomode		= pdc202xx_set_piomode,
+ 	.set_dmamode		= pdc202xx_set_dmamode,
++
++	.sff_exec_command	= pdc20246_exec_command,
+ };
+ 
+ static struct ata_port_operations pdc2026x_port_ops = {
+-- 
+1.7.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/19
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/19	Sun Jul 25 02:39:49 2010	(r16020)
+++ dists/sid/linux-2.6/debian/patches/series/19	Tue Jul 27 04:45:42 2010	(r16021)
@@ -2,3 +2,5 @@
 + bugfix/all/inotify-send-IN_UNMOUNT-events.patch
 + bugfix/x86/drm-i915-Define-MI_ARB_STATE-bits.patch
 + bugfix/x86/drm-i915-enable-low-power-render-writes-on-GEN3-hard.patch
++ bugfix/all/pata_pdc202xx_old-fix-UDMA-mode-for-Promise-UDMA33.patch
++ bugfix/all/pata_pdc202xx_old-fix-UDMA-mode-for-PDC2026x-chipset.patch

More information about the Kernel-svn-changes mailing list