linux-toradex.git/drivers/ide, branch v2.6.18-rc4

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

2006-07-31T20:39:52+00:00

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Minor comment fix for misc_64.S
  [POWERPC] Use H_CEDE on non-SMT
  [POWERPC] force 64bit mode in fwnmi handlers to workaround firmware bugs
  [POWERPC] PMAC_APM_EMU should depend on ADB_PMU
  [POWERPC] Fix new interrupt code (MPIC detection)
  [POWERPC] Fix new interrupt code (MPIC endianness)
  [POWERPC] Add cpufreq support for Xserve G5
  [POWERPC] Xserve G5 thermal control fixes
  [POWERPC] Fix mem= handling when the memory limit is > RMO size
  [POWERPC] More offb/bootx fixes
  [POWERPC] Fix legacy_serial.c error handling on 32 bits
  [POWERPC] Fix default clock for udbg_16550
  [POWERPC] Fix non-MPIC CHRPs with CONFIG_SMP set
  [POWERPC] Fix 32 bits warning in prom_init.c
  [POWERPC] Workaround Pegasos incorrect ISA "ranges"
  [POWERPC] fix up front-LED Kconfig

[PATCH] sgiioc4: Always share IRQ

2006-07-31T20:28:40+00:00

The SGI IOC4 IDE device always shares an interrupt with other devices which
are part of IOC4.  As such, IDEPCI_SHARE_IRQ should always be enabled when
BLK_DEV_SGIIOC4 is enabled.

Signed-off-by: Brent Casavant 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

[PATCH] IDE: Touch NMI watchdog during resume from STR

2006-07-31T20:28:39+00:00

When resuming from suspend-to-RAM, the NMI watchdog detects a lockup in
ide_wait_not_busy.  Here's a screenshot of the trace taken by a digital
camera: http://www.uamt.feec.vutbr.cz/rizeni/pom/DSC03510-2.JPG

Let's touch the NMI watchdog in ide_wait_not_busy.  The system then resumes
correctly from STR.

[akpm@osdl.org: modular build fix]
Signed-off-by: Michal Schmidt 
Acked-by: Alan Cox 
Cc: Bartlomiej Zolnierkiewicz 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

[PATCH] it821x: fix ide dma setup bug

2006-07-28T07:02:17+00:00

Only enable dma for a valid speed setting.

Signed-off-by: Jens Axboe

[PATCH] ide: if the id fields looks screwy, disable DMA

2006-07-28T06:58:26+00:00

It's the safer choice. Originally due to a bug in itx821x, but a
generally sound thing to do.

Signed-off-by: Jens Axboe

[PATCH] ide: option to disable cache flushes for buggy drives

2006-07-28T06:54:59+00:00

Some drives claim they support cache flushing, but get seriously
confused if you try. Add this option to be able to boot with
barriers enabled by default.

Signed-off-by: Jens Axboe

[POWERPC] fix up front-LED Kconfig

2006-07-25T15:26:08+00:00

This patch fixes the front-LED Kconfig issues I introduced while
creating it. Apparently having a dependency isn't enough to have the
select not evaluated or something like that.

The patch also changes the default configuration for pmac32 select the
default for the LED to be the IDE trigger. While I was at it, I
completely updated the defconfig and also added snd-aoa to it.

Signed-off-by: Johannes Berg 
Signed-off-by: Paul Mackerras

Revert "[PATCH] pcmcia: Make ide_cs work with the memory space of CF-Cards if IO space is not available"

2006-07-13T04:04:16+00:00

This reverts commit 5040cb8b7e61b7a03e8837920b9eb2c839bb1947.

It breaks previously working ide-cs PIO configurations, causing problems
like

	ide2: I/O resource 0xF883200E-0xF883200E not free.
	ide2: ports already in use, skipping probe

rather than a working kernel.

Cc: Thomas Kleffel 
Cc: Dominik Brodowski 
Signed-off-by: Linus Torvalds

[PATCH] ide: fix Jmicron support

2006-07-12T19:59:35+00:00

Prior to 2.6.18rc1 you could install with devices on a JMicron chipset
using the "all-generic-ide" option. As of this kernel the AHCI driver
grabs the controller and rams it into AHCI mode losing the PATA ports
and making CD drives and the like vanish. The all-generic-ide option
fails because the AHCI driver grabbed the PCI device and reconfigured
it.

To fix this three things are needed.

#1 We must put the chip into dual function mode
#2 The AHCI driver must grab only function 0 (already in your rc1 tree)
#3 Something must grab the PATA ports

The attached patch is the minimal risk edition of this. It puts the chip
into dual function mode so that AHCI will grab the SATA ports without
losing the PATA ports. To keep the risk as low as possible the third
patch adds the PCI identifiers for the PATA port and the FN check to the
ide-generic driver. There is a more featured jmicron driver on its way
but that adds risk and the ide-generic support is sufficient to install
and run a system.

The actual chip setup done by the quirk is the precise setup recommended
by the vendor.

(The JMB368 appears only in the ide-generic entry as it has no AHCI so
does not need the quirk)

Signed-off-by: Alan Cox 
Acked-by: Jeff Garzik 
Signed-off-by: Linus Torvalds

[PATCH] lockdep: annotate on-stack completions

2006-07-03T22:27:09+00:00

lockdep needs to have the waitqueue lock initialized for on-stack waitqueues
implicitly initialized by DECLARE_COMPLETION().  Annotate on-stack completions
accordingly.

Has no effect on non-lockdep kernels.

Signed-off-by: Ingo Molnar 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds