From nobody Sun Apr 19 17:03:38 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA259C43334 for ; Tue, 28 Jun 2022 20:19:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232089AbiF1UTK (ORCPT ); Tue, 28 Jun 2022 16:19:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230374AbiF1USv (ORCPT ); Tue, 28 Jun 2022 16:18:51 -0400 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C90473F30E for ; Tue, 28 Jun 2022 13:14:24 -0700 (PDT) Received: by mail-pj1-x1032.google.com with SMTP id dw10-20020a17090b094a00b001ed00a16eb4so13838137pjb.2 for ; Tue, 28 Jun 2022 13:14:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8HhkFJTHSSr3R0oiNgI6BacFItQ/FKV35zn7bmlHUKo=; b=J0oSDySY3UqtJqhuEo1Xld1Soc984phZw/4/8eC9M2p6w6WAGr9Tvy/hF0slekzVGF YsyHoZQjOuIKyCR9oH5YGnkPrjLEc22nzKNt3HdVrEVoudUbSL++sn86cIAoXCMA8Xiu 6R/1gOvHeTmTj5Uu9n9jCEtm1NCGEA5+WAMGA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8HhkFJTHSSr3R0oiNgI6BacFItQ/FKV35zn7bmlHUKo=; b=446Rc1qmtm2jjeeiTiXtismNyG05x1w0+4L6LCXrh1vJwpZ8G8cOp+1kBb9DPyjeUW gF/hF9on7Sph5QTs3Os9q3t9etuKtTXwg0mWlYr26ev7IPWwZ5FJkPzKwcWXDkUmIKW8 jiej4niTXyTaOTpEY1QSzGk5EDgBymOYOh7Wr3mfnAKWaa7hqw5u10TppA7agykjf2C6 YDPGhtl7X0UaB1ty0lbdHCoqraaeuv8dxR1BBXVljhVjvtt9TbmvwboFfsQXVUqLQUtN m6ziQunevQ3Zr21r1WCf5W4qV4IWoCqlYLkhtO5/3oerlkoGsacL45TmpXOK55dMyZpm tL5w== X-Gm-Message-State: AJIora9Co0W95qe09IlhNBqsWC7P3Oq4DcvF7Xi4TBqJj2bbcGfrk9vX YJKQ+LYdMirXozl5455Cfjyp5g== X-Google-Smtp-Source: AGRyM1vdR3YIxt84n8zlF2YDbKJHbQSrk2Zvn3v81QkKLTwKIXK3X+r8UqdrdPpozX6Hk4xIRyqKWQ== X-Received: by 2002:a17:90a:d583:b0:1ee:d9c4:9c50 with SMTP id v3-20020a17090ad58300b001eed9c49c50mr1461432pju.226.1656447263975; Tue, 28 Jun 2022 13:14:23 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:201:b857:8c81:6b4c:9c03]) by smtp.gmail.com with ESMTPSA id t5-20020a1709027fc500b0016b83990aabsm3958109plb.302.2022.06.28.13.13.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jun 2022 13:14:00 -0700 (PDT) From: Stephen Boyd To: Michael Turquette , Stephen Boyd , Bjorn Andersson Cc: linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, patches@lists.linux.dev, linux-arm-msm@vger.kernel.org, Taniya Das , Mike Tipton Subject: [PATCH/RFC] clk: qcom: rpmh: Block system suspend if XO is enabled Date: Tue, 28 Jun 2022 13:13:40 -0700 Message-Id: <20220628201340.3981860-1-swboyd@chromium.org> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Tracking down what RPMh resource is blocking XO shutdown in suspend is hard. Largely because we need external debug tools to dump the RPMh internal state to figure out what resource is enabled. Instead of doing that, let's just block system wide suspend in the kernel if the RPMh XO resource is enabled by something in the kernel. This will help us narrow down XO shutdown failures to the XO clk, and not something else like an interconnect or regulator RPMh resource. I'm sending this as an RFC because it breaks suspend for me on Trogdor boards. I found out that the XO resource is always enabled on these devices because the audio driver leaves an audio clk always on. This means that the XO resource must not be used to determine if XO shutdown is achievable, or we're leaving power savings on the table. Cc: Taniya Das Cc: Mike Tipton Signed-off-by: Stephen Boyd Reviewed-by: Bjorn Andersson --- Please don't apply. It will break suspend on Trogdor boards. drivers/clk/qcom/clk-rpmh.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c index aed907982344..ba0e0e4b9cf2 100644 --- a/drivers/clk/qcom/clk-rpmh.c +++ b/drivers/clk/qcom/clk-rpmh.c @@ -70,6 +70,14 @@ struct clk_rpmh_desc { =20 static DEFINE_MUTEX(rpmh_clk_lock); =20 +/* XO shutdown will fail if XO is enabled across suspend */ +static int clk_rpmh_suspend(struct device *dev) +{ + struct clk_rpmh *xo =3D dev_get_drvdata(dev); + + return xo && xo->state ? -EBUSY : 0; +} + #define __DEFINE_CLK_RPMH(_platform, _name, _name_active, _res_name, \ _res_en_offset, _res_on, _div) \ static struct clk_rpmh _platform##_##_name_active; \ @@ -690,6 +698,10 @@ static int clk_rpmh_probe(struct platform_device *pdev) dev_err(&pdev->dev, "failed to register %s\n", name); return ret; } + + /* Stash CXO clk for XO shutdown tracking */ + if (i =3D=3D RPMH_CXO_CLK) + platform_set_drvdata(pdev, rpmh_clk); } =20 /* typecast to silence compiler warning */ @@ -722,9 +734,12 @@ static const struct of_device_id clk_rpmh_match_table[= ] =3D { }; MODULE_DEVICE_TABLE(of, clk_rpmh_match_table); =20 +static SIMPLE_DEV_PM_OPS(clk_rpmh_pm_ops, clk_rpmh_suspend, NULL); + static struct platform_driver clk_rpmh_driver =3D { .probe =3D clk_rpmh_probe, .driver =3D { + .pm =3D pm_ptr(&clk_rpmh_pm_ops), .name =3D "clk-rpmh", .of_match_table =3D clk_rpmh_match_table, }, base-commit: f2906aa863381afb0015a9eb7fefad885d4e5a56 --=20 https://chromeos.dev