r1611 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series

[Christoph Hellwig]

Author: hch-guest
Date: 2004-09-18 06:56:56 -0600 (Sat, 18 Sep 2004)
New Revision: 1611

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/ata_piix-combinde-mode-fix.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-7
Log:

  * Fix ata_piix controller numberng in combined mode (Christoph Hellwig).



Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-09-18 12:30:39 UTC (rev 1610)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-09-18 12:56:56 UTC (rev 1611)
@@ -10,6 +10,8 @@
     just too many broken system out there in the wild. (closes: #267342)
     (Christoph Hellwig).
 
+  * Fix ata_piix controller numberng in combined mode (Christoph Hellwig).
+
  -- Jens Schmalzing <jensen@debian.org>  Thu, 16 Sep 2004 10:04:54 +0200
 
 kernel-source-2.6.8 (2.6.8-6) unstable; urgency=medium

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/ata_piix-combinde-mode-fix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/ata_piix-combinde-mode-fix.dpatch	2004-09-18 12:30:39 UTC (rev 1610)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/ata_piix-combinde-mode-fix.dpatch	2004-09-18 12:56:56 UTC (rev 1611)
@@ -0,0 +1,40 @@
+#! /bin/sh -e 
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: Fix ata_piix detection for combined mode (#270194)
+## DP: Patch author: Stuart Hayes <Stuart_Hayes@dell.com>
+## DP: Upstream status: submitted (according to original author)
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+--- kernel-source-2.6.8-orig/drivers/scsi/ata_piix.c	2004-08-14 07:36:57.000000000 +0200
++++ kernel-source-2.6.8/drivers/scsi/ata_piix.c	2004-09-18 14:54:19.574912216 +0200
+@@ -272,8 +272,25 @@
+ 
+ static void piix_pata_phy_reset(struct ata_port *ap)
+ {
++	unsigned int controller;
++
++	/*
++	 * In combined legacy mode, port number is not the same as
++	 * primary/secondary controller.
++	 */
++	switch (ap->ioaddr.cmd_addr) {
++	case 0x1f0:
++		controller = 0;
++		break;
++	case 0x170:
++		controller = 1;
++		break;
++	default:
++		controller = ap->port_no;
++ 	}
++
+ 	if (!pci_test_config_bits(ap->host_set->pdev,
+-				  &piix_enable_bits[ap->port_no])) {
++				  &piix_enable_bits[controller])) {
+ 		ata_port_disable(ap);
+ 		printk(KERN_INFO "ata%u: port disabled. ignoring.\n", ap->id);
+ 		return;

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-7
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-7	2004-09-18 12:30:39 UTC (rev 1610)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-7	2004-09-18 12:56:56 UTC (rev 1611)
@@ -2,3 +2,4 @@
 + i915-agp.dpatch
 + copy_to_high_bio_irq-leak-fix.dpatch
 + tcp_default_win_scale.dpatch
++ ata_piix-combinde-mode-fix.dpatch