From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-bl2nam02on0136.outbound.protection.outlook.com ([104.47.38.136]:38384 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S964919AbeCHE7q (ORCPT ); Wed, 7 Mar 2018 23:59:46 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Romain Izard , Stephen Boyd , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 62/67] clk: at91: pmc: Wait for clocks when resuming Date: Thu, 8 Mar 2018 04:57:59 +0000 Message-ID: <20180308045641.7814-62-alexander.levin@microsoft.com> References: <20180308045641.7814-1-alexander.levin@microsoft.com> In-Reply-To: <20180308045641.7814-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: From: Romain Izard [ Upstream commit 960e1c4d93be86d3b118fe22d4edc69e401b28b5 ] Wait for the syncronization of all clocks when resuming, not only the UPLL clock. Do not use regmap_read_poll_timeout, as it will call BUG() when interrupts are masked, which is the case in here. Signed-off-by: Romain Izard Acked-by: Ludovic Desroches Acked-by: Nicolas Ferre Acked-by: Alexandre Belloni Signed-off-by: Stephen Boyd Signed-off-by: Sasha Levin --- drivers/clk/at91/pmc.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c index 775af473fe11..5c2b26de303e 100644 --- a/drivers/clk/at91/pmc.c +++ b/drivers/clk/at91/pmc.c @@ -107,10 +107,20 @@ static int pmc_suspend(void) return 0; } =20 +static bool pmc_ready(unsigned int mask) +{ + unsigned int status; + + regmap_read(pmcreg, AT91_PMC_SR, &status); + + return ((status & mask) =3D=3D mask) ? 1 : 0; +} + static void pmc_resume(void) { - int i, ret =3D 0; + int i; u32 tmp; + u32 mask =3D AT91_PMC_MCKRDY | AT91_PMC_LOCKA; =20 regmap_read(pmcreg, AT91_PMC_MCKR, &tmp); if (pmc_cache.mckr !=3D tmp) @@ -134,13 +144,11 @@ static void pmc_resume(void) AT91_PMC_PCR_CMD); } =20 - if (pmc_cache.uckr & AT91_PMC_UPLLEN) { - ret =3D regmap_read_poll_timeout(pmcreg, AT91_PMC_SR, tmp, - !(tmp & AT91_PMC_LOCKU), - 10, 5000); - if (ret) - pr_crit("USB PLL didn't lock when resuming\n"); - } + if (pmc_cache.uckr & AT91_PMC_UPLLEN) + mask |=3D AT91_PMC_LOCKU; + + while (!pmc_ready(mask)) + cpu_relax(); } =20 static struct syscore_ops pmc_syscore_ops =3D { --=20 2.14.1