From patchwork Tue Jul 18 13:28:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 122044 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1754870vqt; Tue, 18 Jul 2023 06:42:52 -0700 (PDT) X-Google-Smtp-Source: APBJJlFBGAO8D11HUa6aiFBbJKkc0ZTo0sKKIZzJKYZFdGpRQxWyJrxKW93zTYueieieBtv2DDIs X-Received: by 2002:a05:6358:2611:b0:133:84c:183b with SMTP id l17-20020a056358261100b00133084c183bmr14455780rwc.3.1689687772183; Tue, 18 Jul 2023 06:42:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689687772; cv=none; d=google.com; s=arc-20160816; b=e5LfJZHPn2fMLr7uptRrarNsz5mOeXbt/PMGy0YlauaUbR/XH0h88rUOGSK75PKewN YMrYjCVane8IKu5Zr3fNweQGWV06vAWdCZwAXmVrJ7x44Z1tqjvKCJrmPUfVZOPVpfj+ kC6hJYR4cl9iL5hvg/VXs/2Jc3v/nkpQ6gh1mpcwSSWD3ilVefWk2NymjfRyJHeUlX1F 3lkBs3fbV9vjz+FCB5wfLkzFeIPNKn9gTbC7KAofvDNtxPKHIAyy5TAbgC0yMCk6fs59 U9UrfegpiIF9KfRX6SPSH6fUcS9JxipKF61O3C41n8AgrSmEClFgburs/CgQtO2e850o lDKQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=66yQfBbEf4LSWHGnmGu8UhQEO4lpkQHdyWPvynV7A2w=; fh=qB+dzD9KmYgF55NvCYrUoipMcIF+GsnCIsP0yhtxx60=; b=pKlAonFuaZEwBaoQrtA0tZuM1S4+uR0OmvY45Y8l89CkKniaNkkzdljNpRgmhvcJG8 wgw6DRZSg20H2Zpu45QBcHgfN9gmBW9zRu/Zq5om0+VwUihETatiWCuE5Eo2L/5mdFix DZ237DLe4PotlgP/HooVgp8nZy82/C7vtUPfobDfI+HjoCalj2NNbPQDT1vA8Bu5cLTY JJ4l0D6VTP4GKKpMf4+ki+6pyAJXQxZ4S3wOcMmpwRcABrhZRvS9kRfV3htl3gk7nrNa qfevEwGQ19oRblYQ7noDeV/q7UMb2j2Y95yZQWWQ3+iKXWH53hu9/g3K8WsLbn8bLCH0 7/Kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=eb67WvZV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lx9-20020a17090b4b0900b00263d00e1c54si1744289pjb.54.2023.07.18.06.42.38; Tue, 18 Jul 2023 06:42:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=eb67WvZV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232736AbjGRN3v (ORCPT + 99 others); Tue, 18 Jul 2023 09:29:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230170AbjGRN3s (ORCPT ); Tue, 18 Jul 2023 09:29:48 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7397718B; Tue, 18 Jul 2023 06:29:45 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DB5EE61590; Tue, 18 Jul 2023 13:29:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 32200C433C9; Tue, 18 Jul 2023 13:29:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689686984; bh=N3aIV0HWnuZiVpn6L5619rqDbPKqzDyiTGe7jMrlJmg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eb67WvZVbUDKKXvNg8xrcPA1bvauGIrL1qVV2wxncF79Tb8COtj2LDoqR7L9tjFY6 ox4hP48+hR4SyzWRk7MjqsvsmWX8aPBshAsa7540VaDowt9BzUht8qIrKESuFNFbgH ODv2xiya1OBwOPkzId5Mfm2/gFa4jP7CaOIekCtPisbCNwotScXhg+Znf+ktPANDZs /msa63RSXPcU6n21urC30BizHBDpPdJJAjfemLK3u5/Yzuiohp4YKe/9ikpuM0Ga11 d+gzVR1+M0DCe26yooKPt1LP//yVYrjQYVodi0oJstv5ni21JrXcMKHM+RbjQCSTQn 42Dae3aGtZAAQ== Received: from johan by xi.lan with local (Exim 4.96) (envelope-from ) id 1qLkm1-0005by-2T; Tue, 18 Jul 2023 15:29:53 +0200 From: Johan Hovold To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , Michael Turquette , Stephen Boyd , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 1/8] clk: qcom: camcc-sc7180: fix async resume during probe Date: Tue, 18 Jul 2023 15:28:55 +0200 Message-ID: <20230718132902.21430-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230718132902.21430-1-johan+linaro@kernel.org> References: <20230718132902.21430-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771766045019556773 X-GMAIL-MSGID: 1771766045019556773 To make sure that the controller is runtime resumed and its power domain is enabled before accessing its registers during probe, the synchronous runtime PM interface must be used. Fixes: 8d4025943e13 ("clk: qcom: camcc-sc7180: Use runtime PM ops instead of clk ones") Cc: stable@vger.kernel.org # 5.11 Cc: Stephen Boyd Signed-off-by: Johan Hovold --- drivers/clk/qcom/camcc-sc7180.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/qcom/camcc-sc7180.c b/drivers/clk/qcom/camcc-sc7180.c index 8a4ba7a19ed1..6f56bdbf0204 100644 --- a/drivers/clk/qcom/camcc-sc7180.c +++ b/drivers/clk/qcom/camcc-sc7180.c @@ -1664,7 +1664,7 @@ static int cam_cc_sc7180_probe(struct platform_device *pdev) return ret; } - ret = pm_runtime_get(&pdev->dev); + ret = pm_runtime_resume_and_get(&pdev->dev); if (ret) return ret; From patchwork Tue Jul 18 13:28:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 122049 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1761745vqt; Tue, 18 Jul 2023 06:53:59 -0700 (PDT) X-Google-Smtp-Source: APBJJlFxk7zXSwkTUD7DCD13a6A8ArFQ3ryL95PpzCyS+Hf1NtSMal45PsE58sFA794SB605Ec38 X-Received: by 2002:a05:6a20:841a:b0:12c:f124:5b72 with SMTP id c26-20020a056a20841a00b0012cf1245b72mr14060418pzd.43.1689688438768; Tue, 18 Jul 2023 06:53:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689688438; cv=none; d=google.com; s=arc-20160816; b=qqxmws26jDCCbhh4Ef9qCYYDXESj9qE3wd294Ii8Wpk7jJw34MO0ZzLHHn9S1DOZ/v 2ZysHzIvzOxt3zhPUnFDKgMsIQOcKHCvkxmZoSaQ3z4W/8kGVYoW4QFPo5snR62ryPpy RGuSq/IENUoVU337xBP4o7TAjJbNi9hjNizjCtU6UVBW/0Z5Dihi1vk5Ys26lKVAcMIh JqXrf6bKyoFlypE+BNOBxncHa6H6g48fRjR+hsjWWFZVb+hTXfJCz3/Z7k4uKEll1wSL Qxuy8afQz6lM8rCOsm3gxOEV9pO5VvfeFC7e9JRL9qGPd1u2IKQlIhTtLZq/RtQTo54s 81bQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=V+PJyrzto6r3W3x7vWOG4vQHjkStqeta9jaKJqI1ICI=; fh=Jc9iJjOEK7JmNqcNvJeVd2EQbX4tVYZWxFXblqPUGTA=; b=kNj2XCpT0vjrWbNJm+AdVpKjbi4uN8UcWBsZpq+p1uKxoFxjtBTzbhnn2Vh1e7snwR 8PEl+7FUKo36Fmlfa4FDyG9Vy0F0m8zHTxF4VIKiNXO89sV1/sVd9tLnIbRuPd97I++v Qm3DWziIyStokrEzb6B9TC/SgYO6up1BLT4Cb8EZXw2Dge7PF6EWHyxRmD/qVMPKlH1j eUs63naTGWMIN224LcoIB8P93hMtUBXyjg953vZD0xN/GWADaY7hHv1NsN8cXSHtL6/v Str1KezuFdtzNgWdlAyZKVkrxAlNQI3yMATpi/pqcO6+cPjbc5+BLLNryzPTnen+Cykc eAfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nmMvzP14; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e9-20020a63db09000000b0055c95e91f67si1576021pgg.155.2023.07.18.06.53.45; Tue, 18 Jul 2023 06:53:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nmMvzP14; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232786AbjGRNaA (ORCPT + 99 others); Tue, 18 Jul 2023 09:30:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232638AbjGRN3s (ORCPT ); Tue, 18 Jul 2023 09:29:48 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBF7E1A2; Tue, 18 Jul 2023 06:29:45 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D0C5B61585; Tue, 18 Jul 2023 13:29:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F01CC433CA; Tue, 18 Jul 2023 13:29:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689686984; bh=rTV/bK0bQBuIPkpnsjy5F2DIV6tuENtBUl6x1oqCHu8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nmMvzP14UYokUr3JipIPArmssFV0djWEqrE+wmnfNzJrHUJEgb4HblTfpCuDHIqOF 6uV79daQlmFNWI6T1fblY2C5QiPPa0vOMPG7x9KiV4z6xHRrGW42M8BctPEfzJuNwD Xp6U4Y7uF5u+OdsLp+sh03i0MdLSrtLESC0gWhShfpSLvBStlptF42oAKkbWr/zxDC GgSXjevnj4oBJNdyyfAWJYQaaosHj12W12/rbx3xdfVKYyj4zanWuKbmnW+SkDdZ02 03VnDgh6VsjLyXUI+KjdYcgji4BqkH+8nwHcroD53EwaP0hqXgSE3jfZ3QxFjHb5Yi sUcB53jGDucMA== Received: from johan by xi.lan with local (Exim 4.96) (envelope-from ) id 1qLkm1-0005c0-2l; Tue, 18 Jul 2023 15:29:53 +0200 From: Johan Hovold To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , Michael Turquette , Stephen Boyd , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Dmitry Baryshkov Subject: [PATCH 2/8] clk: qcom: dispcc-sm8450: fix runtime PM imbalance on probe errors Date: Tue, 18 Jul 2023 15:28:56 +0200 Message-ID: <20230718132902.21430-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230718132902.21430-1-johan+linaro@kernel.org> References: <20230718132902.21430-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771766744079761997 X-GMAIL-MSGID: 1771766744079761997 Make sure to decrement the runtime PM usage count before returning in case regmap initialisation fails. Fixes: 16fb89f92ec4 ("clk: qcom: Add support for Display Clock Controller on SM8450") Cc: stable@vger.kernel.org # 6.1 Cc: Dmitry Baryshkov Signed-off-by: Johan Hovold --- drivers/clk/qcom/dispcc-sm8450.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/clk/qcom/dispcc-sm8450.c b/drivers/clk/qcom/dispcc-sm8450.c index adbfd30bfc96..84db4ff5485a 100644 --- a/drivers/clk/qcom/dispcc-sm8450.c +++ b/drivers/clk/qcom/dispcc-sm8450.c @@ -1776,8 +1776,10 @@ static int disp_cc_sm8450_probe(struct platform_device *pdev) return ret; regmap = qcom_cc_map(pdev, &disp_cc_sm8450_desc); - if (IS_ERR(regmap)) - return PTR_ERR(regmap); + if (IS_ERR(regmap)) { + ret = PTR_ERR(regmap); + goto err_put_rpm; + } clk_lucid_evo_pll_configure(&disp_cc_pll0, regmap, &disp_cc_pll0_config); clk_lucid_evo_pll_configure(&disp_cc_pll1, regmap, &disp_cc_pll1_config); @@ -1792,9 +1794,16 @@ static int disp_cc_sm8450_probe(struct platform_device *pdev) regmap_update_bits(regmap, 0xe05c, BIT(0), BIT(0)); ret = qcom_cc_really_probe(pdev, &disp_cc_sm8450_desc, regmap); + if (ret) + goto err_put_rpm; pm_runtime_put(&pdev->dev); + return 0; + +err_put_rpm: + pm_runtime_put_sync(&pdev->dev); + return ret; } From patchwork Tue Jul 18 13:28:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 122040 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1750678vqt; Tue, 18 Jul 2023 06:36:13 -0700 (PDT) X-Google-Smtp-Source: APBJJlHB/GU6qsweBbtkKa9Rby2XBBCRbAHWbmNcSQWCK/sSqFwMLhenUjHnXypU1wa7vI8pmvnr X-Received: by 2002:a17:906:3154:b0:98c:2b5c:429b with SMTP id e20-20020a170906315400b0098c2b5c429bmr12473922eje.57.1689687372793; Tue, 18 Jul 2023 06:36:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689687372; cv=none; d=google.com; s=arc-20160816; b=0b6gGev3Jqp/4C4kuLXnBU/Mzw0BpHEQoKovAROqK5hqCI5V7GdQR/e4RJfVKjBLUw 3IsYvbz7ixeloAMddo9GyR87k8E3gDdnNhUiCJBrJ5jkztqrFz8O+QNeeCy0Ke9nAi/l eUIVg4wIGHgpZwGm2MEMykQLTjlm3X+D+nK9cKI8i9MtnuyuVu9pM7+qAmkREfHjMQSw JnTBmnymca6ICFemUVu2z9plMSdjCx0INjMmKAbb2BMqAAcAmKRbgpKoGaEkhcEBfjbE /jQmj5/bDeKdBVyFT8arRxeF+2j6Zo1YwQVmmD9woYTeUUFWts/Di6Qr3BcSDNZ+h6GI 55GA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=pr2JjwqseazMLw4MaG4a5/f1P6tDGh+PqK553ayNT74=; fh=tXqnUGmF/Cy9qtRDhlw63xsA0DzfA6GAINE35X3qlE4=; b=U+IJyLyPmSqkPbpCn1J66PBdAvnAyo3zAbEk73+G6YcQTu79hIHuLy79T3/WPYJBA7 Rmj62tQYI69DZ7t+lFNRIACpxooEZnUYQD4hyAzCXpwbGrs2KYDVsUwujIqmCFhdWZul /rZ02lTgSkEA6kSWcNqrREGcs+KWCwhuuR28kGsXdPN6I6s6UCdpEBumsetJ4qSfwzHw nDr25Gl3KXFTXTPaOJPPZXUNpgl/W/acPOSM/CB6uADrqdyLONjybA43qyyPgj2rG8Dq dQUJzIuSCRGk4Yj3sMTwVBJDusaDbf1uRImqNVvEqACQN5xUTQeOM/MGf246pbrNJKDg 748w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rDNNDLtf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lr10-20020a170906fb8a00b00987b20b66bbsi1201898ejb.711.2023.07.18.06.35.47; Tue, 18 Jul 2023 06:36:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rDNNDLtf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232746AbjGRN3y (ORCPT + 99 others); Tue, 18 Jul 2023 09:29:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232636AbjGRN3r (ORCPT ); Tue, 18 Jul 2023 09:29:47 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4034712F; Tue, 18 Jul 2023 06:29:45 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C0B7561584; Tue, 18 Jul 2023 13:29:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2959DC433C7; Tue, 18 Jul 2023 13:29:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689686984; bh=ybftpD7g3WllyIW9pg3KLmPM1vfHLNTqTCAzw/a2IB4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rDNNDLtfsjpkODkDMAy7Aw2aCb/OduEEX8D/AotWmoOwmXpci++Rg7kWJsOAVSFld h/pGOhveTb22/3EsQvE8mGrZPLZJpFg3uvLxKxUD79TU8TtChN1kS40G/DVBXYBU4Q 3QQSq+E44QErxYPu9Z/fHZTAaW9xl5LCJdyCxui4TOIlLOqdMWuA9qPKzYbxgTarPp wT3+KtaRVb8mOmI/iTNi6BvEBQHlf9pU6lZZQt1u7r6IGzvDNo8GgCqDPePFpEJ5HG 8ofugJ/lF3UTzis/Ruf5MaY176tzDH5Oke24hBukLEJ1wJ63FauHo2E+rO+LUPZax2 c9qcS0tP8EI3w== Received: from johan by xi.lan with local (Exim 4.96) (envelope-from ) id 1qLkm1-0005c2-33; Tue, 18 Jul 2023 15:29:53 +0200 From: Johan Hovold To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , Michael Turquette , Stephen Boyd , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Neil Armstrong Subject: [PATCH 3/8] clk: qcom: dispcc-sm8550: fix runtime PM imbalance on probe errors Date: Tue, 18 Jul 2023 15:28:57 +0200 Message-ID: <20230718132902.21430-4-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230718132902.21430-1-johan+linaro@kernel.org> References: <20230718132902.21430-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771765626089868844 X-GMAIL-MSGID: 1771765626089868844 Make sure to decrement the runtime PM usage count before returning in case regmap initialisation fails. Fixes: 90114ca11476 ("clk: qcom: add SM8550 DISPCC driver") Cc: stable@vger.kernel.org # 6.3 Cc: Neil Armstrong Signed-off-by: Johan Hovold --- drivers/clk/qcom/dispcc-sm8550.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/clk/qcom/dispcc-sm8550.c b/drivers/clk/qcom/dispcc-sm8550.c index 1e5a11081860..b2fae9001ff2 100644 --- a/drivers/clk/qcom/dispcc-sm8550.c +++ b/drivers/clk/qcom/dispcc-sm8550.c @@ -1761,8 +1761,10 @@ static int disp_cc_sm8550_probe(struct platform_device *pdev) return ret; regmap = qcom_cc_map(pdev, &disp_cc_sm8550_desc); - if (IS_ERR(regmap)) - return PTR_ERR(regmap); + if (IS_ERR(regmap)) { + ret = PTR_ERR(regmap); + goto err_put_rpm; + } clk_lucid_evo_pll_configure(&disp_cc_pll0, regmap, &disp_cc_pll0_config); clk_lucid_evo_pll_configure(&disp_cc_pll1, regmap, &disp_cc_pll1_config); @@ -1777,9 +1779,16 @@ static int disp_cc_sm8550_probe(struct platform_device *pdev) regmap_update_bits(regmap, 0xe054, BIT(0), BIT(0)); ret = qcom_cc_really_probe(pdev, &disp_cc_sm8550_desc, regmap); + if (ret) + goto err_put_rpm; pm_runtime_put(&pdev->dev); + return 0; + +err_put_rpm: + pm_runtime_put_sync(&pdev->dev); + return ret; } From patchwork Tue Jul 18 13:28:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 122052 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1764356vqt; Tue, 18 Jul 2023 06:58:29 -0700 (PDT) X-Google-Smtp-Source: APBJJlHHuEJqZ8B55Q8zDn2ZGwTcqIDIbVTBCHjRsolMNmsEdKlhu2WwJ8+xBFbJJFumibVhLzAV X-Received: by 2002:a17:90b:1001:b0:25c:1138:d97c with SMTP id gm1-20020a17090b100100b0025c1138d97cmr13211802pjb.24.1689688709264; Tue, 18 Jul 2023 06:58:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689688709; cv=none; d=google.com; s=arc-20160816; b=H9oyMZ9dEfDTbfduBK9rdOFnss5mxZ8tkOluOvrpXPyr1ovpjdUprmIpiFhAkb5Mbq K+NdUl+av2+E7bFlWw97VOuBXdcO4GSYuY61twBYeOX4rwvOzJndoYW1Ylsh1ujqCxd2 mc4oqjG7arpmJB3hFvyZkinN2J4GLMJTYfsTToiQr+znlnK2Okv9+YuYXmuWIIOSBV1N /pY90j1xXU3R3l+ueukCmD4qJhCeiYcDCXiT9qTVChoJsCqbLvCqZtTPdYmt52zb8cvk Vd0YeJIpyw6cyTQq+qVIG3Bpmc7alb+ohtaqKS7eCVwwnQBIMLfL8nzUcinu1tuleobq e3bw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=BFtli9b62dQ+beegifci4xFvJojSnWf+rMlBOTc0dBk=; fh=7kBJBtNcZFXuonY74qoiyYLygacMPxugZs/wayStSm0=; b=YfE7WqX08OE+kt0vMElRLAc88t5SeTSS9wFLoyXhd6TBOH/jXvjZ/Owz/uO3uxnIUV 2jPTHys8jDjbP+MqlQ5dEdxqRgW2sC6K10owN+9bsEuTHiynWw9dP+XXdmJ+wj53aSug 2kN+kc4kGSmGfdLDTM5gbEvo6MtA4h9u4Kq1tVMWg+XjSD3hcGNpCOqlYASHBUsT5ylj 8hjEb2RmbdoMzpmkY1agUvBVM2AuRbrEZmL9wWeTKEKiSnjcnH22rFenqcXVlOJ5mBti 09zHGLAWUutT2evNNqnoU2lRwDGODHr5KqFGAXxkuvoHHj3ZaHJ8ZM4tIuAtvwxzD+vd RQUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YmIIeasD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mh15-20020a17090b4acf00b00260f28b14e4si7894389pjb.4.2023.07.18.06.58.15; Tue, 18 Jul 2023 06:58:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YmIIeasD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232819AbjGRNaM (ORCPT + 99 others); Tue, 18 Jul 2023 09:30:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232753AbjGRN3z (ORCPT ); Tue, 18 Jul 2023 09:29:55 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C227124; Tue, 18 Jul 2023 06:29:48 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5BDAC6158D; Tue, 18 Jul 2023 13:29:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5ACDCC433BA; Tue, 18 Jul 2023 13:29:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689686984; bh=YujBf+tSBimSZNEfZhDQx4wRVWWIF1I4fAuUh7MYhGU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YmIIeasD+VaC2Xfn+NQv1hEgjLN+EocrpSUkbost1LU6y29N7ZAZig7/5AukCFMkA RXcIis9R8tIbzePesSTgpwH039Mk7WAoW7hL7ZWg/N26/tDkP/oIQMHHQ4I88Zje21 NrkuxsG8wplGmK06mjd1s0+C3WyrkEiQOVE9iFWcGABjL8Kao/mxfczHs562zcPc0v WH8kXwXFEBisOl//Rch6Ht83H9lIRJdmd8c3soTyHRJPOzheqPtIRl0+9EAqXnAxui kH1qbwb5SeWqxGTG+MJCzUQQYfjFDHowtyPaOJ5f7621J23QjI9GuWsKlRy3Vb2uMg 1DcMSarGXWHgw== Received: from johan by xi.lan with local (Exim 4.96) (envelope-from ) id 1qLkm2-0005c5-06; Tue, 18 Jul 2023 15:29:54 +0200 From: Johan Hovold To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , Michael Turquette , Stephen Boyd , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 4/8] clk: qcom: gcc-sc8280xp: fix runtime PM imbalance on probe errors Date: Tue, 18 Jul 2023 15:28:58 +0200 Message-ID: <20230718132902.21430-5-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230718132902.21430-1-johan+linaro@kernel.org> References: <20230718132902.21430-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771767028230536122 X-GMAIL-MSGID: 1771767028230536122 Make sure to decrement the runtime PM usage count before returning in case RCG dynamic frequency switch initialisation fails. Fixes: 2a541abd9837 ("clk: qcom: gcc-sc8280xp: Add runtime PM") Cc: Konrad Dybcio Signed-off-by: Johan Hovold --- drivers/clk/qcom/gcc-sc8280xp.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/clk/qcom/gcc-sc8280xp.c b/drivers/clk/qcom/gcc-sc8280xp.c index 1fb6ffac730c..ac6f8c0c1ccb 100644 --- a/drivers/clk/qcom/gcc-sc8280xp.c +++ b/drivers/clk/qcom/gcc-sc8280xp.c @@ -7539,8 +7539,8 @@ static int gcc_sc8280xp_probe(struct platform_device *pdev) regmap = qcom_cc_map(pdev, &gcc_sc8280xp_desc); if (IS_ERR(regmap)) { - pm_runtime_put(&pdev->dev); - return PTR_ERR(regmap); + ret = PTR_ERR(regmap); + goto err_put_rpm; } /* @@ -7561,11 +7561,19 @@ static int gcc_sc8280xp_probe(struct platform_device *pdev) ret = qcom_cc_register_rcg_dfs(regmap, gcc_dfs_clocks, ARRAY_SIZE(gcc_dfs_clocks)); if (ret) - return ret; + goto err_put_rpm; ret = qcom_cc_really_probe(pdev, &gcc_sc8280xp_desc, regmap); + if (ret) + goto err_put_rpm; + pm_runtime_put(&pdev->dev); + return 0; + +err_put_rpm: + pm_runtime_put_sync(&pdev->dev); + return ret; } From patchwork Tue Jul 18 13:28:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 122043 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1754269vqt; Tue, 18 Jul 2023 06:41:51 -0700 (PDT) X-Google-Smtp-Source: APBJJlHBJG8rYMA5MAT3+5oa8UtAEYkGPg5dUBydAmwCQlK7VyLC6S+cuZUIar3aedvVjiQE97D2 X-Received: by 2002:a05:6a00:1492:b0:682:140c:245b with SMTP id v18-20020a056a00149200b00682140c245bmr16133485pfu.5.1689687711309; Tue, 18 Jul 2023 06:41:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689687711; cv=none; d=google.com; s=arc-20160816; b=NBOEwTbK4Ixw6LD2zAPe/bshV9QWkER253ujl3DmDF2ytITOmqwmcHATRcmsOgJUk3 bmrmnjXq4kc/U1w9mJ7q0jEcSV/c/UFmKQn1AR3FYhWPdmiwCfDurE7x6ZvQc/hm0Ko7 Az7HlCTUftQjs4REDZsdQwttF//WMh22DD+bNcGpbUhAkCnKz9U86EsKL1ft+yaXOw/p HIQuVmT0UkdtfIQ8C5IJ2N+JFcoHMWPMNrzqZq2nSTL23DeiUCliw+aEXQK85GlJQnna XWEIGYFgNmwj+puU80Pd0pqRt6BSy0ImEeepypzVqSxC7f63qB9kMx2CaTjVFB0doN6X sK/g== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ZlCJviNLYG6hlWtZAzbNv2qr8SWyzmlQgBF7S4TsFQk=; fh=i8hZpya5OQPc1IlyEhTYLOfdvrvG1EVovjAmi07tuaY=; b=aEYfQAoxv9BuTHpFGSftpwaaTcD0KVW/HoUo3E32KAfLE2LXgaKrlItRxRbUENGjkv wb9cbY9uRHjJQSCmLosudzXhFwB8ECIHaANlX0v9e7PE37GvTGr/wHF5uDRb1MUs8KkK h+EcgE4qMdBAjYKdDFUsBqcmvaLnLIJngkBt+Ht4nitq3qCTc1XMH773sp9xLvrLL5BJ +G/LjBFPqK7pzJdujn1lb1UIHYrfwYb/uMk6ApjutUCUe0SzSQxWT+bFb/X0LiBqYBSE wB9yODBWN8i366LbmOpXiGDJYS7MhjcUCc/JNPDaNs9Rl96vdD+Pg9EkYrwruYEzwWra a6IA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QST1OR2s; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m18-20020a056a00081200b0068283238326si1624967pfk.344.2023.07.18.06.41.38; Tue, 18 Jul 2023 06:41:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QST1OR2s; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232748AbjGRN35 (ORCPT + 99 others); Tue, 18 Jul 2023 09:29:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231962AbjGRN3s (ORCPT ); Tue, 18 Jul 2023 09:29:48 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8D0D19F; Tue, 18 Jul 2023 06:29:45 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 03BC361591; Tue, 18 Jul 2023 13:29:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 59EBEC433B9; Tue, 18 Jul 2023 13:29:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689686984; bh=ecVYnAz0cWZ3OaKV2gjx4miXZSzU9O9arS/8lcFdJBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QST1OR2s6blNS/2Z6esD3ottRlgKKnvm6dcfBikoR9Vjx+4tINQvUT60oAcSE/YmJ R3c3XF6/Ie0aFXBIk9b2mGFsYdGWWzQEdrU343AGJPRxW0NdqxI9Eyxv+u8TtETtCb GKNvs2S3o0nRl9b6oOqaBso9mwIHsOvPtnCBl5JStVbo4BmY0yQtM1LSbSjdz/kpDE mTvavJIpgzpRo1RBqHPqVaj5UIXsXqa4RF64c/xwOhdEeLqUOvA2WpGolCywQ3Jad/ QfpY9lS5LhFq0WNFpQGPAuXbf3iqB3lkKEVjxvRFlWJw8KA17p5fjT+z/x9/mUFzGP NSxTPRuuBE9pQ== Received: from johan by xi.lan with local (Exim 4.96) (envelope-from ) id 1qLkm2-0005c8-0K; Tue, 18 Jul 2023 15:29:54 +0200 From: Johan Hovold To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , Michael Turquette , Stephen Boyd , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Taniya Das Subject: [PATCH 5/8] clk: qcom: lpasscc-sc7280: fix missing resume during probe Date: Tue, 18 Jul 2023 15:28:59 +0200 Message-ID: <20230718132902.21430-6-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230718132902.21430-1-johan+linaro@kernel.org> References: <20230718132902.21430-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771765981752445303 X-GMAIL-MSGID: 1771765981752445303 Drivers that enable runtime PM must make sure that the controller is runtime resumed before accessing its registers to prevent the power domain from being disabled. Fixes: 4ab43d171181 ("clk: qcom: Add lpass clock controller driver for SC7280") Cc: stable@vger.kernel.org # 5.16 Cc: Taniya Das Signed-off-by: Johan Hovold --- drivers/clk/qcom/lpasscc-sc7280.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/clk/qcom/lpasscc-sc7280.c b/drivers/clk/qcom/lpasscc-sc7280.c index 0df2b29e95e3..e6b815aec46a 100644 --- a/drivers/clk/qcom/lpasscc-sc7280.c +++ b/drivers/clk/qcom/lpasscc-sc7280.c @@ -118,9 +118,13 @@ static int lpass_cc_sc7280_probe(struct platform_device *pdev) ret = pm_clk_add(&pdev->dev, "iface"); if (ret < 0) { dev_err(&pdev->dev, "failed to acquire iface clock\n"); - goto destroy_pm_clk; + goto err_destroy_pm_clk; } + ret = pm_runtime_resume_and_get(&pdev->dev); + if (ret) + goto err_destroy_pm_clk; + if (!of_property_read_bool(pdev->dev.of_node, "qcom,adsp-pil-mode")) { lpass_regmap_config.name = "qdsp6ss"; lpass_regmap_config.max_register = 0x3f; @@ -128,7 +132,7 @@ static int lpass_cc_sc7280_probe(struct platform_device *pdev) ret = qcom_cc_probe_by_index(pdev, 0, desc); if (ret) - goto destroy_pm_clk; + goto err_put_rpm; } lpass_regmap_config.name = "top_cc"; @@ -137,11 +141,15 @@ static int lpass_cc_sc7280_probe(struct platform_device *pdev) ret = qcom_cc_probe_by_index(pdev, 1, desc); if (ret) - goto destroy_pm_clk; + goto err_put_rpm; + + pm_runtime_put(&pdev->dev); return 0; -destroy_pm_clk: +err_put_rpm: + pm_runtime_put_sync(&pdev->dev); +err_destroy_pm_clk: pm_clk_destroy(&pdev->dev); return ret; From patchwork Tue Jul 18 13:29:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 122041 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1752215vqt; Tue, 18 Jul 2023 06:38:36 -0700 (PDT) X-Google-Smtp-Source: APBJJlHpoBZsfB7bA1QrrWrhfBuO57K6pfE25XwcjwBhisI5p0jwVv0aquKRSJy94hHBa6U38TXX X-Received: by 2002:a50:ed0c:0:b0:51d:e3d2:f5eb with SMTP id j12-20020a50ed0c000000b0051de3d2f5ebmr14832276eds.5.1689687516542; Tue, 18 Jul 2023 06:38:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689687516; cv=none; d=google.com; s=arc-20160816; b=r0j4B79Z9b+8pGlGtpMosbFZQw6+Zu2Nx8003ON5DzglnQ5yBXcxFJSkSdok6LHrkN SK9J5SerKDWHiT0ZU1TO1xWCxkcqh9l1LXkKdXa4teVuT6Tylqw+eQDEGMB0ww7QUee9 v+5f6pLUB8Sn+XNsGdz2VwGPq38XN9ODn5AX9Uck3oxVH3GEWEn6BnuEZ+KltlofbzHh 9o5adOdpUCmW6fkFB2Ehr0TiKJQImKsEnm6tDCTK+VhikX97voueaDIvT+h2ru2ATasN Ybc2XjXrwxY0Tmf24IGaLcGF8Nl+Hw2ubFH+9Am+9kmFoUOY58wce89yC6kANAsLJQHJ tMgA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4Qe/jGOGJfPAfppzBk43tZHzVy6EV05uzv9g1QV0y2I=; fh=qB+dzD9KmYgF55NvCYrUoipMcIF+GsnCIsP0yhtxx60=; b=SCXXfv0DEgIN1PtilxKR08PcDZcr5Mb7X19zpl6pqGRY9ivCrvi2jrGPae/B8/Oeic oHh6d1SwjdzpLwUo6c92hZa2uzDL3g8fctug+9srxk9jXVxAag8UWW/upuA/yg/ZtBHu FxDx8VJyuX135KwVaJmRqc72Oc2Ac8xmi3Cj9VW+BIz8kxwZ+bKNetXKdXo3mN5y+G0a hBSi75ZXGuXsBgExSATJ431sNevhkGEbHxzzXUc+SH/KloNCB4YuUQbDsaSGZy8yyL5v HFVARQqQ3FgMwDuAzQp/bRZuZ7WOUfNDPzIJyWscOX9UVWzplQGHg8eP78seJELkVSRD VwYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ex9idKA8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z26-20020aa7c65a000000b0051dff4f3c97si1277748edr.132.2023.07.18.06.37.44; Tue, 18 Jul 2023 06:38:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ex9idKA8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232679AbjGRNaD (ORCPT + 99 others); Tue, 18 Jul 2023 09:30:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232743AbjGRN3y (ORCPT ); Tue, 18 Jul 2023 09:29:54 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61B6211B; Tue, 18 Jul 2023 06:29:48 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5B71761587; Tue, 18 Jul 2023 13:29:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6512BC433BF; Tue, 18 Jul 2023 13:29:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689686984; bh=AMYMGf2yRrBIwpwEoaP+5FFAHqopIdp6a4vZOTfLp5I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ex9idKA8p5sN2VEyTfwNb61UYDj5uVpAcQdb5smc0jpORoL4EMU14KRkF5SAkOcpX G6C10iuoIbnQ4FECss5qDWmdsPQ7qXWEmoR03qF6q/GqGuVy7RBujAyd2FhX7+VFlj /U/miA14VIfLyY/jsMwzdVVmNcYSHCUOByy7EqKDG9Fz4N2D82Lajxbqsj1dyYU+9i ElMcUbcJ6BzpBINyqGXHWb7/RbUTu/fLHJ/c8u/qd5Z6sG6kQGy00mzdNJkDYS7hPv 7GSpqNt+4KsQ3PKNbaQ4gZqzx79l96f+D3i4bQ1Kf6JYBC16a5VAttZbPN6NTupcr+ vwja/NYeC0HfQ== Received: from johan by xi.lan with local (Exim 4.96) (envelope-from ) id 1qLkm2-0005cB-0a; Tue, 18 Jul 2023 15:29:54 +0200 From: Johan Hovold To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , Michael Turquette , Stephen Boyd , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 6/8] clk: qcom: q6sstop-qcs404: fix missing resume during probe Date: Tue, 18 Jul 2023 15:29:00 +0200 Message-ID: <20230718132902.21430-7-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230718132902.21430-1-johan+linaro@kernel.org> References: <20230718132902.21430-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771765777446721053 X-GMAIL-MSGID: 1771765777446721053 Drivers that enable runtime PM must make sure that the controller is runtime resumed before accessing its registers to prevent the power domain from being disabled. Fixes: 6cdef2738db0 ("clk: qcom: Add Q6SSTOP clock controller for QCS404") Cc: stable@vger.kernel.org # 5.5 Signed-off-by: Johan Hovold --- drivers/clk/qcom/q6sstop-qcs404.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/clk/qcom/q6sstop-qcs404.c b/drivers/clk/qcom/q6sstop-qcs404.c index 780074e05841..26e2d63614ac 100644 --- a/drivers/clk/qcom/q6sstop-qcs404.c +++ b/drivers/clk/qcom/q6sstop-qcs404.c @@ -174,21 +174,32 @@ static int q6sstopcc_qcs404_probe(struct platform_device *pdev) return ret; } + ret = pm_runtime_resume_and_get(&pdev->dev); + if (ret) + return ret; + q6sstop_regmap_config.name = "q6sstop_tcsr"; desc = &tcsr_qcs404_desc; ret = qcom_cc_probe_by_index(pdev, 1, desc); if (ret) - return ret; + goto err_put_rpm; q6sstop_regmap_config.name = "q6sstop_cc"; desc = &q6sstop_qcs404_desc; ret = qcom_cc_probe_by_index(pdev, 0, desc); if (ret) - return ret; + goto err_put_rpm; + + pm_runtime_put(&pdev->dev); return 0; + +err_put_rpm: + pm_runtime_put_sync(&pdev->dev); + + return ret; } static const struct dev_pm_ops q6sstopcc_pm_ops = { From patchwork Tue Jul 18 13:29:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 122046 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1756793vqt; Tue, 18 Jul 2023 06:45:51 -0700 (PDT) X-Google-Smtp-Source: APBJJlFSf0N7WXP9QQ3BC7x4y4WIJir4g1Z6ynDrtBZaFxwYahLGQuNSgmRPONrZ9LNNCN5VQ1G9 X-Received: by 2002:a17:90a:ea05:b0:263:62ae:37aa with SMTP id w5-20020a17090aea0500b0026362ae37aamr14452821pjy.47.1689687950630; Tue, 18 Jul 2023 06:45:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689687950; cv=none; d=google.com; s=arc-20160816; b=gkAbZBOjieyDhJr+vtj6nc8BA3ZL0gdeL2O6s9cJEUUWoK+yw2KNuIcaz1H1W4lija tRe0wxt5xXQVC+2lvuJEwlMMJyW3u2S/t2OPbO1BQ33IMiSsAKZ8ptUyjIsdaxNeeohB V253Ek/rrVfwHlnVq3Fl7kmI0FIlDV9NMV8lqPJXpMNstQrUdX/a1/4vx0hDBCsdHL2J rcvKEEKpvorWMsDbNzfD5DG96yuMChekfivuFP38keu9dT0kLVQ+zDBd57ZzN8RBtyb0 IvfeLC08V4Ke5uvYTWoT71pZYe6+fIJnOKkUpjYryfd9jK2TszZXmWkvN5qX2Xl2it1L ylUQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=AB7xjKhfMpCui5NEpKjFPZVlkOAUCt9ISTrK/b9hC1o=; fh=i8hZpya5OQPc1IlyEhTYLOfdvrvG1EVovjAmi07tuaY=; b=N5iLw9BzAbAQ+/yC3/wfITi+60FXqzIyrPSDhXAN2zAAo5AeqMcM9siI/KwN0TOlov tyU0XaBhnVoxcnVs/lkUO+7oqCvd/K1WwzxFb6KlIMWJh7t2zraCPSf1Hh81lsP0WAPL JvV30Xq95MoUeWpQQ+WHwhzhF/nNsI5gxzd+OnUMYkPxKkpnRm0qLjG+tkUsQIBgnUPW lV6P1vcPLPvpOs4l7jW8Qs0wjCzbo20L4hU4YO7xAyabzqYPugWGYwjO4POYZEEUEUtT enpHlXjghzy+WD1q3FOLanzceeZ7Sv1BIe/rtt3d3V3HlDvNCEjD2BHJ/Nh/Hhvz2FdW e4Fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YfHQkFwQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id in17-20020a17090b439100b002634d2ab01bsi7437270pjb.130.2023.07.18.06.45.37; Tue, 18 Jul 2023 06:45:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YfHQkFwQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232799AbjGRNaI (ORCPT + 99 others); Tue, 18 Jul 2023 09:30:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232755AbjGRN3z (ORCPT ); Tue, 18 Jul 2023 09:29:55 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7EFDF189; Tue, 18 Jul 2023 06:29:48 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6C77061597; Tue, 18 Jul 2023 13:29:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 72DBEC433BC; Tue, 18 Jul 2023 13:29:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689686984; bh=TWOyAxfNhR4md46HxCIq50axByCSHW3XcE6ta0uMwtg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YfHQkFwQfi8YLq8YSNNy7VDMP3T+yg5w9ohrxjGP//LfylrsN+lthlU2Hh2P1KjMA BANpdbpwXY5bLliAYJZm+8duVGx6quRWFzEOFNnxUqkxI/CCey3sCpsolTNo9bxxNr b+fLTE3fb9wbqs53vDk7Dp+UFSCeyLBqmwm6MH2sarUsP+iW6QKxa1F0hWASFYW1ZL Gq08MG0/Oqfc4vuISwo5IFyoxBoJTZwKJ7QvjWlQn2U0tBpSyWFRNxy7kbqBxtgoI1 qrFjHyqEL/R/qb7ps+OtKjkKRXF3/FalLIkFl+ZPlejFHgBSRbtr1jbBO0Py7pxbCZ qckg15REayTWg== Received: from johan by xi.lan with local (Exim 4.96) (envelope-from ) id 1qLkm2-0005cF-0r; Tue, 18 Jul 2023 15:29:54 +0200 From: Johan Hovold To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , Michael Turquette , Stephen Boyd , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Taniya Das Subject: [PATCH 7/8] clk: qcom: mss-sc7180: fix missing resume during probe Date: Tue, 18 Jul 2023 15:29:01 +0200 Message-ID: <20230718132902.21430-8-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230718132902.21430-1-johan+linaro@kernel.org> References: <20230718132902.21430-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771766232399284466 X-GMAIL-MSGID: 1771766232399284466 Drivers that enable runtime PM must make sure that the controller is runtime resumed before accessing its registers to prevent the power domain from being disabled. Fixes: 8def929c4097 ("clk: qcom: Add modem clock controller driver for SC7180") Cc: stable@vger.kernel.org # 5.7 Cc: Taniya Das Signed-off-by: Johan Hovold --- drivers/clk/qcom/mss-sc7180.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/clk/qcom/mss-sc7180.c b/drivers/clk/qcom/mss-sc7180.c index 5a1407440662..d106bc65470e 100644 --- a/drivers/clk/qcom/mss-sc7180.c +++ b/drivers/clk/qcom/mss-sc7180.c @@ -87,11 +87,22 @@ static int mss_sc7180_probe(struct platform_device *pdev) return ret; } + ret = pm_runtime_resume_and_get(&pdev->dev); + if (ret) + return ret; + ret = qcom_cc_probe(pdev, &mss_sc7180_desc); if (ret < 0) - return ret; + goto err_put_rpm; + + pm_runtime_put(&pdev->dev); return 0; + +err_put_rpm: + pm_runtime_put_sync(&pdev->dev); + + return ret; } static const struct dev_pm_ops mss_sc7180_pm_ops = { From patchwork Tue Jul 18 13:29:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 122042 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1752544vqt; Tue, 18 Jul 2023 06:39:09 -0700 (PDT) X-Google-Smtp-Source: APBJJlFOvwS5u6QyjG6Vs023bpkv/a+yk1CfgtS6E/Zq4wJ2ZYkJc5AMPzX5YkJtrq4rwOougkw4 X-Received: by 2002:a17:906:147:b0:997:eab5:f1c3 with SMTP id 7-20020a170906014700b00997eab5f1c3mr84659ejh.73.1689687549364; Tue, 18 Jul 2023 06:39:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689687549; cv=none; d=google.com; s=arc-20160816; b=FLsgnP6NaVF3WUQ0OSJsKhkbFL3YOGdzdmoZSj0OCg2wCamtWrAifsKtDaooNBSKNL XwcxROiX3Tw8Os0j3YaGEg7kudIBk5yyxezGMwQN4WSKfSlk95ccD+FbK9b53nHmYKCO enmqW3WcASO56y/bZfVfqsM//Qp1tie+CMEZL9/7/mNYh08ea/Oz2YvT/l4lKclypiDk RZTiF7pRmMAtn0V/kZ5kPEJ4vuQ3ljfGAK270qTjjYbcIOMQsspA7Cg6UT49zYzu9uNU K9cP08PXRaZO+uEUBLNryodDS5lz3gfSTmjzGFOtxYtSWXPnGm2VtBM8QX/MauPFQMxY DZvg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lD6vkiKT98KOOpjhDxF80m7fNhKzL7G0lf9r/SYfhY4=; fh=qB+dzD9KmYgF55NvCYrUoipMcIF+GsnCIsP0yhtxx60=; b=spKuQhDwSyxBcHOUqLGXWUAWgOkOjrC1QZTCJqTVFEMs8SJo47q83eVozsRApK6qG/ 1ic5vrNbPeRRjn2FSkw0QeEJQ5o8y+PXDTOQkz9zwlphWzAupriTxXnSOXIVjePbC/8Q q9BUF1UGwD7//FeR5Lc+5oLx+UcyiCupFFEv7Lya1X3D3cKF6sFkONDe37yngeDg3Y3t jHKspRCrmWbyM+C2JzS4gDPekjaP3vU+9Y3Rh7man4BWNVCtWBaPVBYVJwOIIxNsXsc2 akhrPA53YKx4ISI6OytAs9AzzAU3o7w+2r+SbTd/n9WygCMtGoMNSdJivzMEtTgKlIAl ErSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IPt1QeLu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g10-20020a170906868a00b00992dcae7002si1108167ejx.365.2023.07.18.06.38.45; Tue, 18 Jul 2023 06:39:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IPt1QeLu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232804AbjGRNaK (ORCPT + 99 others); Tue, 18 Jul 2023 09:30:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232738AbjGRN3z (ORCPT ); Tue, 18 Jul 2023 09:29:55 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D317126; Tue, 18 Jul 2023 06:29:48 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6CA156159B; Tue, 18 Jul 2023 13:29:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 973BBC611A4; Tue, 18 Jul 2023 13:29:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689686984; bh=JucSCYtIeP5pXopgua1lk2Xc676zWfRI0jmWjsoIoAA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IPt1QeLuHYln0zGpgeG6CKT9HWvuhbmHwGTpIXkbmij14VLQi1bThBx7Nxu9eUJ/m mpJINpbRgLUzsCnYs0bKDViLnSDhHGidlDtm0L0A6qaJ5j2eQIw9jy/i6wvUrCpoCE mfa59OWFZSxu2Rvv8urGx73xU+GNT1Y/O0LkIhRKbQrp5NfmmToXfRu4WWpiTEQJNr Cu/kQXq9n9lyf5eHWp+lTLigA4QfxD56UUeD2J26IFADSUZc+ON5uo0C4v6AzBVuqi 8L6AD2i3TY9oZWoECc2lyVLnQyQoMHdP+fvwaXFhv6eWcfT2I8Fd7kRmEhxopTz9jQ s171x5qIZUNyg== Received: from johan by xi.lan with local (Exim 4.96) (envelope-from ) id 1qLkm2-0005cH-1A; Tue, 18 Jul 2023 15:29:54 +0200 From: Johan Hovold To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , Michael Turquette , Stephen Boyd , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 8/8] clk: qcom: turingcc-qcs404: fix missing resume during probe Date: Tue, 18 Jul 2023 15:29:02 +0200 Message-ID: <20230718132902.21430-9-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230718132902.21430-1-johan+linaro@kernel.org> References: <20230718132902.21430-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771765811680576957 X-GMAIL-MSGID: 1771765811680576957 Drivers that enable runtime PM must make sure that the controller is runtime resumed before accessing its registers to prevent the power domain from being disabled. Fixes: 892df0191b29 ("clk: qcom: Add QCS404 TuringCC") Cc: stable@vger.kernel.org # 5.2 Cc: Bjorn Andersson Signed-off-by: Johan Hovold --- drivers/clk/qcom/turingcc-qcs404.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/clk/qcom/turingcc-qcs404.c b/drivers/clk/qcom/turingcc-qcs404.c index 43184459228f..2cd288d6c3e4 100644 --- a/drivers/clk/qcom/turingcc-qcs404.c +++ b/drivers/clk/qcom/turingcc-qcs404.c @@ -125,11 +125,22 @@ static int turingcc_probe(struct platform_device *pdev) return ret; } + ret = pm_runtime_resume_and_get(&pdev->dev); + if (ret) + return ret; + ret = qcom_cc_probe(pdev, &turingcc_desc); if (ret < 0) - return ret; + goto err_put_rpm; + + pm_runtime_put(&pdev->dev); return 0; + +err_put_rpm: + pm_runtime_put_sync(&pdev->dev); + + return ret; } static const struct dev_pm_ops turingcc_pm_ops = {