From patchwork Thu Apr 18 10:27:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 10906969 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-2.web.codeaurora.org (Postfix) with ESMTP id B45121390 for ; Thu, 18 Apr 2019 10:28:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C84028B68 for ; Thu, 18 Apr 2019 10:28:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 90BDA28C4D; Thu, 18 Apr 2019 10:28:20 +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=ham 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 33B2028B68 for ; Thu, 18 Apr 2019 10:28:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388624AbfDRK2I (ORCPT ); Thu, 18 Apr 2019 06:28:08 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:34396 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388632AbfDRK2I (ORCPT ); Thu, 18 Apr 2019 06:28:08 -0400 Received: by mail-lj1-f195.google.com with SMTP id j89so1490316ljb.1 for ; Thu, 18 Apr 2019 03:28:06 -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=BLvAgBQDq6vF0i+wC/iY8ot3SYyciBGpMv8ybloeX/8=; b=UWjsHT1soOCJol5kUrl4LvjOrmosF6Qvw1AlY4/rgZDKzdy0IOQ02rKUvJz1QU8gNS auSsccy7TFGnzKgKOC1bfnesKoR5bh0WoCMoy08Rq41b0kX1EP2CTMImfnNm59uHJLoE IZjc9ctIk/jINg1QD2Rf1VzNaJSDu5nibKxED3wklqMYDgxyAEjyzoqKJi0zikzveq+R X58rwBvNBMFh5psCB8ctl8jFZ7i6IkWgd+Hz9ktJ5yIBkuV+BdJFQ01a+bCearHLoCE4 LUcJXp8cIkbUXX2k6QObhuUjUaYTEJjlu/YKbBTRe6e7owNpatgqbz6seu+kgy5pi87T h45A== 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=BLvAgBQDq6vF0i+wC/iY8ot3SYyciBGpMv8ybloeX/8=; b=hJIlDGL3MbF9mJ22xlLvU+N8RtcETQ3Hr85tGcVnJ6cLPm90fPqlyc0YZv23nsBwlE d+hRqLtZBw/OGmO2ZWP7YzpwCJgi5qNDMIaqe8LnLq3tyyXMKXNy8Rni5ctyli3ZH/8f IMpMfAZujTwV9eF6kU0tVSlYrnkdvxKfEeAKQVzymK1zYXBqYhsA1lsnb+eKsQeROVM6 QJbtb//UBs4rnsdDdeo5p2ryaXCg0kdj7Gx+hzemQIMooNBY62PQy8X/guivunQBEoSx Jn7nvOcLZ1sLSPnbV6WHPcnHQuv8qwOqzfj/3zZvo7cfzx4dV3X5fgktIiTQWVT1a4bG PJ+Q== X-Gm-Message-State: APjAAAUAMgoeLooirnaG/9xAlalO9g+oVjIvwdetdhuhAsuqq3QV9Yrl XhkhmPjoOtKIPGEgW1np170Xzw== X-Google-Smtp-Source: APXvYqxP+kiPYsKyAHgOMKr4NxfGd1gczUvjp0zvE12QTUzn6AhXfh0nI+0yjdus7Gtj4hdq5UvIVA== X-Received: by 2002:a2e:711a:: with SMTP id m26mr50832819ljc.40.1555583285587; Thu, 18 Apr 2019 03:28:05 -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 l13sm320409ljj.96.2019.04.18.03.28.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Apr 2019 03:28:04 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , linux-pm@vger.kernel.org Cc: Ulf Hansson , Greg Kroah-Hartman , Jon Hunter , Rajendra Nayak , Viresh Kumar , Niklas Cassel , Kevin Hilman , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/3] PM / Domains: Allow OF lookup for multi PM domain case from ->attach_dev() Date: Thu, 18 Apr 2019 12:27:56 +0200 Message-Id: <20190418102757.1246-3-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190418102757.1246-1-ulf.hansson@linaro.org> References: <20190418102757.1246-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 A genpd provider that uses the ->attach_dev() callback to lookup resources for a device, fails to do so when the device has multiple PM domains. This is because when genpd invokes the ->attach_dev() callback, it passes the allocated virtual device as the in-parameter. To address this problem, let's simply assign the dev->of_node for the virtual device, based upon the original device's OF node. Signed-off-by: Ulf Hansson Acked-by: Viresh Kumar Acked-by: Niklas Cassel --- drivers/base/power/domain.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 7fec69aebf46..801f31c87d16 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -2345,6 +2345,7 @@ EXPORT_SYMBOL_GPL(of_genpd_remove_last); static void genpd_release_dev(struct device *dev) { + of_node_put(dev->of_node); kfree(dev); } @@ -2406,14 +2407,14 @@ static void genpd_dev_pm_sync(struct device *dev) genpd_queue_power_off_work(pd); } -static int __genpd_dev_pm_attach(struct device *dev, struct device_node *np, - unsigned int index, bool power_on) +static int __genpd_dev_pm_attach(struct device *dev, unsigned int index, + bool power_on) { struct of_phandle_args pd_args; struct generic_pm_domain *pd; int ret; - ret = of_parse_phandle_with_args(np, "power-domains", + ret = of_parse_phandle_with_args(dev->of_node, "power-domains", "#power-domain-cells", index, &pd_args); if (ret < 0) return ret; @@ -2481,7 +2482,7 @@ int genpd_dev_pm_attach(struct device *dev) "#power-domain-cells") != 1) return 0; - return __genpd_dev_pm_attach(dev, dev->of_node, 0, true); + return __genpd_dev_pm_attach(dev, 0, true); } EXPORT_SYMBOL_GPL(genpd_dev_pm_attach); @@ -2525,6 +2526,7 @@ struct device *genpd_dev_pm_attach_by_id(struct device *dev, dev_set_name(virt_dev, "genpd:%u:%s", index, dev_name(dev)); virt_dev->bus = &genpd_bus_type; virt_dev->release = genpd_release_dev; + virt_dev->of_node = of_node_get(dev->of_node); ret = device_register(virt_dev); if (ret) { @@ -2533,7 +2535,7 @@ struct device *genpd_dev_pm_attach_by_id(struct device *dev, } /* Try to attach the device to the PM domain at the specified index. */ - ret = __genpd_dev_pm_attach(virt_dev, dev->of_node, index, false); + ret = __genpd_dev_pm_attach(virt_dev, index, false); if (ret < 1) { device_unregister(virt_dev); return ret ? ERR_PTR(ret) : NULL;