On Wed, 2 Mar 2016, Tero Kristo wrote:
> On 03/02/2016 05:36 AM, Lokesh Vutla wrote:
> > On Tuesday 01 March 2016 10:33 PM, Paul Walmsley wrote:
> > > + Jon Hunter
> > >
> > > On Tue, 1 Mar 2016, Lokesh Vutla wrote:
> > >
> > > > commit 127500ccb766f ("ARM: OMAP2+: Only write the sysconfig on idle
> > > > when necessary") talks about verification of sysconfig cache value
> > > > before
> > > > updating it, only during idle path. But the patch is adding the
> > > > verification in the enable path. So, adding the check in a proper place
> > > > as per the commit description.
> > > >
> > > > Not keeping this check during enable path as there is a chance of losing
> > > > context and it is safe to do on idle as the context of the register will
> > > > never be lost while the device is active.
> >
> > When the patch was originally posted[1], this check was in proper place
> > itself. Not sure what happened after that.
>
> Looks like a merge conflict to me.
>
> The patch from Lokesh fixes it, so:
>
> Acked-by: Tero Kristo <t-kristo@xxxxxx>
Yep, this one looks like I (accidentally) caused this one.
Will queue the following patch for v4.6-rc.
- Paul
From: Lokesh Vutla <lokeshvutla@xxxxxx>
Date: Tue, 1 Mar 2016 17:18:07 +0530
Subject: [PATCH] ARM: OMAP2+: hwmod: Fix updating of sysconfig register
Commit 127500ccb766f ("ARM: OMAP2+: Only write the sysconfig on idle
when necessary") talks about verification of sysconfig cache value before
updating it, only during idle path. But the patch is adding the
verification in the enable path. So, adding the check in a proper place
as per the commit description.
Not keeping this check during enable path as there is a chance of losing
context and it is safe to do on idle as the context of the register will
never be lost while the device is active.
Signed-off-by: Lokesh Vutla <lokeshvutla@xxxxxx>
Acked-by: Tero Kristo <t-kristo@xxxxxx>
Cc: Jon Hunter <jonathanh@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx> # 3.12+
Fixes: commit 127500ccb766 "ARM: OMAP2+: Only write the sysconfig on idle when necessary"
[paul@xxxxxxxxx: appears to have been caused by my own mismerge of the
originally posted patch]
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
---
arch/arm/mach-omap2/omap_hwmod.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index e9f65fec55c0..71b374790c76 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -1416,9 +1416,7 @@ static void _enable_sysc(struct omap_hwmod *oh)
(sf & SYSC_HAS_CLOCKACTIVITY))
_set_clockactivity(oh, oh->class->sysc->clockact, &v);
- /* If the cached value is the same as the new value, skip the write */
- if (oh->_sysc_cache != v)
- _write_sysconfig(v, oh);
+ _write_sysconfig(v, oh);
/*
* Set the autoidle bit only after setting the smartidle bit
@@ -1481,7 +1479,9 @@ static void _idle_sysc(struct omap_hwmod *oh)
_set_master_standbymode(oh, idlemode, &v);
}
- _write_sysconfig(v, oh);
+ /* If the cached value is the same as the new value, skip the write */
+ if (oh->_sysc_cache != v)
+ _write_sysconfig(v, oh);
}
/**
--
2.7.0
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
