From patchwork Mon Nov 24 22:33:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Likely X-Patchwork-Id: 41429 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A282025E23 for ; Mon, 24 Nov 2014 22:36:32 +0000 (UTC) Received: by mail-wg0-f70.google.com with SMTP id b13sf5938793wgh.1 for ; Mon, 24 Nov 2014 14:36:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=7v1GEy9ZCdXZcYq4FENBOgQ8INNYVGFBWun3siNjFQw=; b=SmMrKGqXDkzkI/7n4lT5CTTWClYXbc6YXZP5Y52O5olUPRkqZhcYJO6vZuVwPL39fj mKvMK5wrnubPFwkP1fvsy7taBUzNquJk10vx1XoW5+SoFUwdRRe9yR8nsd8zaGYLo5/b 0ybYPInkviiRrRweBsWWa/Pm9mn72uSS+UPj8AgFbeH/sLgHNNh8pL86gOuE1Mc7pKpW E+O9sl6ubBIOO7S/IIeCXvMtAlLBrfY1sc0w71zkk0kVZlY1S1RxOeudrbGO7nMYp4aT HLGGaV1gpKzr8+82dcho+cqOenKpI6birwBN6gWDF3ao8lR0Zi2T8i11kLWlIHfBMxhg Uvsg== X-Gm-Message-State: ALoCoQkDY038AAKMxD9/Z+O51AK0gVPQ9bncrLjyCv5INKlSu3KaBvIr9TkwLY0ZTuvF2SGd8MN7 X-Received: by 10.181.13.147 with SMTP id ey19mr4649395wid.2.1416868591849; Mon, 24 Nov 2014 14:36:31 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.226 with SMTP id b2ls448753lak.36.gmail; Mon, 24 Nov 2014 14:36:31 -0800 (PST) X-Received: by 10.152.37.100 with SMTP id x4mr22937041laj.22.1416868591648; Mon, 24 Nov 2014 14:36:31 -0800 (PST) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id r6si8563818laa.10.2014.11.24.14.36.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 24 Nov 2014 14:36:31 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by mail-lb0-f179.google.com with SMTP id z11so3494029lbi.10 for ; Mon, 24 Nov 2014 14:36:31 -0800 (PST) X-Received: by 10.152.8.170 with SMTP id s10mr22864783laa.56.1416868591542; Mon, 24 Nov 2014 14:36:31 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp347900lbc; Mon, 24 Nov 2014 14:36:30 -0800 (PST) X-Received: by 10.68.131.163 with SMTP id on3mr36675038pbb.169.1416868589700; Mon, 24 Nov 2014 14:36:29 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cc14si23587649pac.137.2014.11.24.14.36.29 for ; Mon, 24 Nov 2014 14:36:29 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751858AbaKXWg0 (ORCPT + 26 others); Mon, 24 Nov 2014 17:36:26 -0500 Received: from mail-wg0-f50.google.com ([74.125.82.50]:64473 "EHLO mail-wg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751304AbaKXWeN (ORCPT ); Mon, 24 Nov 2014 17:34:13 -0500 Received: by mail-wg0-f50.google.com with SMTP id k14so13679562wgh.9 for ; Mon, 24 Nov 2014 14:34:12 -0800 (PST) X-Received: by 10.194.89.129 with SMTP id bo1mr38629859wjb.29.1416868452232; Mon, 24 Nov 2014 14:34:12 -0800 (PST) Received: from trevor.secretlab.ca (host86-166-84-117.range86-166.btcentralplus.com. [86.166.84.117]) by mx.google.com with ESMTPSA id dx8sm253341wib.2.2014.11.24.14.34.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Nov 2014 14:34:10 -0800 (PST) Received: by trevor.secretlab.ca (Postfix, from userid 1000) id B2FA8C44212; Mon, 24 Nov 2014 22:33:45 +0000 (GMT) From: Grant Likely To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Pantelis Antoniou Cc: Rob Herring , Mark Brown , Wolfram Sang , Grant Likely Subject: [PATCH v2 08/14] of/reconfig: Add OF_DYNAMIC notifier for platform_bus_type Date: Mon, 24 Nov 2014 22:33:36 +0000 Message-Id: <1416868422-22103-9-git-send-email-grant.likely@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1416868422-22103-1-git-send-email-grant.likely@linaro.org> References: <1416868422-22103-1-git-send-email-grant.likely@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: grant.likely@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Pantelis Antoniou Add OF notifier handler needed for creating/destroying platform devices according to dynamic runtime changes in the DT live tree. Signed-off-by: Pantelis Antoniou Signed-off-by: Grant Likely --- drivers/base/platform.c | 1 + drivers/of/platform.c | 55 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/of_platform.h | 6 +++++ 3 files changed, 62 insertions(+) diff --git a/drivers/base/platform.c b/drivers/base/platform.c index b2afc29403f9..233ececd15a3 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -1006,6 +1006,7 @@ int __init platform_bus_init(void) error = bus_register(&platform_bus_type); if (error) device_unregister(&platform_bus); + of_platform_register_reconfig_notifier(); return error; } diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 656cccf0e680..cd87a36495be 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -550,4 +550,59 @@ void of_platform_depopulate(struct device *parent) } EXPORT_SYMBOL_GPL(of_platform_depopulate); +#ifdef CONFIG_OF_DYNAMIC +static int of_platform_notify(struct notifier_block *nb, + unsigned long action, void *arg) +{ + struct of_reconfig_data *rd = arg; + struct platform_device *pdev_parent, *pdev; + bool children_left; + + switch (of_reconfig_get_state_change(action, rd)) { + case OF_RECONFIG_CHANGE_ADD: + /* verify that the parent is a bus */ + if (!of_node_check_flag(rd->dn->parent, OF_POPULATED_BUS)) + return NOTIFY_OK; /* not for us */ + + /* pdev_parent may be NULL when no bus platform device */ + pdev_parent = of_find_device_by_node(rd->dn->parent); + pdev = of_platform_device_create(rd->dn, NULL, + pdev_parent ? &pdev_parent->dev : NULL); + of_dev_put(pdev_parent); + + if (pdev == NULL) { + pr_err("%s: failed to create for '%s'\n", + __func__, rd->dn->full_name); + /* of_platform_device_create tosses the error code */ + return notifier_from_errno(-EINVAL); + } + break; + + case OF_RECONFIG_CHANGE_REMOVE: + /* find our device by node */ + pdev = of_find_device_by_node(rd->dn); + if (pdev == NULL) + return NOTIFY_OK; /* no? not meant for us */ + + /* unregister takes one ref away */ + of_platform_device_destroy(&pdev->dev, &children_left); + + /* and put the reference of the find */ + of_dev_put(pdev); + break; + } + + return NOTIFY_OK; +} + +static struct notifier_block platform_of_notifier = { + .notifier_call = of_platform_notify, +}; + +void of_platform_register_reconfig_notifier(void) +{ + WARN_ON(of_reconfig_notifier_register(&platform_of_notifier)); +} +#endif /* CONFIG_OF_DYNAMIC */ + #endif /* CONFIG_OF_ADDRESS */ diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h index c2b0627a2317..8a860f096c35 100644 --- a/include/linux/of_platform.h +++ b/include/linux/of_platform.h @@ -84,4 +84,10 @@ static inline int of_platform_populate(struct device_node *root, static inline void of_platform_depopulate(struct device *parent) { } #endif +#ifdef CONFIG_OF_DYNAMIC +extern void of_platform_register_reconfig_notifier(void); +#else +static inline void of_platform_register_reconfig_notifier(void) { } +#endif + #endif /* _LINUX_OF_PLATFORM_H */