From patchwork Fri Apr 1 14:11:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 12798346 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 38552C433EF for ; Fri, 1 Apr 2022 14:14:12 +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:References:In-Reply-To: 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: List-Owner; bh=d9V8Pay8nRW08rJ6aL+cpzvu1PZ5uVOXK1YYOz+HHts=; b=lK1pOlhOar3+oJ HM2E78o/xxwfNFRW5qS1SeQ4ATyknmR3h/7A9IeEASSgJ6320QhrOD4fEqSYhAfvnzOkRF21iXNGf PEZ/keKp+yqGs5VmabyfoaI4fT9hZrxV+OwpEt4GVP5BW9z+A2kUbuDVGhyWVZQJ5Qlnq1GB7gdIu oQVmyg1RHzD+g1d3bZ0K5XYHM5fR2aCNtC+W678FnhkRsPAMvFdOMW6wTmrJEa/IWA/ixWs15ii0i RJxDxiOE9CRNZb7VbuubI4cQ13FwPEBH6IDCQ6/axFDKlcsAXj6ANilA3jyoklGIV+6INXWrANzbM sw6tC8sfTq1zr2oj5T5A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1naI1A-005vZB-9f; Fri, 01 Apr 2022 14:12:48 +0000 Received: from mail-lf1-x130.google.com ([2a00:1450:4864:20::130]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1naI08-005uzs-7y for linux-arm-kernel@lists.infradead.org; Fri, 01 Apr 2022 14:11:46 +0000 Received: by mail-lf1-x130.google.com with SMTP id e16so5101701lfc.13 for ; Fri, 01 Apr 2022 07:11:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dc7bcPLHSzDeVD5ow88/lepa6mD08+FL5qt0hCCvM24=; b=Gs++QERUQ6VZTav+T8iX4NX+HP4paalYcpGZTaqYgcvKWD3gcJnCjsvRq74CalCDQD ZOZ3jfl0z6fqX3p2JCZN5YBH7DjJDvfmf7DYHZIAZfaENweW5oy/yBOAjRde0PJm+BiK +BNTFmNl9QnskE96uabMgEt8GQ4rq/UdCp1KFldhsjEBrjipJC3aBK/XcfUJ2+38jd9E vQdNrorAoW97tRvVl4/wKRr9TNlHynMSIUHXgaelkssAMco89uegyP468+KlYXFz2wgQ VK/ZjUasEbG6bqEm1sgTD7iDNsDhiFPjPO674O0E3k7da6H+a/VJhJaweshHL0bkC9Wc s+xw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=dc7bcPLHSzDeVD5ow88/lepa6mD08+FL5qt0hCCvM24=; b=mZ64t4IglhzBEYmg8lDnAUx8m38c2xvCs6JCU5fvbOIIU0D0RQmd2UqnF28FfFGnRe Il9Dp+n15wWovFaseKbL8hnX0bA0GbDcESpAFldbhvWPK3g53eJrmFlE7fM6VJbk9NSZ CUnc+l8afVuJqztAvL3CQ8CasDdzxIxu5sXtN6SRddTqqAxTvJYwgD4qz6J8amdHXGbm KL7cIQ52MdqgTiYAn9wgdyshK6pIXAitKXTJ3sV1zgZZe6cdHI1E4SSZSbd0H08Vnee4 1/GfmblpmbMk7lc4jP2EpWaGmFGzZklnQmgeRHrr8946m+FWHXUWqVTXHNI68H3G2cEj Qorg== X-Gm-Message-State: AOAM532KHz8xlvx1jT7K9vFt40Z87eKNKjtw9cd5gsaHoTm0yIV/jGOb gji/8935hXE8ESyqh0HGdwMOwg== X-Google-Smtp-Source: ABdhPJxRtRhtqUT7n7uSs6oA1DmMyYSR5uMWLnIib8aSgqAuEV/CUQy3xIotPv+wra+vfJMp5vzoRw== X-Received: by 2002:a05:6512:c01:b0:448:6aec:65c5 with SMTP id z1-20020a0565120c0100b004486aec65c5mr14350038lfu.193.1648822297707; Fri, 01 Apr 2022 07:11:37 -0700 (PDT) Received: from localhost.localdomain (h-98-128-181-154.NA.cust.bahnhof.se. [98.128.181.154]) by smtp.gmail.com with ESMTPSA id 16-20020ac24d50000000b0044a255c8d3bsm251926lfp.116.2022.04.01.07.11.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 07:11:36 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , Sudeep Holla , Lorenzo Pieralisi , linux-pm@vger.kernel.org Cc: Maulik Shah , Daniel Lezcano , Lukasz Luba , Vincent Guittot , Stephen Boyd , Bjorn Andersson , Alexandre Torgue , Ulf Hansson , linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] PM: runtime: Allow to call __pm_runtime_set_status() from atomic context Date: Fri, 1 Apr 2022 16:11:23 +0200 Message-Id: <20220401141124.27272-2-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220401141124.27272-1-ulf.hansson@linaro.org> References: <20220401141124.27272-1-ulf.hansson@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220401_071144_317902_B1062CCC X-CRM114-Status: GOOD ( 12.72 ) 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 The only two users of __pm_runtime_set_status() are pm_runtime_set_active() and pm_runtime_set_suspended(). These are widely used and should be called from non-atomic context to work as expected. However, it would be convenient to allow them be called from atomic context too, as shown from a subsequent change, so let's add support for this. Signed-off-by: Ulf Hansson Tested-by: Maulik Shah --- drivers/base/power/runtime.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index d4059e6ffeae..91d757914686 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -1210,12 +1210,13 @@ int __pm_runtime_set_status(struct device *dev, unsigned int status) { struct device *parent = dev->parent; bool notify_parent = false; + unsigned long flags; int error = 0; if (status != RPM_ACTIVE && status != RPM_SUSPENDED) return -EINVAL; - spin_lock_irq(&dev->power.lock); + spin_lock_irqsave(&dev->power.lock, flags); /* * Prevent PM-runtime from being enabled for the device or return an @@ -1226,7 +1227,7 @@ int __pm_runtime_set_status(struct device *dev, unsigned int status) else error = -EAGAIN; - spin_unlock_irq(&dev->power.lock); + spin_unlock_irqrestore(&dev->power.lock, flags); if (error) return error; @@ -1247,7 +1248,7 @@ int __pm_runtime_set_status(struct device *dev, unsigned int status) device_links_read_unlock(idx); } - spin_lock_irq(&dev->power.lock); + spin_lock_irqsave(&dev->power.lock, flags); if (dev->power.runtime_status == status || !parent) goto out_set; @@ -1288,7 +1289,7 @@ int __pm_runtime_set_status(struct device *dev, unsigned int status) dev->power.runtime_error = 0; out: - spin_unlock_irq(&dev->power.lock); + spin_unlock_irqrestore(&dev->power.lock, flags); if (notify_parent) pm_request_idle(parent); From patchwork Fri Apr 1 14:11:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 12798347 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 76B04C433EF for ; Fri, 1 Apr 2022 14:14:25 +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:References:In-Reply-To: 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: List-Owner; bh=GCaTiyoMLJ6FW8lpylI/M/x6JuRXcniDymNRFPWBBhE=; b=KFEibE+AUeIIhX IglgXhwgsbD0W+oHOMcykxiLKS0mJDPX5VQmtjYVV6RKV14e18My1wMdg5nH3Z8Ymw7P5JRVmGRZE eR6xJRvOGiGw4KTfqa4mgClwwi8PSwhlA/Xme1eYfmRvjqvB7WMa6I8F8oYCElMWxD8IrD3RfqEYf zqknvmkRZq6pAMdPnUHvgLQNSIWdwyqqFGnbt+5KzdPYHcxuB/vfg14979qf21QSEpVDYUlzE/Yhy VxcO2ERHGcodLbDpjmyE5nYnap2TMDI7RnCYN7as8wiD8mf1fwuK5qp2FFUAbcIoX+48P0sI60LaE 7KufNNdc7E2TtT7Ci/iQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1naI1V-005vip-5M; Fri, 01 Apr 2022 14:13:09 +0000 Received: from mail-lj1-x231.google.com ([2a00:1450:4864:20::231]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1naI09-005v15-1E for linux-arm-kernel@lists.infradead.org; Fri, 01 Apr 2022 14:11:47 +0000 Received: by mail-lj1-x231.google.com with SMTP id q14so4055249ljc.12 for ; Fri, 01 Apr 2022 07:11:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+mT7DozH0I+kyrJvkjL2P2dEm61K2NFLYH90tYVa51o=; b=P7c4fDPcdG/p6IDbn6XygyqieRQwUZhlzkE+5K1NmkEbE4nBBTsJDkJPg9D8E8pAu4 9ETDlnCnoW27jEd3/9JE2NVFZSCcFSaavPEe04CxJhnt6xl7IGYtRjcbYZ2uqxm4yc97 151x3IIqAzoJLcwfNBz0Dry5Lab0/okslV9lDKgLV3C5f2bEEJMrgVH4jOF80Ut9lPmB UuyClcUBsUdMxA2mztVPVxsjUWDwL6+HiNIVkbRQsAwMzmnYBqRi4s1wXkRBI1tmiuzo W7inJ9GMeM+3W8VdsmjmOGHz36wfnRBgB7QX7Y0o4M+XmSJfT6IHm4AIKtOyr9aupyEd wdsA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=+mT7DozH0I+kyrJvkjL2P2dEm61K2NFLYH90tYVa51o=; b=zgB7i0MyPkt36Ehp5T6rVNaAjpUsdOtWKEwHPfR7xsSrBRNax4ppDRjzDmN+TTCZcj +fVWUbf1p9f+x90WPXFMrSAxiSLmDLqPPLlvDsbVxkSCX/X96YKyASZzAW+2iDd+akHM GJVaXgpvGobWldi0T+yPv6sV7NQgSN1ifovKMWyU2LVzr83W7+usSNQ4h7lX6sY8zwNv QOVLQSqaGHWg4CunNqWXn0qio6yxjlpbU0rCpfwp3P9DPZYoZ5cSAhDjiF/MHFjnGHMP /cJDm7y9Se4pU5udKCs2qz5XV83S4BRGFOeZqe70AoIA167QFHOXdvNYarHa1/3vEVkH h7gg== X-Gm-Message-State: AOAM532s7petA/BXdfjOIBlAJFs/0PtO7vzsz9+qeUaejtPK9zDLfioE LqogY5MlyOJ4x3kqtbMR0Nadhg== X-Google-Smtp-Source: ABdhPJzPNIzR8o/fTHBpIIc5TQRIQ6skrKM1Hx35yicn83dRV3rC2APQINhmpRQugY4tPM0ZnstwXg== X-Received: by 2002:a2e:9045:0:b0:249:78ba:fbf8 with SMTP id n5-20020a2e9045000000b0024978bafbf8mr13484220ljg.218.1648822299947; Fri, 01 Apr 2022 07:11:39 -0700 (PDT) Received: from localhost.localdomain (h-98-128-181-154.NA.cust.bahnhof.se. [98.128.181.154]) by smtp.gmail.com with ESMTPSA id 16-20020ac24d50000000b0044a255c8d3bsm251926lfp.116.2022.04.01.07.11.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 07:11:38 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , Sudeep Holla , Lorenzo Pieralisi , linux-pm@vger.kernel.org Cc: Maulik Shah , Daniel Lezcano , Lukasz Luba , Vincent Guittot , Stephen Boyd , Bjorn Andersson , Alexandre Torgue , Ulf Hansson , linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] cpuidle: psci: Improve support for suspend-to-ram for PSCI OSI mode Date: Fri, 1 Apr 2022 16:11:24 +0200 Message-Id: <20220401141124.27272-3-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220401141124.27272-1-ulf.hansson@linaro.org> References: <20220401141124.27272-1-ulf.hansson@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220401_071145_180282_EE6BB6E6 X-CRM114-Status: GOOD ( 19.11 ) 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 When PSCI OSI mode is supported the syscore flag is set for the CPU devices that becomes attached to their PM domains (genpds). In the suspend-to-idle case, we call dev_pm_genpd_suspend|resume() to allow genpd to properly manage the power-off/on operations (pick an idlestate and manage the on/off notifications). For suspend-to-ram, dev_pm_genpd_suspend|resume() is currently not being called, which causes a problem that the genpd on/off notifiers do not get sent as expected. This prevents the platform-specific operations from being executed, typically needed just before/after the boot CPU is being turned off/on. To deal with this problem, let's register a syscore ops for cpuidle-psci when PSCI OSI mode is being used and call dev_pm_genpd_suspend|resume() from them. In this way, genpd regains control of the PM domain topology and then sends the on/off notifications when it's appropriate. Reported-by: Maulik Shah Suggested-by: Maulik Shah Signed-off-by: Ulf Hansson Tested-by: Maulik Shah --- drivers/cpuidle/cpuidle-psci.c | 46 ++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/drivers/cpuidle/cpuidle-psci.c b/drivers/cpuidle/cpuidle-psci.c index b51b5df08450..540105ca0781 100644 --- a/drivers/cpuidle/cpuidle-psci.c +++ b/drivers/cpuidle/cpuidle-psci.c @@ -23,6 +23,7 @@ #include #include #include +#include #include @@ -131,6 +132,49 @@ static int psci_idle_cpuhp_down(unsigned int cpu) return 0; } +static void psci_idle_syscore_switch(bool suspend) +{ + bool cleared = false; + struct device *dev; + int cpu; + + for_each_possible_cpu(cpu) { + dev = per_cpu_ptr(&psci_cpuidle_data, cpu)->dev; + + if (dev && suspend) { + dev_pm_genpd_suspend(dev); + } else if (dev) { + dev_pm_genpd_resume(dev); + + /* Account for userspace having offlined a CPU. */ + if (pm_runtime_status_suspended(dev)) + pm_runtime_set_active(dev); + + /* Clear domain state to re-start fresh. */ + if (!cleared) { + psci_set_domain_state(0); + cleared = true; + } + } + } +} + +static int psci_idle_syscore_suspend(void) +{ + psci_idle_syscore_switch(true); + return 0; +} + +static void psci_idle_syscore_resume(void) +{ + psci_idle_syscore_switch(false); +} + +static struct syscore_ops psci_idle_syscore_ops = { + .suspend = psci_idle_syscore_suspend, + .resume = psci_idle_syscore_resume, +}; + static void psci_idle_init_cpuhp(void) { int err; @@ -138,6 +182,8 @@ static void psci_idle_init_cpuhp(void) if (!psci_cpuidle_use_cpuhp) return; + register_syscore_ops(&psci_idle_syscore_ops); + err = cpuhp_setup_state_nocalls(CPUHP_AP_CPU_PM_STARTING, "cpuidle/psci:online", psci_idle_cpuhp_up,