From patchwork Fri Sep 15 19:10:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 814361 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-tegra-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="JuXt8Ltm"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xv4hs2d2Rz9s7g for ; Sat, 16 Sep 2017 05:09:49 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751523AbdIOTJs (ORCPT ); Fri, 15 Sep 2017 15:09:48 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:36522 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751454AbdIOTJr (ORCPT ); Fri, 15 Sep 2017 15:09:47 -0400 Received: by mail-pg0-f67.google.com with SMTP id d8so1753571pgt.3; Fri, 15 Sep 2017 12:09:47 -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; bh=EQwv7QLjZl7qgW0hXJ1xuzElPZInyVzBgPBPaOgaN80=; b=JuXt8LtmS6xPodkWY7dxNDgf45or7t03CAaObvgkCJDhts1oI9lzGAN1pByp7tayVv ho0ahR2Bm9KRZGqSPDsSMJCYwxZMSI/YQSyJi4yjCVd0NFPE1DmLNGeLC/NYdvUiMMMh +xTXK2toCcw0tmZhDwvw7E7qBg1lr570BE5qtvsKmhS/KfsY+UkAGJFrM3xoSOZw4RYx eLbhZeVXsqFmLwrkoegQwrlzFsv9wB+n6KJ11XaZVUrio5yDzxjo0+3w/f05UQ1kYvh9 L7afgvjHFJOZGXGsIuNHhTircFdsMyFXsKXjn+Y8pmwd6zMqtzsYFBojDpb46mXdkxk9 HeNw== 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; bh=EQwv7QLjZl7qgW0hXJ1xuzElPZInyVzBgPBPaOgaN80=; b=PBnVBYDT1N8gafbSK6HICvrwRvxI0k2jI/wbX4T8gqNqJZReHcVscx93oxgzdblPeK kenspRcHaz1AZ3RH0jKVOatR+jAYqsPTb50kTPX/GLr9WqIiq216y3qfVKBnEsM1RgJn OnLfQOTgI8lVQ0KxnW2s7mE9MpE+y9mVp+hRg80Wd74CnBz1KPjPA6bHTuk8gDo56JFN ZQ4INzPvdmbdFKq8Iv0TYl72XbywTumqUDWhWLuNOni/lOiDh1tGnDDF59kPCbfmW88L OYei7VUVcVqNNQY8LBF5rHLU3LKf1/gnMg26uIU0IUAqw34i33RPUkN9lshk4JuoT34x Mqtg== X-Gm-Message-State: AHPjjUhWbCi2VKl0x9G9/8SPvReNsPcFc2QsSSVNX9B2axZ7+uJXBuqS Lnr7LfU6hgQhOqkf X-Google-Smtp-Source: ADKCNb45FKTS7hZ+MVrB43KRRi5b56qSm+KniQ2+vnSDIyed2A38Id3JUgY+T4V6Y14PzU8jljKfvg== X-Received: by 10.98.160.131 with SMTP id p3mr26182479pfl.260.1505502586452; Fri, 15 Sep 2017 12:09:46 -0700 (PDT) Received: from Asurada-Nvidia.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id p71sm5409118pfl.56.2017.09.15.12.09.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 Sep 2017 12:09:45 -0700 (PDT) From: Nicolin Chen To: thierry.reding@gmail.com, sboyd@codeaurora.org, pdeschrijver@nvidia.com Cc: linux-kernel@vger.kernel.org, linux-tegra@vger.kernel.org, linux-clk@vger.kernel.org, jonathanh@nvidia.com, mturquette@baylibre.com, pgaikwad@nvidia.com Subject: [PATCH v2] clk: tegra: Use readl_relaxed_poll_timeout_atomic in tegra210_clock_init Date: Fri, 15 Sep 2017 12:10:13 -0700 Message-Id: <1505502613-11801-1-git-send-email-nicoleotsuka@gmail.com> X-Mailer: git-send-email 2.1.4 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Below is the call trace of tegra210_init_pllu() function: start_kernel() -> time_init() --> of_clk_init() ---> tegra210_clock_init() ----> tegra210_pll_init() -----> tegra210_init_pllu() Because the preemption is disabled in the start_kernel before calling time_init, tegra210_init_pllu is actually in an atomic context while it includes a readl_relaxed_poll_timeout that might sleep. So this patch just changes this readl_relaxed_poll_timeout() to its atomic version. Signed-off-by: Nicolin Chen Acked-By: Peter De Schrijver --- Changelog v2: * Corrected a typo in the commit log * Added Peter's Acked-by. drivers/clk/tegra/clk-tegra210.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/tegra/clk-tegra210.c b/drivers/clk/tegra/clk-tegra210.c index 0b9789a..ea695c4 100644 --- a/drivers/clk/tegra/clk-tegra210.c +++ b/drivers/clk/tegra/clk-tegra210.c @@ -2587,8 +2587,8 @@ static int tegra210_enable_pllu(void) reg |= PLL_ENABLE; writel(reg, clk_base + PLLU_BASE); - readl_relaxed_poll_timeout(clk_base + PLLU_BASE, reg, - reg & PLL_BASE_LOCK, 2, 1000); + readl_relaxed_poll_timeout_atomic(clk_base + PLLU_BASE, reg, + reg & PLL_BASE_LOCK, 2, 1000); if (!(reg & PLL_BASE_LOCK)) { pr_err("Timed out waiting for PLL_U to lock\n"); return -ETIMEDOUT;