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

Martin Michlmayr tbm at alioth.debian.org
Tue Aug 26 18:22:15 UTC 2008 

Author: tbm
Date: Tue Aug 26 18:22:14 2008
New Revision: 12139

Log:
Add Marvell Orion fixes


Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/sata_mv-add_gen_iie_flag.patch
   dists/sid/linux-2.6/debian/patches/bugfix/all/sata_mv-clear_irq.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/4

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Tue Aug 26 18:22:14 2008
@@ -87,6 +87,11 @@
   [ Bastian Blank ]
   * [powerpc] Enable proper RTC support. (closes: #484693)
 
+  [ Martin Michlmayr ]
+  * Add Marvell Orion fixes:
+    - sata_mv: add the Gen IIE flag to the SoC devices.
+    - sata_mv: don't avoid clearing interrupt status on SoC host adapters
+
  -- dann frazier <dannf at debian.org>  Wed, 20 Aug 2008 16:58:30 -0600
 
 linux-2.6 (2.6.26-3) unstable; urgency=low

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/sata_mv-add_gen_iie_flag.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/sata_mv-add_gen_iie_flag.patch	Tue Aug 26 18:22:14 2008
@@ -0,0 +1,35 @@
+From: Saeed Bishara <saeed at marvell.com>
+Subject: [PATCH] sata_mv: add the Gen IIE flag to the SoC devices.
+Date: Mon,  4 Aug 2008 00:52:55 -1100
+To: liml at rtr.ca, linux-ide at vger.kernel.org, jeff at garzik.org
+Cc: buytenh at marvell.com, Saeed Bishara <saeed at marvell.com>
+
+The SoC sata port is based on the 7042/6042 devices (Gen IIE). This patch
+will fix various issues when working with PMP and/or NCQ.
+
+Signed-off-by: Saeed Bishara <saeed at marvell.com>
+---
+ drivers/ata/sata_mv.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
+index ad169ff..f483067 100644
+--- a/drivers/ata/sata_mv.c
++++ b/drivers/ata/sata_mv.c
+@@ -3036,7 +3036,8 @@ static int mv_chip_id(struct ata_host *host, unsigned int board_idx)
+ 		break;
+ 	case chip_soc:
+ 		hpriv->ops = &mv_soc_ops;
+-		hp_flags |= MV_HP_FLAG_SOC | MV_HP_ERRATA_60X1C0;
++		hp_flags |= MV_HP_FLAG_SOC | MV_HP_GEN_IIE |
++			MV_HP_ERRATA_60X1C0;
+ 		break;
+ 
+ 	default:
+-- 
+1.5.2.5
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-ide" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/sata_mv-clear_irq.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/sata_mv-clear_irq.patch	Tue Aug 26 18:22:14 2008
@@ -0,0 +1,61 @@
+From: Lennert Buytenhek <buytenh at wantstofly.org>
+Subject: [PATCH,RFC] sata_mv: don't avoid clearing interrupt status on SoC host adapters
+Date: Sun, 24 Aug 2008 05:04:29 +0200
+To: Saeed Bishara <saeed at marvell.com>, linux-ide at vger.kernel.org
+Cc: Mark Lord <liml at rtr.ca>, Jeff Garzik <jeff at garzik.org>
+
+For some reason, sata_mv doesn't clear interrupt status during init
+when it's running on an SoC host adapter.  If the bootloader has
+touched the SATA controller before starting Linux, Linux can end up
+enabling the SATA interrupt with events pending, which will cause the
+interrupt to be marked as spurious and then be disabled, which then
+breaks all further accesses to the controller.
+
+This patch makes the SoC path clear interrupt status on init like in
+the non-SoC case.
+
+Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
+---
+ drivers/ata/sata_mv.c |   21 ++++++++++-----------
+ 1 files changed, 10 insertions(+), 11 deletions(-)
+
+diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
+index ad169ff..e829a3a 100644
+--- a/drivers/ata/sata_mv.c
++++ b/drivers/ata/sata_mv.c
+@@ -3131,19 +3131,18 @@ static int mv_init_host(struct ata_host *host, unsigned int board_idx)
+ 		writelfl(0, hc_mmio + HC_IRQ_CAUSE_OFS);
+ 	}
+ 
+-	if (!IS_SOC(hpriv)) {
+-		/* Clear any currently outstanding host interrupt conditions */
+-		writelfl(0, mmio + hpriv->irq_cause_ofs);
++	/* Clear any currently outstanding host interrupt conditions */
++	writelfl(0, mmio + hpriv->irq_cause_ofs);
+ 
+-		/* and unmask interrupt generation for host regs */
+-		writelfl(hpriv->unmask_all_irqs, mmio + hpriv->irq_mask_ofs);
++	/* and unmask interrupt generation for host regs */
++	writelfl(hpriv->unmask_all_irqs, mmio + hpriv->irq_mask_ofs);
++
++	/*
++	 * enable only global host interrupts for now.
++	 * The per-port interrupts get done later as ports are set up.
++	 */
++	mv_set_main_irq_mask(host, 0, PCI_ERR);
+ 
+-		/*
+-		 * enable only global host interrupts for now.
+-		 * The per-port interrupts get done later as ports are set up.
+-		 */
+-		mv_set_main_irq_mask(host, 0, PCI_ERR);
+-	}
+ done:
+ 	return rc;
+ }
+-- 
+1.5.6.4
+--
+To unsubscribe from this list: send the line "unsubscribe linux-ide" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html

Modified: dists/sid/linux-2.6/debian/patches/series/4
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/4	(original)
+++ dists/sid/linux-2.6/debian/patches/series/4	Tue Aug 26 18:22:14 2008
@@ -5,3 +5,5 @@
 + bugfix/ia64-cpu0-early-access-per-cpu-vars.patch
 + bugfix/all/fbdefio-add-set_page_dirty-handler-to-deferred-io-fb.patch
 - bugfix/all/mtd-prevent-physmap-from-causing-request_module-runaway-loop-modprobe-net-pf-1.patch
++ bugfix/all/sata_mv-add_gen_iie_flag.patch
++ bugfix/all/sata_mv-clear_irq.patch

More information about the Kernel-svn-changes mailing list