From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Hilman Subject: Re: [PATCHv2 02/12] ARM: OMAP2+: hwmod code/data: fix 32K sync timer Date: Thu, 05 Jul 2012 15:06:31 -0700 Message-ID: <87pq89euc8.fsf@ti.com> References: <20120611004502.20034.8840.stgit@dusk> <20120611004555.20034.87035.stgit@dusk> <4FDA15AA.6090704@ti.com> <4FDA45F5.9090300@ti.com> <4FDB387C.7030003@ti.com> <4FF475E6.3060308@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from na3sys009aog117.obsmtp.com ([74.125.149.242]:49290 "EHLO na3sys009aog117.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753738Ab2GEWGV convert rfc822-to-8bit (ORCPT ); Thu, 5 Jul 2012 18:06:21 -0400 Received: by ghy10 with SMTP id 10so14625647ghy.16 for ; Thu, 05 Jul 2012 15:06:19 -0700 (PDT) In-Reply-To: (Paul Walmsley's message of "Wed, 4 Jul 2012 12:59:34 -0600 (MDT)") Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Paul Walmsley Cc: Benoit Cousson , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tony Lindgren , Tero Kristo , Vaibhav Hiremath Paul Walmsley writes: > Hi Beno=C3=AEt > > On Wed, 4 Jul 2012, Benoit Cousson wrote: > >> > @@ -1141,8 +1144,16 @@ static void _enable_sysc(struct omap_hwmod = *oh) >> > sf =3D oh->class->sysc->sysc_flags; >> > =20 >> > if (sf & SYSC_HAS_SIDLEMODE) { >> > - idlemode =3D (oh->flags & HWMOD_SWSUP_SIDLE) ? >> > - HWMOD_IDLEMODE_NO : HWMOD_IDLEMODE_SMART; >> > + clkdm_act =3D ((oh->clkdm && >> > + oh->clkdm->flags & CLKDM_ACTIVE_WITH_MPU) || >> > + (oh->_clk->clkdm && >>=20 >> This is crashing on OMAP4 due to a NULL oh->_clk that can happen on = some >> hwmod. >>=20 >> + (oh->_clk && oh->_clk->clkdm && >>=20 >> Is fixing the issue. > > Thanks, just made the change and pushed the patch up to=20 > git://git.pwsan.com/linux-2.6 in the branch 'omap_fixes_c_3.5rc' OK, to ensure this fix gets into v3.5-rc, I'm taking the version from this branch and queuing up as a PM fix Tony. Kevin -- To unsubscribe from this list: send the line "unsubscribe linux-omap" i= n the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 From: khilman@ti.com (Kevin Hilman) Date: Thu, 05 Jul 2012 15:06:31 -0700 Subject: [PATCHv2 02/12] ARM: OMAP2+: hwmod code/data: fix 32K sync timer In-Reply-To: (Paul Walmsley's message of "Wed, 4 Jul 2012 12:59:34 -0600 (MDT)") References: <20120611004502.20034.8840.stgit@dusk> <20120611004555.20034.87035.stgit@dusk> <4FDA15AA.6090704@ti.com> <4FDA45F5.9090300@ti.com> <4FDB387C.7030003@ti.com> <4FF475E6.3060308@ti.com> Message-ID: <87pq89euc8.fsf@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Paul Walmsley writes: > Hi Beno?t > > On Wed, 4 Jul 2012, Benoit Cousson wrote: > >> > @@ -1141,8 +1144,16 @@ static void _enable_sysc(struct omap_hwmod *oh) >> > sf = oh->class->sysc->sysc_flags; >> > >> > if (sf & SYSC_HAS_SIDLEMODE) { >> > - idlemode = (oh->flags & HWMOD_SWSUP_SIDLE) ? >> > - HWMOD_IDLEMODE_NO : HWMOD_IDLEMODE_SMART; >> > + clkdm_act = ((oh->clkdm && >> > + oh->clkdm->flags & CLKDM_ACTIVE_WITH_MPU) || >> > + (oh->_clk->clkdm && >> >> This is crashing on OMAP4 due to a NULL oh->_clk that can happen on some >> hwmod. >> >> + (oh->_clk && oh->_clk->clkdm && >> >> Is fixing the issue. > > Thanks, just made the change and pushed the patch up to > git://git.pwsan.com/linux-2.6 in the branch 'omap_fixes_c_3.5rc' OK, to ensure this fix gets into v3.5-rc, I'm taking the version from this branch and queuing up as a PM fix Tony. Kevin