From patchwork Mon Mar 18 12:10:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10857503 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C78C61669 for ; Mon, 18 Mar 2019 12:11:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FF462942D for ; Mon, 18 Mar 2019 12:11:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9D9F82942E; Mon, 18 Mar 2019 12:11:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2E96C29414 for ; Mon, 18 Mar 2019 12:11:58 +0000 (UTC) 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=Ybms51AwwJddO5eb5v01NGQ0aM5mSeFWsM5B77cMyDY=; b=IAfOj5653WuCC2 5XoEqK4Wj4Ioxqa7RGtLrTKBmuQjr97NJ6ZPpbanoH8Pwq4iyTdQGxZyAY91RWgTaBjXprP3iDOOr DXNdrkERITCGr/mSWRiiwbtlW24x7YBabP1a5vZQAiZYNYnG4mJ6ZV9DHQ2ZkzLsChdGk2MroASvH phdKAxGxy4buO3L/smo3JOR2/gZ4kDPHszV+JEsP/KHGmcW7t2Y5uQzt2NNQuuS/W95xLCsA7k9RS BIYhQGUaN1pqJDzeIDoqpybon067FfhjOCvr5CjMqHUggRgxvQEr7yfoDsKr5aOtFLVNNfsWupbPs 0h8+fDsAb4nlW6QU8vFQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5r7S-0006Gt-KB; Mon, 18 Mar 2019 12:11:54 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5r6s-0005XD-ME for linux-arm-kernel@lists.infradead.org; Mon, 18 Mar 2019 12:11:22 +0000 Received: by mail-wr1-x444.google.com with SMTP id p1so16743339wrs.8 for ; Mon, 18 Mar 2019 05:11:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cpWYOojLBTsu4KaIA68O1v63Z3OHfO2qaJl0yGYsqf8=; b=RSIi8jI3LBW1CswlL8mSVhDfK8FaZglOfju3sQrHuaqQBohPzmB+fyL4FLPUTu+CkG q1kck967FGpsUcFZd7E9m5IiLP/Uk+aZgdJmfa6m0Y9/gjzMxj8iuOIAE7zu5LIVWYZO IlffXXJp9G/pqbdG0m8eo8FeqftEVSiFT0YzjjnDcx8DpOtSo88q5bSlt7J2cGhisZnG PkZE6hYp88NFOD5O5rKIh/wSckMsyn4SRjfeIYfDkFPvVbD9vDvCCE/1hc4rseBhGBlu isZ9baXZU+V00GBgM/fl/kBGoAzILPuvMXVOCE2/5jXWYrsU3tVsC8A4xYaqYg0sX4zP yXZg== 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:mime-version:content-transfer-encoding; bh=cpWYOojLBTsu4KaIA68O1v63Z3OHfO2qaJl0yGYsqf8=; b=pieRvF3QSPJxOnxRigkFzIeYJ3bEbYl8N5FXhXFue0HiFIrbqMh43a25+ZJ8XgOTPp OED2+T3BSc4aYy94kpAYmVyan9N9jqDGV57VWw02FeRxBo3jos8/TfTHhTbc2DpO1CJY 1I3n4pOVZVjKq8cxnYvB6m8topO8J2tceL5hvsaJAmBbTuhtZ22QuxH87XOIvjXKvLMw A3CA4hcB4RAnDV+I3yZEXCCss1h+WAqKPcW1N4wml0GtsdcESbuhy7Sia3up0laT5TvJ GMMnAVcTcOueH2oPkrPmJZ8ZibY1M3DE/E/Z2QukcqVSWX5cHLUpOVuorhzUJXZ2ukp8 w8HQ== X-Gm-Message-State: APjAAAVUyWBEiqNNC14tBXbQdUpQVTlMUaochs0dKiFdRKIPT89PGrC+ aw8uevKjfw9F5qEZj3G09JupZ7E+Ung= X-Google-Smtp-Source: APXvYqwP2oll0Ou+hyRXHgA+IRfOWHWyaot1+p+LQuMjr0b3OxiWv7MO7ikkTDL1mM5kRra0UbZkFg== X-Received: by 2002:adf:dc4d:: with SMTP id m13mr12421932wrj.330.1552911076956; Mon, 18 Mar 2019 05:11:16 -0700 (PDT) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id n13sm8220132wrw.67.2019.03.18.05.11.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:11:14 -0700 (PDT) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Daniel Lezcano , Thomas Gleixner , David Lechner Subject: [PATCH v4 03/11] ARM: davinci: WARN_ON() if clk_get() fails Date: Mon, 18 Mar 2019 13:10:52 +0100 Message-Id: <20190318121100.28132-4-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190318121100.28132-1-brgl@bgdev.pl> References: <20190318121100.28132-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190318_051119_076740_115E0081 X-CRM114-Status: GOOD ( 12.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski Currently the timer code checks if the clock pointer passed to it is good (!IS_ERR(clk)). The new clocksource driver expects the clock to be functional and doesn't perform any checks so emit a warning if clk_get() fails. Apply this to all davinci platforms. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/da830.c | 4 ++++ arch/arm/mach-davinci/da850.c | 4 ++++ arch/arm/mach-davinci/dm355.c | 4 ++++ arch/arm/mach-davinci/dm365.c | 4 ++++ arch/arm/mach-davinci/dm644x.c | 4 ++++ arch/arm/mach-davinci/dm646x.c | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index 63511f638ce4..d242ce06f7e5 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c @@ -750,6 +750,10 @@ void __init da830_init_time(void) da830_pll_init(NULL, pll, NULL); clk = clk_get(NULL, "timer0"); + if (WARN_ON(IS_ERR(clk))) { + pr_err("Unable to get the timer clock\n"); + return; + } davinci_timer_init(clk); } diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 67ab71ba3ad3..72d64d39d42a 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -680,6 +680,10 @@ void __init da850_init_time(void) da850_pll0_init(NULL, pll0, cfgchip); clk = clk_get(NULL, "timer0"); + if (WARN_ON(IS_ERR(clk))) { + pr_err("Unable to get the timer clock\n"); + return; + } davinci_timer_init(clk); } diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index 4a482445b9a2..57c5a660758e 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -742,6 +742,10 @@ void __init dm355_init_time(void) dm355_psc_init(NULL, psc); clk = clk_get(NULL, "timer0"); + if (WARN_ON(IS_ERR(clk))) { + pr_err("Unable to get the timer clock\n"); + return; + } davinci_timer_init(clk); } diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index 8e0a77315add..1d82bb630d11 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -783,6 +783,10 @@ void __init dm365_init_time(void) dm365_psc_init(NULL, psc); clk = clk_get(NULL, "timer0"); + if (WARN_ON(IS_ERR(clk))) { + pr_err("Unable to get the timer clock\n"); + return; + } davinci_timer_init(clk); } diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index cecc7ceb8d34..2b0e921aa755 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -678,6 +678,10 @@ void __init dm644x_init_time(void) dm644x_psc_init(NULL, psc); clk = clk_get(NULL, "timer0"); + if (WARN_ON(IS_ERR(clk))) { + pr_err("Unable to get the timer clock\n"); + return; + } davinci_timer_init(clk); } diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index f33392f77a03..7e5af984ed9f 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -662,6 +662,10 @@ void __init dm646x_init_time(unsigned long ref_clk_rate, dm646x_psc_init(NULL, psc); clk = clk_get(NULL, "timer0"); + if (WARN_ON(IS_ERR(clk))) { + pr_err("Unable to get the timer clock\n"); + return; + } davinci_timer_init(clk); }