[PATCH 01/03] sata_mv: revert SoC irq breakage

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Revert most of commit 6be96ac1d5e4d913e1f48299db083ada5321803b2,
originally from Lennert Buijtenheck (Marvell) and Saeed Bishara (Marvell),
since that commit causes sata_mv to oops at startup on SOC "Kirkwood".

The SOC variants do not have the hpriv->irq_{cause,mask}_ofs registers,
so don't try to write to them!

This patch should also be considered for -stable.

Reported-by: Maxime Bizon <mbizon@xxxxxxxxxx>
Signed-off-by: Mark Lord <mlord@xxxxxxxxx>
---
Note: I am mostly in the dark about the sata_mv SOC stuff,
since I have incomplete documentation and no hardware to test with.

--- old/drivers/ata/sata_mv.c	2009-04-06 11:18:01.000000000 -0400
+++ new/drivers/ata/sata_mv.c	2009-04-06 11:59:57.000000000 -0400
@@ -3734,11 +3734,13 @@
		writelfl(0, hc_mmio + HC_IRQ_CAUSE_OFS);
	}

-	/* Clear any currently outstanding host interrupt conditions */
-	writelfl(0, mmio + hpriv->irq_cause_ofs);
+	if (!IS_SOC(hpriv)) {
+		/* 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.
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Filesystems]     [Linux SCSI]     [Linux RAID]     [Git]     [Kernel Newbies]     [Linux Newbie]     [Security]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Samba]     [Device Mapper]

  Powered by Linux