[kernel] r11747 - in dists/trunk/linux-2.6/debian: . patches/bugfix/mips patches/series

[Martin Michlmayr]

Author: tbm
Date: Thu Jul  3 10:16:01 2008
New Revision: 11747

Log:
ip32: Enable FAST-20 for onboard scsi


Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/mips/ip32_enable_fast_20.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Jul  3 10:16:01 2008
@@ -86,6 +86,7 @@
     - IP22: Set MIPS_L1_CACHE_SHIFT to 7
     - IP32: fix unexpected irq 71
     - gbefb: fix cmap FIFO timeout (closes: #487257)
+    - Enable FAST-20 for onboard scsi
   * [arm/ixp4xx] Add support for Freecom FSG-3 (Rod Whitby).
   * [arm/ixp4xx] Enable CONFIG_MACH_DSMG600.
   * [arm/iop32x] Unset NET_DMA since it actually leads to worse network

Added: dists/trunk/linux-2.6/debian/patches/bugfix/mips/ip32_enable_fast_20.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/mips/ip32_enable_fast_20.patch	Thu Jul  3 10:16:01 2008
@@ -0,0 +1,29 @@
+Both onboard controller of the O2 support FAST-20 transfer speeds,
+but the bit, which signals that to the aic driver, isn't set. Instead
+of adding detection code to the scsi driver, we just fake the missing
+bit in the PCI config space of the scsi chips.
+
+Signed-off-by: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
+---
+
+ arch/mips/pci/ops-mace.c |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/arch/mips/pci/ops-mace.c b/arch/mips/pci/ops-mace.c
+index e958818..1cfb558 100644
+--- a/arch/mips/pci/ops-mace.c
++++ b/arch/mips/pci/ops-mace.c
+@@ -61,6 +61,13 @@ mace_pci_read_config(struct pci_bus *bus, unsigned int devfn,
+ 	/* ack possible master abort */
+ 	mace->pci.error &= ~MACEPCI_ERROR_MASTER_ABORT;
+ 	mace->pci.control = control;
++	/*
++	 * someone forgot to set the ultra bit for the onboard
++	 * scsi chips; we fake it here
++	 */
++	if (bus->number == 0 && reg == 0x40 && size == 4 &&
++	    (devfn == (1 << 3) || devfn == (2 << 3)))
++		*val |= 0x1000;
+ 
+ 	DPRINTK("read%d: reg=%08x,val=%02x\n", size * 8, reg, *val);
+ 

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Thu Jul  3 10:16:01 2008
@@ -25,6 +25,7 @@
 + bugfix/mips/ip32_fix_unexpected_irq_71.patch
 + bugfix/mips/ip22_cache_shift.patch
 + bugfix/mips/gbefb_fix_cmap_fifo_timeout.patch
++ bugfix/mips/ip32_enable_fast_20.patch
 + bugfix/arm/disable-dvb_b2c2_flexcop.patch
 + bugfix/arm/disable-dvb_budget.patch
 + bugfix/arm/disable-netxen_nic.patch