From patchwork Tue Aug 25 13:59:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heikki Krogerus X-Patchwork-Id: 251702 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CAB8BC433DF for ; Tue, 25 Aug 2020 14:04:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A74992075F for ; Tue, 25 Aug 2020 14:04:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726218AbgHYODo (ORCPT ); Tue, 25 Aug 2020 10:03:44 -0400 Received: from mga06.intel.com ([134.134.136.31]:59247 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726580AbgHYN75 (ORCPT ); Tue, 25 Aug 2020 09:59:57 -0400 IronPort-SDR: gZAegcvwM2Y37Zk+4E9d4H0V4Ttc52iJl03IqtHR5uwi2/A7CU0QIeGm4YXg1jveJlh2qlcX77 51UUPqsySYFg== X-IronPort-AV: E=McAfee;i="6000,8403,9723"; a="217659387" X-IronPort-AV: E=Sophos;i="5.76,352,1592895600"; d="scan'208";a="217659387" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Aug 2020 06:59:57 -0700 IronPort-SDR: twhmd9BCN45mDe6hCN28lryCLJ5t5Oz71YxOR3wFlk4/sFfb5UXdk44hCYxWzqWP8VBUJaXuGc kZyE2mvP11XA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,352,1592895600"; d="scan'208";a="402725569" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 25 Aug 2020 06:59:54 -0700 From: Heikki Krogerus To: "Rafael J. Wysocki" , Felipe Balbi Cc: Andy Shevchenko , Sakari Ailus , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, linux-acpi@vger.kernel.org Subject: [PATCH 1/3] software node: Power management operations for software nodes Date: Tue, 25 Aug 2020 16:59:49 +0300 Message-Id: <20200825135951.53340-2-heikki.krogerus@linux.intel.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200825135951.53340-1-heikki.krogerus@linux.intel.com> References: <20200825135951.53340-1-heikki.krogerus@linux.intel.com> MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Adding separate PM operations vector for the software nodes. The software node specific PM operations make it possible to handle most PM related quirks separately in their own functions instead of conditionally in the device driver's generic PM functions (and in some cases all over the driver). The software node specific PM operations will also reduce the need to pass platform data in some cases, for example from a core MFD driver to the child device drivers, as from now on the core MFD driver will be able to implement the PM quirks directly for the child devices without the need to touch the drivers of those child devices. If a software node includes the PM operations, those PM operations are always executed separately on top of the other PM operations of the device, so the software node will never replace any of the "normal" PM operations of the device (including the PM domain's operations, class's or bus's PM operations, the device drivers own operations, or any other). Signed-off-by: Heikki Krogerus --- drivers/base/power/common.c | 8 +- drivers/base/swnode.c | 524 +++++++++++++++++++++++++++++++++++- include/linux/property.h | 10 + 3 files changed, 532 insertions(+), 10 deletions(-) diff --git a/drivers/base/power/common.c b/drivers/base/power/common.c index bbddb267c2e69..b64cd4690ac63 100644 --- a/drivers/base/power/common.c +++ b/drivers/base/power/common.c @@ -109,8 +109,14 @@ int dev_pm_domain_attach(struct device *dev, bool power_on) ret = acpi_dev_pm_attach(dev, power_on); if (!ret) ret = genpd_dev_pm_attach(dev); + if (ret < 0) + return ret; - return ret < 0 ? ret : 0; + ret = software_node_dev_pm_attach(dev, power_on); + if (ret) + dev_pm_domain_detach(dev, power_on); + + return ret; } EXPORT_SYMBOL_GPL(dev_pm_domain_attach); diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c index 010828fc785bc..9a13a61a2f0bb 100644 --- a/drivers/base/swnode.c +++ b/drivers/base/swnode.c @@ -8,6 +8,8 @@ #include #include +#include +#include #include #include @@ -48,6 +50,19 @@ EXPORT_SYMBOL_GPL(is_software_node); struct swnode, fwnode) : NULL; \ }) +static inline struct swnode *dev_to_swnode(struct device *dev) +{ + struct fwnode_handle *fwnode = dev_fwnode(dev); + + if (!fwnode) + return NULL; + + if (!is_software_node(fwnode)) + fwnode = fwnode->secondary; + + return to_swnode(fwnode); +} + static struct swnode * software_node_to_swnode(const struct software_node *node) { @@ -344,6 +359,504 @@ void property_entries_free(const struct property_entry *properties) } EXPORT_SYMBOL_GPL(property_entries_free); +/* -------------------------------------------------------------------------- */ +/* Power management operations */ + +#ifdef CONFIG_PM +struct swnode_pm_domain { + struct dev_pm_domain pm_domain; + struct dev_pm_domain *primary; +}; + +#define to_swnode_pm_domain(d) \ + container_of(d, struct swnode_pm_domain, pm_domain) + +static int software_node_runtime_suspend(struct device *dev) +{ + struct swnode_pm_domain *domain = to_swnode_pm_domain(dev->pm_domain); + struct swnode *swnode = dev_to_swnode(dev); + int ret; + + if (domain->primary && domain->primary->ops.runtime_suspend) + ret = domain->primary->ops.runtime_suspend(dev); + else + ret = pm_generic_runtime_suspend(dev); + + if (ret || !swnode->node->pm->runtime_suspend) + return ret; + + return swnode->node->pm->runtime_suspend(dev); +} + +static int software_node_runtime_resume(struct device *dev) +{ + struct swnode_pm_domain *domain = to_swnode_pm_domain(dev->pm_domain); + struct swnode *swnode = dev_to_swnode(dev); + int ret; + + if (swnode->node->pm->runtime_resume) { + ret = swnode->node->pm->runtime_resume(dev); + if (ret) + return ret; + } + + if (domain->primary && domain->primary->ops.runtime_resume) + ret = domain->primary->ops.runtime_resume(dev); + else + ret = pm_generic_runtime_resume(dev); + + return ret; +} + +static int software_node_runtime_idle(struct device *dev) +{ + struct swnode_pm_domain *domain = to_swnode_pm_domain(dev->pm_domain); + struct swnode *swnode = dev_to_swnode(dev); + int ret = 0; + + if (domain->primary && domain->primary->ops.runtime_idle) + ret = domain->primary->ops.runtime_idle(dev); + + if (ret || !swnode->node->pm->runtime_idle) + return ret; + + return swnode->node->pm->runtime_idle(dev); +} + +#ifdef CONFIG_PM_SLEEP +static int software_node_prepare(struct device *dev) +{ + struct swnode_pm_domain *domain = to_swnode_pm_domain(dev->pm_domain); + struct swnode *swnode = dev_to_swnode(dev); + int ret; + + if (domain->primary && domain->primary->ops.prepare) + ret = domain->primary->ops.prepare(dev); + else + ret = pm_generic_prepare(dev); + + if (ret || !swnode->node->pm->prepare) + return ret; + + return swnode->node->pm->prepare(dev); +} + +static void software_node_complete(struct device *dev) +{ + struct swnode_pm_domain *domain = to_swnode_pm_domain(dev->pm_domain); + struct swnode *swnode = dev_to_swnode(dev); + + if (swnode->node->pm->complete) + swnode->node->pm->complete(dev); + + if (domain->primary && domain->primary->ops.complete) + domain->primary->ops.complete(dev); + else + pm_generic_complete(dev); +} + +static int software_node_suspend(struct device *dev) +{ + struct swnode_pm_domain *domain = to_swnode_pm_domain(dev->pm_domain); + struct swnode *swnode = dev_to_swnode(dev); + int ret; + + if (domain->primary && domain->primary->ops.suspend) + ret = domain->primary->ops.suspend(dev); + else + ret = pm_generic_suspend(dev); + + if (ret || !swnode->node->pm->suspend) + return ret; + + return swnode->node->pm->suspend(dev); +} + +static int software_node_resume(struct device *dev) +{ + struct swnode_pm_domain *domain = to_swnode_pm_domain(dev->pm_domain); + struct swnode *swnode = dev_to_swnode(dev); + int ret; + + if (swnode->node->pm->resume) { + ret = swnode->node->pm->resume(dev); + if (ret) + return ret; + } + + if (domain->primary && domain->primary->ops.resume) + ret = domain->primary->ops.resume(dev); + else + ret = pm_generic_resume(dev); + + return ret; +} + +static int software_node_freeze(struct device *dev) +{ + struct swnode_pm_domain *domain = to_swnode_pm_domain(dev->pm_domain); + struct swnode *swnode = dev_to_swnode(dev); + int ret; + + if (domain->primary && domain->primary->ops.freeze) + ret = domain->primary->ops.freeze(dev); + else + ret = pm_generic_freeze(dev); + + if (ret || !swnode->node->pm->freeze) + return ret; + + return swnode->node->pm->freeze(dev); +} + +static int software_node_thaw(struct device *dev) +{ + struct swnode_pm_domain *domain = to_swnode_pm_domain(dev->pm_domain); + struct swnode *swnode = dev_to_swnode(dev); + int ret; + + if (swnode->node->pm->thaw) { + ret = swnode->node->pm->thaw(dev); + if (ret) + return ret; + } + + if (domain->primary && domain->primary->ops.thaw) + ret = domain->primary->ops.thaw(dev); + else + ret = pm_generic_thaw(dev); + + return ret; +} + +static int software_node_poweroff(struct device *dev) +{ + struct swnode_pm_domain *domain = to_swnode_pm_domain(dev->pm_domain); + struct swnode *swnode = dev_to_swnode(dev); + int ret; + + if (domain->primary && domain->primary->ops.poweroff) + ret = domain->primary->ops.poweroff(dev); + else + ret = pm_generic_poweroff(dev); + + if (ret || !swnode->node->pm->poweroff) + return ret; + + return swnode->node->pm->poweroff(dev); +} + +static int software_node_restore(struct device *dev) +{ + struct swnode_pm_domain *domain = to_swnode_pm_domain(dev->pm_domain); + struct swnode *swnode = dev_to_swnode(dev); + int ret; + + if (swnode->node->pm->restore) { + ret = swnode->node->pm->restore(dev); + if (ret) + return ret; + } + + if (domain->primary && domain->primary->ops.restore) + ret = domain->primary->ops.restore(dev); + else + ret = pm_generic_restore(dev); + + return ret; +} + +static int software_node_suspend_late(struct device *dev) +{ + struct swnode_pm_domain *domain = to_swnode_pm_domain(dev->pm_domain); + struct swnode *swnode = dev_to_swnode(dev); + int ret; + + if (domain->primary && domain->primary->ops.suspend_late) + ret = domain->primary->ops.suspend_late(dev); + else + ret = pm_generic_suspend_late(dev); + + if (ret || !swnode->node->pm->suspend_late) + return ret; + + return swnode->node->pm->suspend_late(dev); +} + +static int software_node_resume_early(struct device *dev) +{ + struct swnode_pm_domain *domain = to_swnode_pm_domain(dev->pm_domain); + struct swnode *swnode = dev_to_swnode(dev); + int ret; + + if (swnode->node->pm->resume_early) { + ret = swnode->node->pm->resume_early(dev); + if (ret) + return ret; + } + + if (domain->primary && domain->primary->ops.resume_early) + ret = domain->primary->ops.resume_early(dev); + else + pm_generic_resume_early(dev); + + return 0; +} + +static int software_node_freeze_late(struct device *dev) +{ + struct swnode_pm_domain *domain = to_swnode_pm_domain(dev->pm_domain); + struct swnode *swnode = dev_to_swnode(dev); + int ret; + + if (domain->primary && domain->primary->ops.freeze_late) + ret = domain->primary->ops.freeze_late(dev); + else + ret = pm_generic_freeze_late(dev); + + if (ret || !swnode->node->pm->freeze_late) + return ret; + + return swnode->node->pm->freeze_late(dev); +} + +static int software_node_thaw_early(struct device *dev) +{ + struct swnode_pm_domain *domain = to_swnode_pm_domain(dev->pm_domain); + struct swnode *swnode = dev_to_swnode(dev); + int ret; + + if (swnode->node->pm->thaw_early) { + ret = swnode->node->pm->thaw_early(dev); + if (ret) + return ret; + } + + if (domain->primary && domain->primary->ops.thaw_early) + ret = domain->primary->ops.thaw_early(dev); + else + ret = pm_generic_thaw_early(dev); + + return ret; +} + +static int software_node_poweroff_late(struct device *dev) +{ + struct swnode_pm_domain *domain = to_swnode_pm_domain(dev->pm_domain); + struct swnode *swnode = dev_to_swnode(dev); + int ret; + + if (domain->primary && domain->primary->ops.poweroff_late) + ret = domain->primary->ops.poweroff_late(dev); + else + ret = pm_generic_poweroff_late(dev); + + if (ret || !swnode->node->pm->poweroff_late) + return ret; + + return swnode->node->pm->poweroff(dev); +} + +static int software_node_restore_early(struct device *dev) +{ + struct swnode_pm_domain *domain = to_swnode_pm_domain(dev->pm_domain); + struct swnode *swnode = dev_to_swnode(dev); + int ret; + + if (swnode->node->pm->restore) { + ret = swnode->node->pm->restore_early(dev); + if (ret) + return ret; + } + + if (domain->primary && domain->primary->ops.restore_early) + ret = domain->primary->ops.restore_early(dev); + else + ret = pm_generic_restore_early(dev); + + return ret; +} + +static int software_node_suspend_noirq(struct device *dev) +{ + struct swnode_pm_domain *domain = to_swnode_pm_domain(dev->pm_domain); + struct swnode *swnode = dev_to_swnode(dev); + int ret; + + if (domain->primary && domain->primary->ops.suspend_noirq) + ret = domain->primary->ops.suspend_noirq(dev); + else + ret = pm_generic_suspend_noirq(dev); + + if (ret || !swnode->node->pm->suspend_noirq) + return ret; + + return swnode->node->pm->suspend_noirq(dev); +} + +static int software_node_resume_noirq(struct device *dev) +{ + struct swnode_pm_domain *domain = to_swnode_pm_domain(dev->pm_domain); + struct swnode *swnode = dev_to_swnode(dev); + int ret; + + if (swnode->node->pm->resume_noirq) { + ret = swnode->node->pm->resume_noirq(dev); + if (ret) + return ret; + } + + if (domain->primary && domain->primary->ops.resume_noirq) + ret = domain->primary->ops.resume_noirq(dev); + else + ret = pm_generic_resume_noirq(dev); + + return ret; +} + +static int software_node_freeze_noirq(struct device *dev) +{ + struct swnode_pm_domain *domain = to_swnode_pm_domain(dev->pm_domain); + struct swnode *swnode = dev_to_swnode(dev); + int ret; + + if (domain->primary && domain->primary->ops.freeze_noirq) + ret = domain->primary->ops.freeze_noirq(dev); + else + ret = pm_generic_freeze_noirq(dev); + + if (ret || !swnode->node->pm->freeze_noirq) + return ret; + + return swnode->node->pm->freeze_noirq(dev); +} + +static int software_node_thaw_noirq(struct device *dev) +{ + struct swnode_pm_domain *domain = to_swnode_pm_domain(dev->pm_domain); + struct swnode *swnode = dev_to_swnode(dev); + int ret; + + if (swnode->node->pm->thaw_noirq) { + ret = swnode->node->pm->thaw_noirq(dev); + if (ret) + return ret; + } + + if (domain->primary && domain->primary->ops.thaw_noirq) + ret = domain->primary->ops.thaw_noirq(dev); + else + ret = pm_generic_thaw_noirq(dev); + + return ret; +} + +static int software_node_poweroff_noirq(struct device *dev) +{ + struct swnode_pm_domain *domain = to_swnode_pm_domain(dev->pm_domain); + struct swnode *swnode = dev_to_swnode(dev); + int ret; + + if (domain->primary && domain->primary->ops.poweroff_noirq) + ret = domain->primary->ops.poweroff_noirq(dev); + else + ret = pm_generic_poweroff_noirq(dev); + + if (ret || !swnode->node->pm->poweroff) + return ret; + + return swnode->node->pm->poweroff_noirq(dev); +} + +static int software_node_restore_noirq(struct device *dev) +{ + struct swnode_pm_domain *domain = to_swnode_pm_domain(dev->pm_domain); + struct swnode *swnode = dev_to_swnode(dev); + int ret; + + if (swnode->node->pm->restore_noirq) { + ret = swnode->node->pm->restore_noirq(dev); + if (ret) + return ret; + } + + if (domain->primary && domain->primary->ops.restore_noirq) + ret = domain->primary->ops.restore_noirq(dev); + else + ret = pm_generic_restore_noirq(dev); + + return ret; +} +#endif /* CONFIG_PM_SLEEP */ + +static const struct dev_pm_ops software_node_pm_ops = { + .runtime_suspend = software_node_runtime_suspend, + .runtime_resume = software_node_runtime_resume, + .runtime_idle = software_node_runtime_idle, +#ifdef CONFIG_PM_SLEEP + .prepare = software_node_prepare, + .complete = software_node_complete, + .suspend = software_node_suspend, + .resume = software_node_resume, + .freeze = software_node_freeze, + .thaw = software_node_thaw, + .poweroff = software_node_poweroff, + .restore = software_node_restore, + .suspend_late = software_node_suspend_late, + .resume_early = software_node_resume_early, + .freeze_late = software_node_freeze_late, + .thaw_early = software_node_thaw_early, + .poweroff_late = software_node_poweroff_late, + .restore_early = software_node_restore_early, + .suspend_noirq = software_node_suspend_noirq, + .resume_noirq = software_node_resume_noirq, + .freeze_noirq = software_node_freeze_noirq, + .thaw_noirq = software_node_thaw_noirq, + .poweroff_noirq = software_node_poweroff_noirq, + .restore_noirq = software_node_restore_noirq, +#endif /* CONFIG_PM_SLEEP */ +}; + +static void software_node_dev_pm_detach(struct device *dev, bool power_off) +{ + struct swnode_pm_domain *domain = to_swnode_pm_domain(dev->pm_domain); + + if (domain->primary && domain->primary->detach) { + dev->pm_domain = domain->primary; + domain->primary->detach(dev, power_off); + } else { + dev_pm_domain_set(dev, NULL); + } + + kfree(domain); +} + +int software_node_dev_pm_attach(struct device *dev, bool power_on) +{ + struct swnode *swnode = dev_to_swnode(dev); + struct swnode_pm_domain *domain; + + if (!swnode || !swnode->node->pm) + return 0; + + domain = kzalloc(sizeof(*domain), GFP_KERNEL); + if (!domain) + return -ENOMEM; + + if (dev->pm_domain) + domain->pm_domain = *dev->pm_domain; + + domain->primary = dev->pm_domain; + domain->pm_domain.ops = software_node_pm_ops; + domain->pm_domain.detach = software_node_dev_pm_detach; + + dev_pm_domain_set(dev, &domain->pm_domain); + + return 0; +} +EXPORT_SYMBOL_GPL(software_node_dev_pm_attach); +#endif /* CONFIG_PM */ + /* -------------------------------------------------------------------------- */ /* fwnode operations */ @@ -845,20 +1358,13 @@ EXPORT_SYMBOL_GPL(fwnode_remove_software_node); int software_node_notify(struct device *dev, unsigned long action) { - struct fwnode_handle *fwnode = dev_fwnode(dev); struct swnode *swnode; int ret; - if (!fwnode) - return 0; - - if (!is_software_node(fwnode)) - fwnode = fwnode->secondary; - if (!is_software_node(fwnode)) + swnode = dev_to_swnode(dev); + if (!swnode) return 0; - swnode = to_swnode(fwnode); - switch (action) { case KOBJ_ADD: ret = sysfs_create_link(&dev->kobj, &swnode->kobj, diff --git a/include/linux/property.h b/include/linux/property.h index 9f805c4428195..4a2e0edb78275 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -426,11 +426,13 @@ int fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode, * @name: Name of the software node * @parent: Parent of the software node * @properties: Array of device properties + * @pm: Power management operations */ struct software_node { const char *name; const struct software_node *parent; const struct property_entry *properties; + const struct dev_pm_ops *pm; }; bool is_software_node(const struct fwnode_handle *fwnode); @@ -452,6 +454,14 @@ int software_node_register(const struct software_node *node); void software_node_unregister(const struct software_node *node); int software_node_notify(struct device *dev, unsigned long action); +#ifdef CONFIG_PM +int software_node_dev_pm_attach(struct device *dev, bool power_on); +#else +static inline int software_node_dev_pm_attach(struct device *dev, bool power_on) +{ + return 0; +} +#endif /* CONFIG_PM */ struct fwnode_handle * fwnode_create_software_node(const struct property_entry *properties, From patchwork Tue Aug 25 13:59:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heikki Krogerus X-Patchwork-Id: 251703 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F96DC433DF for ; Tue, 25 Aug 2020 14:00:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2628520665 for ; Tue, 25 Aug 2020 14:00:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726432AbgHYOAk (ORCPT ); Tue, 25 Aug 2020 10:00:40 -0400 Received: from mga06.intel.com ([134.134.136.31]:59248 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726617AbgHYOAA (ORCPT ); Tue, 25 Aug 2020 10:00:00 -0400 IronPort-SDR: XPE+FM/tUJ+s1G5arXB+/fVUovOenPFgla/Aq32wKMQYMz2YKrlIm/2PR4soHpTCTzmjC8az4X kFupwjGB3Hmg== X-IronPort-AV: E=McAfee;i="6000,8403,9723"; a="217659393" X-IronPort-AV: E=Sophos;i="5.76,352,1592895600"; d="scan'208";a="217659393" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Aug 2020 06:59:59 -0700 IronPort-SDR: pDQXdFwToNlKkfdblllbE+aoEzT+aMTv9gRygqxsV/hlIxVFKPzG9hQ0Boa00BqvIfPOwMUsiQ OY4WjPvF6d2A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,352,1592895600"; d="scan'208";a="402725580" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 25 Aug 2020 06:59:57 -0700 From: Heikki Krogerus To: "Rafael J. Wysocki" , Felipe Balbi Cc: Andy Shevchenko , Sakari Ailus , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, linux-acpi@vger.kernel.org Subject: [PATCH 2/3] software node: Introduce device_add_software_node() Date: Tue, 25 Aug 2020 16:59:50 +0300 Message-Id: <20200825135951.53340-3-heikki.krogerus@linux.intel.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200825135951.53340-1-heikki.krogerus@linux.intel.com> References: <20200825135951.53340-1-heikki.krogerus@linux.intel.com> MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org This helper will register a software node and then assign it to device at the same time. The function will also make sure that the device can't have more than one software node. Signed-off-by: Heikki Krogerus --- drivers/base/swnode.c | 45 ++++++++++++++++++++++++++++++++++++++++ include/linux/property.h | 3 +++ 2 files changed, 48 insertions(+) diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c index 9a13a61a2f0bb..ec14f02565a65 100644 --- a/drivers/base/swnode.c +++ b/drivers/base/swnode.c @@ -1356,6 +1356,51 @@ void fwnode_remove_software_node(struct fwnode_handle *fwnode) } EXPORT_SYMBOL_GPL(fwnode_remove_software_node); +/** + * device_add_software_node - Assign software node to a device + * @dev: The device the software node is meant for. + * @swnode: The software node. + * + * This function will register @swnode and make it the secondary firmware node + * pointer of @dev. If @dev has no primary node, then @swnode will become the primary + * node. + */ +int device_add_software_node(struct device *dev, const struct software_node *swnode) +{ + int ret; + + /* Only one software node per device. */ + if (dev_to_swnode(dev)) + return -EBUSY; + + ret = software_node_register(swnode); + if (ret) + return ret; + + set_secondary_fwnode(dev, software_node_fwnode(swnode)); + + return 0; +} +EXPORT_SYMBOL_GPL(device_add_software_node); + +/** + * device_remove_software_node - Remove device's software node + * @dev: The device with the software node. + * + * This function will unregister the software node of @dev. + */ +void device_remove_software_node(struct device *dev) +{ + struct swnode *swnode; + + swnode = dev_to_swnode(dev); + if (!swnode) + return; + + kobject_put(&swnode->kobj); +} +EXPORT_SYMBOL_GPL(device_remove_software_node); + int software_node_notify(struct device *dev, unsigned long action) { struct swnode *swnode; diff --git a/include/linux/property.h b/include/linux/property.h index 4a2e0edb78275..5f84286183f9a 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -468,4 +468,7 @@ fwnode_create_software_node(const struct property_entry *properties, const struct fwnode_handle *parent); void fwnode_remove_software_node(struct fwnode_handle *fwnode); +int device_add_software_node(struct device *dev, const struct software_node *swnode); +void device_remove_software_node(struct device *dev); + #endif /* _LINUX_PROPERTY_H_ */