From patchwork Thu May 31 10:59:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 10440729 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C07396035E for ; Thu, 31 May 2018 11:01:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B9D61291A7 for ; Thu, 31 May 2018 11:01:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B731429293; Thu, 31 May 2018 11:01:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0BECC291A7 for ; Thu, 31 May 2018 11:01:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754697AbeEaLA6 (ORCPT ); Thu, 31 May 2018 07:00:58 -0400 Received: from mail-lf0-f67.google.com ([209.85.215.67]:34110 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754569AbeEaLAK (ORCPT ); Thu, 31 May 2018 07:00:10 -0400 Received: by mail-lf0-f67.google.com with SMTP id o9-v6so9097944lfk.1 for ; Thu, 31 May 2018 04:00:10 -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; bh=jKz+vlX/PouqjXRFdu2AfA12MJxmgGmBdpobmfJzBo8=; b=Cfms82veV6wwqnFDu+KXZpAM+5lc10354WQbxw+tBsDCKTCWSGwF/ybvNCMYF3xfyw ShQVSi2fg5zaGigjwjh+swjebs4GLTXq74Z7yM0BbLIitg8Geh1ShOv53kbLZFk6v58U 2VL2JMgmRoE0QoZwDmrEP6IkRjwL1o/dCZFBw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jKz+vlX/PouqjXRFdu2AfA12MJxmgGmBdpobmfJzBo8=; b=skZbvb5qlueEQeS+bvtwHd1+XxxCz3AKTssJbK9JcQ2FHuaJklaOYz8wHlOYR2I5yE PiwVKwgyFwCvo7CiV4rUPNH8v4tPxuAbpW0qJhC5HsZcNQZgBKm9zz8DQr+/cFfopgrm g2bP3HOWma9v2qtMeGiZdzOkrFY8VqSwKqu5G0ZgwPp52TBBNQlZJTPZSx1oUw/LBmlI qpObbAxVRqwKqtP57nrwuO4AfaoPVvwkDU2x5kCkHAlgqd7w6GwZbEVv/RQ9kBO1yT/j jtM6aKhM1c7lSc46PUeAE/LEDQWbynFi5QfBcD6WLjGI9BERpPlPKbjsRccvMbgYt2nF 5tmw== X-Gm-Message-State: ALKqPwd64UIEGgQ1UNdGsZwBo0t5RdgYQGuYh5Ppk33XDacgqIlLOp1y 1nnnA26VIkWCmaxLjPOs8dpz1w== X-Google-Smtp-Source: ADUXVKJaBAMUAME0WoR58IrYcwMfr1qnoovK4ayEa2WfcnWH12CiE4JS8/9mBk9fAf5BSUPAQCvi/w== X-Received: by 2002:a19:1f51:: with SMTP id f78-v6mr4205925lff.42.1527764409363; Thu, 31 May 2018 04:00:09 -0700 (PDT) Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id b20-v6sm7454383ljf.51.2018.05.31.04.00.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 May 2018 04:00:08 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , linux-pm@vger.kernel.org Cc: Ulf Hansson , Greg Kroah-Hartman , Jon Hunter , Geert Uytterhoeven , Todor Tomov , Rajendra Nayak , Viresh Kumar , Vincent Guittot , Kevin Hilman , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-tegra@vger.kernel.org, Rob Herring , devicetree@vger.kernel.org Subject: [PATCH v3 2/5] PM / Domains: Don't attach devices in genpd with multi PM domains Date: Thu, 31 May 2018 12:59:56 +0200 Message-Id: <20180531105959.14843-3-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180531105959.14843-1-ulf.hansson@linaro.org> References: <20180531105959.14843-1-ulf.hansson@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The power-domain DT property may now contain a list of PM domain specifiers, which represents that a device are partitioned across multiple PM domains. This leads to a new situation in genpd_dev_pm_attach(), as only one PM domain can be attached per device. To remain things simple for the most common configuration, when a single PM domain is used, let's treat the multiple PM domain case as being specific. In other words, let's change genpd_dev_pm_attach() to check for multiple PM domains and prevent it from attach any PM domain for this case. Instead, leave this to be managed separately, from following changes to genpd. Cc: Rob Herring Cc: devicetree@vger.kernel.org Suggested-by: Jon Hunter Signed-off-by: Ulf Hansson Acked-by: Jon Hunter Tested-by: Jon Hunter Reviewed-by: Viresh Kumar --- drivers/base/power/domain.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 6f403d6fccb2..908c44779ae7 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -2229,10 +2229,10 @@ static void genpd_dev_pm_sync(struct device *dev) * attaches the device to retrieved pm_domain ops. * * Returns 1 on successfully attached PM domain, 0 when the device don't need a - * PM domain or a negative error code in case of failures. Note that if a - * power-domain exists for the device, but it cannot be found or turned on, - * then return -EPROBE_DEFER to ensure that the device is not probed and to - * re-try again later. + * PM domain or when multiple power-domains exists for it, else a negative error + * code. Note that if a power-domain exists for the device, but it cannot be + * found or turned on, then return -EPROBE_DEFER to ensure that the device is + * not probed and to re-try again later. */ int genpd_dev_pm_attach(struct device *dev) { @@ -2243,10 +2243,18 @@ int genpd_dev_pm_attach(struct device *dev) if (!dev->of_node) return 0; + /* + * Devices with multiple PM domains must be attached separately, as we + * can only attach one PM domain per device. + */ + if (of_count_phandle_with_args(dev->of_node, "power-domains", + "#power-domain-cells") != 1) + return 0; + ret = of_parse_phandle_with_args(dev->of_node, "power-domains", "#power-domain-cells", 0, &pd_args); if (ret < 0) - return 0; + return ret; mutex_lock(&gpd_list_lock); pd = genpd_get_from_provider(&pd_args);