From patchwork Mon Sep 19 12:20:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 12980378 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3A658ECAAD3 for ; Mon, 19 Sep 2022 12:22:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=ZHoUTX0qRLx761YIMqW8S1fwjkd/wBzJupXs4/+ktdw=; b=vqk6pqy0YySxl5 N/IC1vrGedt8tpSXIfFAOS17keUXsyIMBtbkTGPz1mnX4KKRAWt42cJ6ev+UKDiO3Ox4V2FtGj+h/ dE/QPfLd78imkt7D70NdseaJkaJ8gtrathXfmMFko8EKHRB443k1Lhs/RPtEbUOgfIk9PI+CXCSWL yvsMLSFoCohMH8z+1n/f5j+jObTYcvzmDZ12dGlB12px1ZEK9s9kZAIi9BoKkL1FPLFPr1s0Rt/d/ CdydKBKy6Fpth4PuFrTjHW6s1t3NTtHxcTXJXgAx3xkAmCojX6houdzGvTSRNgmeB8vIpPH6SQvZz rC4N9QDdm1rfEP4llQlA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oaFlt-00Bgi6-RJ; Mon, 19 Sep 2022 12:21:09 +0000 Received: from mail-lj1-x22a.google.com ([2a00:1450:4864:20::22a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oaFln-00BghN-VM for linux-arm-kernel@lists.infradead.org; Mon, 19 Sep 2022 12:21:08 +0000 Received: by mail-lj1-x22a.google.com with SMTP id a14so31484408ljj.8 for ; Mon, 19 Sep 2022 05:20:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=akAS+M555MDELlIlmpkVGxe1Ko+lvv67Qe46MFIs5R8=; b=rFI2tguDUwytQi2FpeVgljcxNVQj0L+/eVs8qHfX1/a02A5BbT1uiV2P0lUJL9ki2d rLFoZIhTOwQVtPB471K2MSYXWZ80g30wiw/9UimCZ4pVmsjdvqYB+3YcxVHhg+ULhLQ/ VBKkzbvBn0Kl2MDsZuwEGg2mSxjGJ5JW8E7rg6O3YSQnOsbr51uoAkGO6OOp/dfZdfem iA0wvP0TPTAyq8acqHbygY/mJCxINniEc3EmT8c+NAD8K7hNRvSlxkfQGaomV2ox0g6l 7VUFHet78Y7InqoGHEu+eDfkvh2MHWjEsQWXF+NCxrEo4u0tRNAkDAjMaZctdiGh8qh4 67qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=akAS+M555MDELlIlmpkVGxe1Ko+lvv67Qe46MFIs5R8=; b=1beVMMzsxlzlBfLrQMhm+1mmdXRHq/+2B7ma9eesvs7xIvB2LoNL5vP7+/qAhopcEN +PTBuRStxNQMWBC01EbJezCtNEJCa37z5mEndOQ6FT72EzSh9IDsZRrBY6ZVmITmo/Qp zvEthqkrs1F/w36N4obU0JI54DeD3EMG5cDCpbFv8YNpLoiB32Ul7tmTu1kJFoWwUXIG xxQBkHH1C3C0tm6JacbYd4zfHSUrkiR2lG3+s4aDcQVrTN6U//NDSPekmxIKvdZIORu+ IYhXxT+HXS4/lpWhstrv0szBbjDbHGN46K/bl4/yE8r0OHbWafSKn6B/bB2D9gNAwpMr Rfeg== X-Gm-Message-State: ACrzQf168EEPHKnCnYQO8jhNgdr8h9vjmbgVBULu/BqdZgSS9fPZSTQw Keyk4hkoxcWQCF3LgtTY/ooaBA== X-Google-Smtp-Source: AMsMyM635APqKv4krXUDzNMM2OajbAu7k05Oe88YZ2uTnaBwKN/OwdWZd0s90Iw76X5zESIsVU/k7g== X-Received: by 2002:a05:651c:1503:b0:24c:81df:e1f2 with SMTP id e3-20020a05651c150300b0024c81dfe1f2mr4761445ljf.182.1663590058203; Mon, 19 Sep 2022 05:20:58 -0700 (PDT) Received: from uffe-XPS13.. (h-94-254-63-18.NA.cust.bahnhof.se. [94.254.63.18]) by smtp.gmail.com with ESMTPSA id be19-20020a056512251300b0049f53d53235sm2003950lfb.50.2022.09.19.05.20.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Sep 2022 05:20:57 -0700 (PDT) From: Ulf Hansson To: Sudeep Holla , Cristian Marussi , linux-arm-kernel@lists.infradead.org Cc: Peng Fan , Geert Uytterhoeven , Dien Pham , Gaku Inami , Nicolas Pitre , Ulf Hansson , linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH] Revert "firmware: arm_scmi: Add clock management to the SCMI power domain" Date: Mon, 19 Sep 2022 14:20:33 +0200 Message-Id: <20220919122033.86126-1-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220919_052104_079983_1E05F741 X-CRM114-Status: GOOD ( 13.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This reverts commit a3b884cef873 ("firmware: arm_scmi: Add clock management to the SCMI power domain"). Using the GENPD_FLAG_PM_CLK tells genpd to gate/ungate the consumer device's clock(s) during runtime suspend/resume through the PM clock API. More precisely, in genpd_runtime_resume() the clock(s) for the consumer device would become ungated prior to the driver-level ->runtime_resume() callbacks gets invoked. This behaviour isn't a good fit for all platforms/drivers. For example, a driver may need to make some preparations of its device in its ->runtime_resume() callback, like calling clk_set_rate() before the clock(s) should be ungated. In these cases, it's easier to let the clock(s) to be managed solely by the driver, rather than at the PM domain level. For these reasons, let's drop the use GENPD_FLAG_PM_CLK for the SCMI PM domain, as to enable it to be more easily adopted across ARM platforms. Fixes: a3b884cef873 ("firmware: arm_scmi: Add clock management to the SCMI power domain") Cc: Nicolas Pitre Cc: stable@vger.kernel.org Signed-off-by: Ulf Hansson Tested-by: Peng Fan Acked-by: Sudeep Holla --- To get some more background to $subject patch, please have a look at the lore-link below. https://lore.kernel.org/all/DU0PR04MB94173B45A2CFEE3BF1BD313A88409@DU0PR04MB9417.eurprd04.prod.outlook.com/ Kind regards Ulf Hansson --- drivers/firmware/arm_scmi/scmi_pm_domain.c | 26 ---------------------- 1 file changed, 26 deletions(-) diff --git a/drivers/firmware/arm_scmi/scmi_pm_domain.c b/drivers/firmware/arm_scmi/scmi_pm_domain.c index 581d34c95769..d5dee625de78 100644 --- a/drivers/firmware/arm_scmi/scmi_pm_domain.c +++ b/drivers/firmware/arm_scmi/scmi_pm_domain.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include @@ -53,27 +52,6 @@ static int scmi_pd_power_off(struct generic_pm_domain *domain) return scmi_pd_power(domain, false); } -static int scmi_pd_attach_dev(struct generic_pm_domain *pd, struct device *dev) -{ - int ret; - - ret = pm_clk_create(dev); - if (ret) - return ret; - - ret = of_pm_clk_add_clks(dev); - if (ret >= 0) - return 0; - - pm_clk_destroy(dev); - return ret; -} - -static void scmi_pd_detach_dev(struct generic_pm_domain *pd, struct device *dev) -{ - pm_clk_destroy(dev); -} - static int scmi_pm_domain_probe(struct scmi_device *sdev) { int num_domains, i; @@ -124,10 +102,6 @@ static int scmi_pm_domain_probe(struct scmi_device *sdev) scmi_pd->genpd.name = scmi_pd->name; scmi_pd->genpd.power_off = scmi_pd_power_off; scmi_pd->genpd.power_on = scmi_pd_power_on; - scmi_pd->genpd.attach_dev = scmi_pd_attach_dev; - scmi_pd->genpd.detach_dev = scmi_pd_detach_dev; - scmi_pd->genpd.flags = GENPD_FLAG_PM_CLK | - GENPD_FLAG_ACTIVE_WAKEUP; pm_genpd_init(&scmi_pd->genpd, NULL, state == SCMI_POWER_STATE_GENERIC_OFF);