Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp4151863pxv; Mon, 19 Jul 2021 18:34:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzh/ePQP5SQGKAXLT7zFkCkd8WdTlFmI1iNHq8RgTwXsoaKb7DerYLNe3lKVk0vFLx/yuCm X-Received: by 2002:a92:c083:: with SMTP id h3mr19611776ile.73.1626744860675; Mon, 19 Jul 2021 18:34:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626744860; cv=none; d=google.com; s=arc-20160816; b=FaKlsHF8Eer0Mtv7I+D6wHSt5MEBvakctdjMkv/BLiJYPbLJYNmPEvZ2gnimFvWYig bfuwbL8sQ2tFjuCQ9MoS7RYDVrxDH28TTIO/DVeCeQb95Pon63Z5jhowDk2addoemWgM 67YwI17eGeg71gjAJs8AD8PywZwvkKDTeJdMtlSHFcIdID02SH1PZumWoGRPqVRA9GSl 5L48GQu8AVvHkR7KcW7k4FHSlxPST39vEPlwh5F3s2kid4L9xHGm5V0zrNFMl9crrjMs buc8Qs6PYe2BUPE0f68DprJ5nvcqicLWFGp2RIQy9k0dLAfKgkHxcayBky+jot7VTozu XB1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hmlCGfd6eyC65oKiNFjizfB1noIewRmcyEVN6wo2d/s=; b=JW88puNY98C6r3Vkv4uPJjkqcIpPbxYpfEurPhRK4NKmam7luwZqyPRmh7yHAsIOxH P41czo/HaG6sFlqm50aml312XAG+Trm/BHXnTf8harJ8nus0d16trZpMtdmlUM/M2Q6J en5zvMvaipLS3s5KkZTQ9rEu+tr+S+7sdKCc3xMhBW3TRUUQBzOIy2/Bldo//utw9C1H XyseRcWUvIl1E89KiOLoHNpqb2yTkmeXqfZS5fG6iwnFcCRqzqxPBnN+ASBsjzmlujMI KtbpZbF3gZTB7sFBUUaFjMdRzRnczMTJjLv6IhHOS5pVf0GCkMjqge+MxGHapf+Q9/vO KRMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=OT1TtqU9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h22si17290189jal.57.2021.07.19.18.34.09; Mon, 19 Jul 2021 18:34:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=OT1TtqU9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244816AbhGSOxN (ORCPT + 99 others); Mon, 19 Jul 2021 10:53:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:46038 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343517AbhGSOe7 (ORCPT ); Mon, 19 Jul 2021 10:34:59 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B7AFE6113E; Mon, 19 Jul 2021 15:15:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626707710; bh=LSenNnVVeoZlw0kd2kGYG4MPZ1yWHLzvtc7JT3okQzw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OT1TtqU9dnBq79du0JQ06q5GZ5VNZ9MguIDB3Ym8ygQkHiiMwd181/jIX32s4A7Lq 8+MZvzRdQ7d+4xbPnugyOvFH+ddyopYGrXK5GyR+q7F/TCuIYnXUvhkuwAyaotDv0Z L2wkibVSkiFX4XRC/bU+fUYL+nJwM9axwkpQBgYA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Martin Fuzzey , Nobuhiro Iwamatsu , Alexandre Belloni Subject: [PATCH 4.14 025/315] rtc: stm32: Fix unbalanced clk_disable_unprepare() on probe error path Date: Mon, 19 Jul 2021 16:48:34 +0200 Message-Id: <20210719144943.713094298@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144942.861561397@linuxfoundation.org> References: <20210719144942.861561397@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Martin Fuzzey commit 950ac33dbe6ff656a623d862022f0762ec061ba7 upstream. The STM32MP1 RTC may have 2 clocks, the pclk and the rtc_ck. If clk_prepare_enable() fails for the second clock (rtc_ck) we must only call clk_disable_unprepare() for the first clock (pclk) but currently we call it on both leading to a WARN: [ 15.629568] WARNING: CPU: 0 PID: 146 at drivers/clk/clk.c:958 clk_core_disable+0xb0/0xc8 [ 15.637620] ck_rtc already disabled [ 15.663322] CPU: 0 PID: 146 Comm: systemd-udevd Not tainted 5.4.77-pknbsp-svn5759-atag-v5.4.77-204-gea4235203137-dirty #2413 [ 15.674510] Hardware name: STM32 (Device Tree Support) [ 15.679658] [] (unwind_backtrace) from [] (show_stack+0x10/0x14) [ 15.687371] [] (show_stack) from [] (dump_stack+0xc0/0xe0) [ 15.694574] [] (dump_stack) from [] (__warn+0xc8/0xf0) [ 15.701428] [] (__warn) from [] (warn_slowpath_fmt+0x60/0x94) [ 15.708894] [] (warn_slowpath_fmt) from [] (clk_core_disable+0xb0/0xc8) [ 15.717230] [] (clk_core_disable) from [] (clk_core_disable_lock+0x18/0x24) [ 15.725924] [] (clk_core_disable_lock) from [] (stm32_rtc_probe+0x124/0x5e4 [rtc_stm32]) [ 15.735739] [] (stm32_rtc_probe [rtc_stm32]) from [] (platform_drv_probe+0x48/0x98) [ 15.745095] [] (platform_drv_probe) from [] (really_probe+0x1f0/0x458) [ 15.753338] [] (really_probe) from [] (driver_probe_device+0x70/0x1c4) [ 15.761584] [] (driver_probe_device) from [] (device_driver_attach+0x58/0x60) [ 15.770439] [] (device_driver_attach) from [] (__driver_attach+0xcc/0x170) [ 15.779032] [] (__driver_attach) from [] (bus_for_each_dev+0x58/0x7c) [ 15.787191] [] (bus_for_each_dev) from [] (bus_add_driver+0xdc/0x1f8) [ 15.795352] [] (bus_add_driver) from [] (driver_register+0x7c/0x110) [ 15.803425] [] (driver_register) from [] (do_one_initcall+0x70/0x1b8) [ 15.811588] [] (do_one_initcall) from [] (do_init_module+0x58/0x1f8) [ 15.819660] [] (do_init_module) from [] (load_module+0x1e58/0x23c8) [ 15.827646] [] (load_module) from [] (sys_finit_module+0xa0/0xd4) [ 15.835459] [] (sys_finit_module) from [] (__sys_trace_return+0x0/0x20) Signed-off-by: Martin Fuzzey Fixes: 4e64350f42e2 ("rtc: add STM32 RTC driver") Cc: stable@vger.kernel.org Reviewed-by: Nobuhiro Iwamatsu Signed-off-by: Alexandre Belloni Link: https://lore.kernel.org/r/1623087421-19722-1-git-send-email-martin.fuzzey@flowbird.group Signed-off-by: Greg Kroah-Hartman --- drivers/rtc/rtc-stm32.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/rtc/rtc-stm32.c +++ b/drivers/rtc/rtc-stm32.c @@ -636,7 +636,7 @@ static int stm32_rtc_probe(struct platfo */ ret = stm32_rtc_init(pdev, rtc); if (ret) - goto err; + goto err_no_rtc_ck; rtc->irq_alarm = platform_get_irq(pdev, 0); if (rtc->irq_alarm <= 0) { @@ -680,10 +680,12 @@ static int stm32_rtc_probe(struct platfo dev_warn(&pdev->dev, "Date/Time must be initialized\n"); return 0; + err: + clk_disable_unprepare(rtc->rtc_ck); +err_no_rtc_ck: if (rtc->data->has_pclk) clk_disable_unprepare(rtc->pclk); - clk_disable_unprepare(rtc->rtc_ck); regmap_update_bits(rtc->dbp, PWR_CR, PWR_CR_DBP, 0);