Commit 6be96ac1 authored Feb 19, 2009 by Mark Lord Committed by Jeff Garzik Feb 25, 2009

sata_mv: fix SoC interrupt breakage



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@marvell.com>
Signed-off-by: Mark Lord <mlord@pobox.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

parent 7ba07d16

drivers/ata/sata_mv.c

+9 −11

Original line number	Diff line number	Diff line
		@@ -3114,7 +3114,6 @@ 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);

		@@ -3126,7 +3125,6 @@ static int mv_init_host(struct ata_host *host, unsigned int board_idx)
		* The per-port interrupts get done later as ports are set up.
		*/
		mv_set_main_irq_mask(host, 0, PCI_ERR);
		}
		done:
		return rc;
		}

Admin message