From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 19 Dec 2013 05:53:06 +0000 (-0800)
Subject: 3.12-stable patches
X-Git-Tag: v3.4.75~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=259f9a0a47b61487d1a38d896570d23920961b86;p=thirdparty%2Fkernel%2Fstable-queue.git

3.12-stable patches

added patches:
	arm-omap2-hwmod-fix-softreset-logic.patch
---

diff --git a/queue-3.12/arm-omap2-hwmod-fix-softreset-logic.patch b/queue-3.12/arm-omap2-hwmod-fix-softreset-logic.patch
new file mode 100644
index 00000000000..25339c642b8
--- /dev/null
+++ b/queue-3.12/arm-omap2-hwmod-fix-softreset-logic.patch
@@ -0,0 +1,108 @@
+From 313a76ee11cda6700548afe68499ef174a240688 Mon Sep 17 00:00:00 2001
+From: Roger Quadros <rogerq@ti.com>
+Date: Sun, 8 Dec 2013 18:39:02 -0700
+Subject: ARM: OMAP2+: hwmod: Fix SOFTRESET logic
+
+From: Roger Quadros <rogerq@ti.com>
+
+commit 313a76ee11cda6700548afe68499ef174a240688 upstream.
+
+In _ocp_softreset(), after _set_softreset() + write_sysconfig(),
+the hwmod's sysc_cache will always contain SOFTRESET bit set
+so all further writes to sysconfig using this cache will initiate
+a repeated SOFTRESET e.g. enable_sysc(). This is true for OMAP3 like
+platforms that have RESET_DONE status in the SYSSTATUS register and
+so the the SOFTRESET bit in SYSCONFIG is not automatically cleared.
+It is not a problem for OMAP4 like platforms that indicate RESET
+completion by clearing the SOFTRESET bit in the SYSCONFIG register.
+
+This repeated SOFTRESET is undesired and was the root cause of
+USB host issues on OMAP3 platforms when hwmod was allowed to do the
+SOFTRESET for the USB Host module.
+
+To fix this we clear the SOFTRESET bit and update the sysconfig
+register + sysc_cache using write_sysconfig().
+
+Signed-off-by: Roger Quadros <rogerq@ti.com>
+Tested-by: Tomi Valkeinen <tomi.valkeinen@ti.com> # Panda, BeagleXM
+[paul@pwsan.com: renamed _clr_softreset() to _clear_softreset()]
+Signed-off-by: Paul Walmsley <paul@pwsan.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/mach-omap2/omap_hwmod.c |   43 ++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 42 insertions(+), 1 deletion(-)
+
+--- a/arch/arm/mach-omap2/omap_hwmod.c
++++ b/arch/arm/mach-omap2/omap_hwmod.c
+@@ -399,7 +399,7 @@ static int _set_clockactivity(struct oma
+ }
+ 
+ /**
+- * _set_softreset: set OCP_SYSCONFIG.CLOCKACTIVITY bits in @v
++ * _set_softreset: set OCP_SYSCONFIG.SOFTRESET bit in @v
+  * @oh: struct omap_hwmod *
+  * @v: pointer to register contents to modify
+  *
+@@ -427,6 +427,36 @@ static int _set_softreset(struct omap_hw
+ }
+ 
+ /**
++ * _clear_softreset: clear OCP_SYSCONFIG.SOFTRESET bit in @v
++ * @oh: struct omap_hwmod *
++ * @v: pointer to register contents to modify
++ *
++ * Clear the SOFTRESET bit in @v for hwmod @oh.  Returns -EINVAL upon
++ * error or 0 upon success.
++ */
++static int _clear_softreset(struct omap_hwmod *oh, u32 *v)
++{
++	u32 softrst_mask;
++
++	if (!oh->class->sysc ||
++	    !(oh->class->sysc->sysc_flags & SYSC_HAS_SOFTRESET))
++		return -EINVAL;
++
++	if (!oh->class->sysc->sysc_fields) {
++		WARN(1,
++		     "omap_hwmod: %s: sysc_fields absent for sysconfig class\n",
++		     oh->name);
++		return -EINVAL;
++	}
++
++	softrst_mask = (0x1 << oh->class->sysc->sysc_fields->srst_shift);
++
++	*v &= ~softrst_mask;
++
++	return 0;
++}
++
++/**
+  * _wait_softreset_complete - wait for an OCP softreset to complete
+  * @oh: struct omap_hwmod * to wait on
+  *
+@@ -1911,6 +1941,12 @@ static int _ocp_softreset(struct omap_hw
+ 	ret = _set_softreset(oh, &v);
+ 	if (ret)
+ 		goto dis_opt_clks;
++
++	_write_sysconfig(v, oh);
++	ret = _clear_softreset(oh, &v);
++	if (ret)
++		goto dis_opt_clks;
++
+ 	_write_sysconfig(v, oh);
+ 
+ 	if (oh->class->sysc->srst_udelay)
+@@ -3158,6 +3194,11 @@ int omap_hwmod_softreset(struct omap_hwm
+ 	if (ret)
+ 		goto error;
+ 	_write_sysconfig(v, oh);
++
++	ret = _clear_softreset(oh, &v);
++	if (ret)
++		goto error;
++	_write_sysconfig(v, oh);
+ 
+ error:
+ 	return ret;
diff --git a/queue-3.12/series b/queue-3.12/series
index 0ac82fc3308..5c7b7b6c74a 100644
--- a/queue-3.12/series
+++ b/queue-3.12/series
@@ -116,3 +116,4 @@ btrfs-fix-lockdep-error-in-async-commit.patch
 i915-vlv-untangle-integrated-clock-source-handling-v4.patch
 drm-i915-vlv-add-vlv-specific-clock_get-function-v3.patch
 drm-i915-vlv-fix-up-broken-precision-in-vlv_crtc_clock_get.patch
+arm-omap2-hwmod-fix-softreset-logic.patch