From patchwork Tue Oct 28 20:36:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pantelis Antoniou X-Patchwork-Id: 5179751 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8A3E1C11AC for ; Tue, 28 Oct 2014 20:42:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 75D4A2017A for ; Tue, 28 Oct 2014 20:42:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 628BE2016C for ; Tue, 28 Oct 2014 20:42:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751602AbaJ1UmB (ORCPT ); Tue, 28 Oct 2014 16:42:01 -0400 Received: from mail-wg0-f42.google.com ([74.125.82.42]:38801 "EHLO mail-wg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751377AbaJ1UmA (ORCPT ); Tue, 28 Oct 2014 16:42:00 -0400 Received: by mail-wg0-f42.google.com with SMTP id k14so1842846wgh.1 for ; Tue, 28 Oct 2014 13:41:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=InRgnenSGLC/+UqOb7IzY2NHTJMgZOCfblCUbjUX9TQ=; b=ZMyNtXGDizehfsmg5ykgl7HmvD43+gOFjHDBCg4I4RrUvTwc89cxrY6m5JLDojDKiu JoaD6QXKhtmjKGqeYwQucVCkUEN5DfcREECMpceUDADZGT9My3+Ipo/pKH+hIjS5lHnv lEjztEQhLPUsmXmtkuXUYye1/tFmLIi6XogEvfEeMgWVnOdjbrWR3sbgC36rS5kKKWrK zTeZ7GWOYSk5MnKbpTE+78z/XGIxVDc0/51xf2EI5zOuE2pE00OL8NI22oTgsY98bh4/ XWUnXPte3C08w5jaP/jX2pETMyqH9ubLG9lCE0QlMgOwDbMD/tT1jCE88uJ0GVhN5z5g 0CKw== X-Gm-Message-State: ALoCoQnlmkhtimfFjwHntP2Tmd92dfydQj8NhOEItAbXif9VXpGL8L4Us5EcO2qszuzVa11Wcz5M X-Received: by 10.180.198.234 with SMTP id jf10mr30607006wic.68.1414528593229; Tue, 28 Oct 2014 13:36:33 -0700 (PDT) Received: from sles11esa.localdomain ([195.97.110.117]) by mx.google.com with ESMTPSA id td9sm3371380wic.15.2014.10.28.13.36.28 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 28 Oct 2014 13:36:32 -0700 (PDT) From: Pantelis Antoniou To: Grant Likely Cc: Rob Herring , Stephen Warren , Matt Porter , Koen Kooi , Greg Kroah-Hartman , Alison Chaiken , Dinh Nguyen , Jan Lubbe , Alexander Sverdlin , Michael Stickel , Guenter Roeck , Dirk Behme , Alan Tull , Sascha Hauer , Michael Bohan , Ionut Nicu , Michal Simek , Matt Ranostay , Joel Becker , devicetree@vger.kernel.org, Wolfram Sang , linux-i2c@vger.kernel.org, Mark Brown , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Pete Popov , Dan Malek , Georgi Vlaev , Pantelis Antoniou , Pantelis Antoniou Subject: [PATCH v8 4/8] OF: platform: Add OF notifier handler Date: Tue, 28 Oct 2014 22:36:01 +0200 Message-Id: <1414528565-10907-5-git-send-email-pantelis.antoniou@konsulko.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1414528565-10907-1-git-send-email-pantelis.antoniou@konsulko.com> References: <1414528565-10907-1-git-send-email-pantelis.antoniou@konsulko.com> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- drivers/base/platform.c | 18 +++++++++-- drivers/of/platform.c | 78 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/of_platform.h | 10 ++++++ 3 files changed, 103 insertions(+), 3 deletions(-) diff --git a/drivers/base/platform.c b/drivers/base/platform.c index b2afc29..282bfec 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -1002,10 +1002,22 @@ int __init platform_bus_init(void) error = device_register(&platform_bus); if (error) - return error; - error = bus_register(&platform_bus_type); + goto err_out; + + error = bus_register(&platform_bus_type); + if (error) + goto err_unreg_dev; + + error = of_platform_register_reconfig_notifier(); if (error) - device_unregister(&platform_bus); + goto err_unreg_bus; + + return 0; +err_unreg_bus: + bus_unregister(&platform_bus_type); +err_unreg_dev: + device_unregister(&platform_bus); +err_out: return error; } diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 3b64d0b..aa8db92 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -546,4 +546,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_match_node(of_default_bus_match_table, dn->parent)) + 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 c2b0627..01fe5d6 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 */