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: 814290 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=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="OFttLCzZ"; 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 bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xtxyy6H91z9s7m for ; Sat, 16 Sep 2017 00:06:34 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Vayr77kqbaog+q+1CnYzSWXbefHZtNBWmDlqW2Uoyco=; b=OFttLCzZ4gR91ZS8zKdiFKKb5l L2e/jwCd6S5jAfWaHfwtKvPd5Rq8gr8NhYvxdkNvLTdyRg3CwNnFetWjVAITX96rZXsnNxN3UEQbG pERKASTBpUBfeobgVhGXIeSz2gQishLkZwS7tyMcMEckDf6TS/cq5MRa6CYbi8vFjgoaZrXW+O7G4 MWIxRLqd9k978+QFV2zLy3QXWhngQyhsS6DVx8ypva6Ebxh+vB5KDHo0wz3V1/ghTRvjRxHDIli2V WafA9MIE84E2fuLjjFve7WQpQsJhk6lAk8qfjfDWYXQHKCWuNoRJ7kfpZ9tz5h7vfMeksnpw0Gvmh QsPwwbpA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dsrFw-0005ff-RM; Fri, 15 Sep 2017 14:06:08 +0000 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dsrEu-0003m1-U2; Fri, 15 Sep 2017 14:05:10 +0000 Received: by mail-wm0-x244.google.com with SMTP id r136so2878595wmf.3; Fri, 15 Sep 2017 07:04:46 -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=iw6D4hx2dhTnRvfV5asstLku6+OlIwLB2LkEyoPXACUPmijqWJzhmS7JBl3ykwHgBu GxEwHXzOCLoWjtoHFyQ0FMDyc0Uut8BZzVnVbxOGQHHDx/0z2uYb5hqEWzOAoR0JhaVn 5ZJxHwyQxGp53rZXR5ivFu4zV2+QfniooQBKZ+0KhkYe2g3D4GPy6fEpHX+He7nRH3l7 9TwtuMRlo75/Yvs2P5sT2DC1U/cnRadTonYXOwdTFFjyrWMGB7RKiC97RrktcvPL6Idq ynrfJbVs3fiR4/ZpuAty31MrfZinbMd55XDXDd2BZAFAgmbHS1B4c/kdPf2ekc1QekkG 0r9g== X-Gm-Message-State: AHPjjUjwyw+koH5kw8PHKqFCdjDXEtvQCjE226nzAAyrAiawqbGRsZUR lGbdokgUVRync0raqsQWHJc= 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170915_070505_167118_754A2E23 X-CRM114-Status: GOOD ( 12.51 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (romain.izard.pro[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-pwm@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, linux-serial@vger.kernel.org, Romain Izard , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.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 = {