From patchwork Fri Sep 15 14:04:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Izard X-Patchwork-Id: 814293 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pwm-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DHIV2a9T"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xtxzt1jHrz9s7m for ; Sat, 16 Sep 2017 00:07:22 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751459AbdIOOEu (ORCPT ); Fri, 15 Sep 2017 10:04:50 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:37809 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751364AbdIOOEq (ORCPT ); Fri, 15 Sep 2017 10:04:46 -0400 Received: by mail-wm0-f67.google.com with SMTP id f4so2877910wmh.4; Fri, 15 Sep 2017 07:04:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QpAJytz+aiNN6ugMH0pd0IRk4M6Nw+EoUUnBnzUoU6Q=; b=DHIV2a9TdiWH89jWBKI6sRjXAfqJgVe5qYzlKSZf0hZO77U3hfHFvjgkfIatLK547Y IYWDXFZpkEqpTcNsTNZrbW+2X9oJ8Lh1W3CpzXP9A1zZ0MY1kBZ265Pag1WF7edMy6Xy P+eXosvsTFMwYycJ/cuvBTfKMKL6LnmGAa51VFJ5LY4LkU6d5xJiu1QTAKpJVbn4Jjon 3j0rkBPnFtN6+FnXy86XoX9vB2fu7L9tUYCD//kRakcmf0j/1kEyBNIVOuvnyi5Jyleg Q2bbIhjcOqNzqih/ew3zUXwvEMuKHtX86oDyYwyltw5Gsk7Rnl5ZAdEMTKlGD500EyYU /khA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QpAJytz+aiNN6ugMH0pd0IRk4M6Nw+EoUUnBnzUoU6Q=; b=K+2aqRcSobLpB6Thz84dx9mnmIQv0B5gKZSxCqspNcXHI+6lie8+eWnMF1Cb25vNpA TsnzuBWZzF5as5zUlWeQ6kHeWbO/u+VsjMcSPI95LE+7/Xp3C2Fe7lrcoL20yyRecmXA mWzJLyOeTa/stXDi5Op87cnTsCgcmV01CRKRKxDtaZgdTNotL16a+ISbFsgNOkFmvi5w mAZzs/+/vbZyilIFuNXric4zeePWDrz0XPhoHFooBEbe/jRQHANaKvDHIP6HGlwL9fOF FSjpBU0MrNvFhvPWkmyUSJrV02Kb3nRZZ3oEqxk/Wy9FqwMxuRVPCY4PGLXG0eqAYD9q nVzA== X-Gm-Message-State: AHPjjUjdk47dJjB4hZZARPxhaoGT4LuAIOb5GwwnySRzD0QbPguOfXLB 68nuN+VivOkmdvQXdb4/Agg= X-Google-Smtp-Source: AOwi7QAl2xippvS5p8vsv7LTu8pczrn78LKP+GFjl6fUtAGFUh9arHyp+CJyMv/45ePzYEMy+yl89w== X-Received: by 10.28.185.195 with SMTP id j186mr2831376wmf.97.1505484285041; Fri, 15 Sep 2017 07:04:45 -0700 (PDT) Received: from localhost.localdomain (146.187.3.109.rev.sfr.net. [109.3.187.146]) by smtp.gmail.com with ESMTPSA id 55sm1399225wrw.60.2017.09.15.07.04.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Sep 2017 07:04:44 -0700 (PDT) From: Romain Izard To: Nicolas Ferre , Alexandre Belloni , Boris Brezillon , Michael Turquette , Stephen Boyd , Ludovic Desroches , Wenyou Yang , Josh Wu , David Woodhouse , Brian Norris , Marek Vasut , Cyrille Pitchen , Thierry Reding , Richard Genoud , Greg Kroah-Hartman , Alan Stern Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, linux-pwm@vger.kernel.org, linux-serial@vger.kernel.org, linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Romain Izard Subject: [PATCH v2 1/9] clk: at91: pmc: Wait for clocks when resuming Date: Fri, 15 Sep 2017 16:04:03 +0200 Message-Id: <20170915140411.31716-2-romain.izard.pro@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170915140411.31716-1-romain.izard.pro@gmail.com> References: <20170915140411.31716-1-romain.izard.pro@gmail.com> Sender: linux-pwm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pwm@vger.kernel.org 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 --- 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; } +static bool pmc_ready(unsigned int mask) +{ + unsigned int status; + + regmap_read(pmcreg, AT91_PMC_SR, &status); + + return ((status & mask) == mask) ? 1 : 0; +} + static void pmc_resume(void) { - int i, ret = 0; + int i; u32 tmp; + u32 mask = AT91_PMC_MCKRDY | AT91_PMC_LOCKA; regmap_read(pmcreg, AT91_PMC_MCKR, &tmp); if (pmc_cache.mckr != tmp) @@ -134,13 +144,11 @@ static void pmc_resume(void) AT91_PMC_PCR_CMD); } - if (pmc_cache.uckr & AT91_PMC_UPLLEN) { - ret = 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 |= AT91_PMC_LOCKU; + + while (!pmc_ready(mask)) + cpu_relax(); } static struct syscore_ops pmc_syscore_ops = {