From patchwork Fri Nov 21 01:35:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Likely X-Patchwork-Id: 41269 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 141CD25AEA for ; Fri, 21 Nov 2014 01:36:09 +0000 (UTC) Received: by mail-wg0-f72.google.com with SMTP id y19sf2381541wgg.7 for ; Thu, 20 Nov 2014 17:36:08 -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=vlwXZwHVQdhJFCTl3iBxFzso82R+YRjhkBZabkbCT6Q=; b=Dc4lP3UVXmB2sXPpKK9yHR4iPNFC4T5lJTUwij0p9Un+Tb1BnwmAKfUJG1EEO36FQN BT8DTuwoVsCpZNs9sDTx2uzzp3lfEd4SBJ5omd7xTFaEMoBmjW5cXLm4Dcf6kx9mGWWS 6KrPTwY1zhTpNQXGEGBSLS1YJsEXUsHiGpxxsXyNV5uBPJk+Qjgjn6WZ/ZSAK7vlns4Z 8AAsyLSq2Qm7prPtP4en/LzsWIyj0b8qQTdcidmZUhWFKY7WmWyOJslxguNOKnsjAZ8d IRMXY0HjcQ47TPG8REFnjoT3cUypWSzuE74xpIymbpuJI4cxulOVChOT5W3GdlknEAsY hnyA== X-Gm-Message-State: ALoCoQlEUDCzX9Hcf8eJ0nnt4zu00+2tSm30eMm+KEQXAbYRH3pJW4f8EOtuAo4pvD5rAa9xLsty X-Received: by 10.112.130.8 with SMTP id oa8mr510420lbb.11.1416533768074; Thu, 20 Nov 2014 17:36:08 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.4.132 with SMTP id k4ls136483lak.12.gmail; Thu, 20 Nov 2014 17:36:07 -0800 (PST) X-Received: by 10.112.148.5 with SMTP id to5mr1366179lbb.16.1416533767546; Thu, 20 Nov 2014 17:36:07 -0800 (PST) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id da8si3513144lad.97.2014.11.20.17.36.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Nov 2014 17:36:07 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by mail-la0-f49.google.com with SMTP id hs14so3332168lab.8 for ; Thu, 20 Nov 2014 17:36:07 -0800 (PST) X-Received: by 10.152.8.170 with SMTP id s10mr1346655laa.56.1416533767425; Thu, 20 Nov 2014 17:36:07 -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 ew9csp369193lbc; Thu, 20 Nov 2014 17:36:06 -0800 (PST) X-Received: by 10.68.211.135 with SMTP id nc7mr2462995pbc.44.1416533765838; Thu, 20 Nov 2014 17:36:05 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pc9si5928130pac.24.2014.11.20.17.36.05 for ; Thu, 20 Nov 2014 17:36:05 -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 S932418AbaKUBfk (ORCPT + 26 others); Thu, 20 Nov 2014 20:35:40 -0500 Received: from mail-wg0-f50.google.com ([74.125.82.50]:33066 "EHLO mail-wg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756487AbaKUBfd (ORCPT ); Thu, 20 Nov 2014 20:35:33 -0500 Received: by mail-wg0-f50.google.com with SMTP id k14so5272201wgh.9 for ; Thu, 20 Nov 2014 17:35:32 -0800 (PST) X-Received: by 10.194.134.234 with SMTP id pn10mr2504457wjb.34.1416533732004; Thu, 20 Nov 2014 17:35:32 -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 dc8sm6515938wib.7.2014.11.20.17.35.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Nov 2014 17:35:30 -0800 (PST) Received: by trevor.secretlab.ca (Postfix, from userid 1000) id E0C99C416AF; Fri, 21 Nov 2014 01:35:21 +0000 (GMT) From: Grant Likely To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Pantelis Antoniou Cc: Rob Herring , Grant Likely Subject: [PATCH 6/8] of/platform: Add OF_DYNAMIC notifier handler Date: Fri, 21 Nov 2014 01:35:13 +0000 Message-Id: <1416533715-9758-7-git-send-email-grant.likely@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1416533715-9758-1-git-send-email-grant.likely@linaro.org> References: <1416533715-9758-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.215.49 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 | 78 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/of_platform.h | 10 ++++++ 3 files changed, 89 insertions(+) diff --git a/drivers/base/platform.c b/drivers/base/platform.c index b2afc29403f9..c4c02c0e42b6 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); + WARN_ON(of_platform_register_reconfig_notifier() != 0); return error; } diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 656cccf0e680..b6d9a406a75d 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -550,4 +550,82 @@ void of_platform_depopulate(struct device *parent) } EXPORT_SYMBOL_GPL(of_platform_depopulate); +#ifdef CONFIG_OF_DYNAMIC + +static struct notifier_block platform_of_notifier; + +static int of_platform_notify(struct notifier_block *nb, + unsigned long action, void *arg) +{ + struct platform_device *pdev_parent, *pdev; + struct device_node *dn; + int state; + bool children_left; + + state = of_reconfig_get_state_change(action, arg); + + /* no change? */ + if (state == -1) + return NOTIFY_OK; + + switch (action) { + case OF_RECONFIG_ATTACH_NODE: + case OF_RECONFIG_DETACH_NODE: + dn = arg; + break; + case OF_RECONFIG_ADD_PROPERTY: + case OF_RECONFIG_REMOVE_PROPERTY: + case OF_RECONFIG_UPDATE_PROPERTY: + dn = ((struct of_prop_reconfig *)arg)->dn; + break; + default: + return NOTIFY_OK; + } + + if (state) { + + /* verify that the parent is a bus */ + if (!of_node_check_flag(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(dn->parent); + pdev = of_platform_device_create(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__, dn->full_name); + /* of_platform_device_create tosses the error code */ + return notifier_from_errno(-EINVAL); + } + + } else { + + /* find our device by node */ + pdev = of_find_device_by_node(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); + + } + + return NOTIFY_OK; +} + +int of_platform_register_reconfig_notifier(void) +{ + platform_of_notifier.notifier_call = of_platform_notify; + return of_reconfig_notifier_register(&platform_of_notifier); +} +EXPORT_SYMBOL_GPL(of_platform_register_reconfig_notifier); + +#endif + #endif /* CONFIG_OF_ADDRESS */ diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h index c2b0627a2317..01fe5d6345fb 100644 --- a/include/linux/of_platform.h +++ b/include/linux/of_platform.h @@ -84,4 +84,14 @@ 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 int of_platform_register_reconfig_notifier(void); +#else +static inline int of_platform_register_reconfig_notifier(void) +{ + return 0; +} +#endif + + #endif /* _LINUX_OF_PLATFORM_H */