commit 7107455a1e2389f6b7f1b6a1906918d7fba18b57
author Swaminathan Sathappan <Swami@codeaurora.org> Tue Sep 20 10:09:31 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 16:20:42 2011 -0700
tree f24bb0cdbad53330ef0daa53ad43c65c040dbbb7
parent 7faa0fad8a07450d62980c7a0618d11eb77772a1

msm: lpass-8960: Make send_q6_nmi atomic context safe in lpass driver

Signed-off-by: Swaminathan Sathappan <Swami@codeaurora.org>

arch/arm/mach-msm/lpass-8960.c

diff --git a/arch/arm/mach-msm/lpass-8960.c b/arch/arm/mach-msm/lpass-8960.c
index df7beb2..9e7ba15 100644
--- a/arch/arm/mach-msm/lpass-8960.c
+++ b/arch/arm/mach-msm/lpass-8960.c
@@ -34,6 +34,7 @@
 /* Subsystem restart: QDSP6 data, functions */
 static void lpass_fatal_fn(struct work_struct *);
 static DECLARE_WORK(lpass_fatal_work, lpass_fatal_fn);
+void __iomem *q6_wakeup_intr;
 struct lpass_ssr {
 	void *lpass_ramdump_dev;
 } lpass_ssr;
@@ -50,23 +51,17 @@
 {
 	/* Send NMI to QDSP6 via an SCM call. */
 	uint32_t cmd = 0x1;
-	void __iomem *q6_wakeup_intr;
 
 	scm_call(SCM_SVC_UTIL, SCM_Q6_NMI_CMD,
 	&cmd, sizeof(cmd), NULL, 0);
 
 	/* Wakeup the Q6 */
-	q6_wakeup_intr = ioremap_nocache(Q6SS_SOFT_INTR_WAKEUP, 8);
-	if (!q6_wakeup_intr) {
-		pr_err("%s: Unable to ioremap\n", __func__);
-		return;
-	}
-	writel_relaxed(0x01, q6_wakeup_intr);
-	iounmap(q6_wakeup_intr);
+	if (q6_wakeup_intr)
+		writel_relaxed(0x01, q6_wakeup_intr);
 	mb();
 
 	/* Q6 requires worstcase 100ms to dump caches etc.*/
-	msleep(100);
+	mdelay(100);
 	pr_debug("%s: Q6 NMI was sent.\n", __func__);
 }
 
@@ -146,6 +141,10 @@
 				__func__, ret);
 		goto out;
 	}
+	q6_wakeup_intr = ioremap_nocache(Q6SS_SOFT_INTR_WAKEUP, 8);
+	if (!q6_wakeup_intr)
+		pr_err("%s: Unable to request q6 wakeup interrupt\n", __func__);
+
 	lpass_ssr_8960.lpass_ramdump_dev = create_ramdump_device("lpass");
 
 	if (!lpass_ssr_8960.lpass_ramdump_dev) {
@@ -161,6 +160,7 @@
 
 static void __exit lpass_fatal_exit(void)
 {
+	iounmap(q6_wakeup_intr);
 	free_irq(LPASS_Q6SS_WDOG_EXPIRED, NULL);
 }