From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23FABC2D0DB for ; Fri, 24 Jan 2020 14:23:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E0FA12072C for ; Fri, 24 Jan 2020 14:23:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579875839; bh=QoKHv3rBnUe/lR2P6PAbjkqsqRT5HPz8zic5VYobNI8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yrPG8qE2BlGvOSl3w49Xr7gMtFvQNbta6T8blhutsuTxeHqL0Z3d37txFVjcrFxjf TGcG9g4le2WO8NKXe3aIKZ2PqDDr6Hr86D3YiZhcq5sq+C2RLC0grnyUbhst+IMEzO ZKsJtRUEM2JPwYMiX+s482XwDaku2ZWoW9NioNdY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392319AbgAXOWP (ORCPT ); Fri, 24 Jan 2020 09:22:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:44130 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729789AbgAXOWF (ORCPT ); Fri, 24 Jan 2020 09:22:05 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3559722527; Fri, 24 Jan 2020 14:22:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579875725; bh=QoKHv3rBnUe/lR2P6PAbjkqsqRT5HPz8zic5VYobNI8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zEcGiWL9jIm0Yc60HelnKHKPaaBL78CxVaJtlM3XY+mtHptlQ4CM8pWz8FdQ9oO7E FstHBCH/FaWSEGVWRI2dEEos4hUlr41QIw0RzqRD6WRCZibaM274KQ99wPf7517n0y xKJZNJtQBN8AUwAJVVQ2/YgzQraFRIrzqFPQLBDI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Guenter Roeck , Jerome Brunet , Stephen Boyd , Sasha Levin , linux-clk@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 05/18] clk: Don't try to enable critical clocks if prepare failed Date: Fri, 24 Jan 2020 09:21:44 -0500 Message-Id: <20200124142157.30931-5-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200124142157.30931-1-sashal@kernel.org> References: <20200124142157.30931-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Guenter Roeck [ Upstream commit 12ead77432f2ce32dea797742316d15c5800cb32 ] The following traceback is seen if a critical clock fails to prepare. bcm2835-clk 3f101000.cprman: plld: couldn't lock PLL ------------[ cut here ]------------ Enabling unprepared plld_per WARNING: CPU: 1 PID: 1 at drivers/clk/clk.c:1014 clk_core_enable+0xcc/0x2c0 ... Call trace: clk_core_enable+0xcc/0x2c0 __clk_register+0x5c4/0x788 devm_clk_hw_register+0x4c/0xb0 bcm2835_register_pll_divider+0xc0/0x150 bcm2835_clk_probe+0x134/0x1e8 platform_drv_probe+0x50/0xa0 really_probe+0xd4/0x308 driver_probe_device+0x54/0xe8 device_driver_attach+0x6c/0x78 __driver_attach+0x54/0xd8 ... Check return values from clk_core_prepare() and clk_core_enable() and bail out if any of those functions returns an error. Cc: Jerome Brunet Fixes: 99652a469df1 ("clk: migrate the count of orphaned clocks at init") Signed-off-by: Guenter Roeck Link: https://lkml.kernel.org/r/20191225163429.29694-1-linux@roeck-us.net Signed-off-by: Stephen Boyd Signed-off-by: Sasha Levin --- drivers/clk/clk.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index c745dad7f85e9..af4f2ffc4fc50 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -2448,11 +2448,17 @@ static int __clk_core_init(struct clk_core *core) if (core->flags & CLK_IS_CRITICAL) { unsigned long flags; - clk_core_prepare(core); + ret = clk_core_prepare(core); + if (ret) + goto out; flags = clk_enable_lock(); - clk_core_enable(core); + ret = clk_core_enable(core); clk_enable_unlock(flags); + if (ret) { + clk_core_unprepare(core); + goto out; + } } /* -- 2.20.1