From patchwork Fri Nov 21 01:35:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Likely X-Patchwork-Id: 41273 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 E49E125AEA for ; Fri, 21 Nov 2014 01:37:55 +0000 (UTC) Received: by mail-wg0-f72.google.com with SMTP id y19sf2386783wgg.3 for ; Thu, 20 Nov 2014 17:37:55 -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=vesE4YIqZ83g4OmxcZSdOyTEcsaJQau9eJx/CN9e+40=; b=l2Qmwq2d9GIT0h9YC/oeU8WuRDaGj6KvvF4/hUN/a9Z060Nk8BbAS6fuPo4qlJzZPV Al3b0xBkbErclwyU2yixyIE68GNU0YsEagWgZSST2Y0oPdhCrRa5gjTohAc5TW+Rhdyv 6z8l2RQoyEFLVYFUaKnwG7E/VRyBXmGIetTOIEhsIeHLZYxij6Tyc4PsFgU7pCJ7EU+a r3dBH6k9uMKcMAWgfLWkuqNBgL9jHlxXlgkLLhKle2aP4nGgvZPLVDvzUOxuolInq37E rV11SzrDqd4OU1pWFWHfZjr5yV/vQuA/FYrLFMeHcvetcsA6ph7WrWRGJdxqvR5XUNGm fHoQ== X-Gm-Message-State: ALoCoQk5BFIBJCPVUe7WbTk6gZh37rA0RED42G1gQuw/UcrXMCQovncwzBjcwYsVuS2IS5BwZu3H X-Received: by 10.194.176.106 with SMTP id ch10mr8642wjc.6.1416533875205; Thu, 20 Nov 2014 17:37:55 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.129 with SMTP id t1ls143088lag.53.gmail; Thu, 20 Nov 2014 17:37:54 -0800 (PST) X-Received: by 10.152.10.143 with SMTP id i15mr1311364lab.5.1416533874415; Thu, 20 Nov 2014 17:37:54 -0800 (PST) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id wz10si3503684lbb.109.2014.11.20.17.37.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Nov 2014 17:37:54 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by mail-la0-f51.google.com with SMTP id mc6so3448421lab.38 for ; Thu, 20 Nov 2014 17:37:54 -0800 (PST) X-Received: by 10.152.8.170 with SMTP id s10mr1351478laa.56.1416533874290; Thu, 20 Nov 2014 17:37:54 -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 ew9csp369353lbc; Thu, 20 Nov 2014 17:37:53 -0800 (PST) X-Received: by 10.68.194.199 with SMTP id hy7mr2155522pbc.17.1416533872730; Thu, 20 Nov 2014 17:37:52 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id tf10si5628789pac.186.2014.11.20.17.37.52 for ; Thu, 20 Nov 2014 17:37:52 -0800 (PST) Received-SPF: none (google.com: devicetree-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 S1757162AbaKUBhv (ORCPT + 4 others); Thu, 20 Nov 2014 20:37:51 -0500 Received: from mail-wi0-f173.google.com ([209.85.212.173]:59843 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757054AbaKUBfb (ORCPT ); Thu, 20 Nov 2014 20:35:31 -0500 Received: by mail-wi0-f173.google.com with SMTP id r20so10546396wiv.6 for ; Thu, 20 Nov 2014 17:35:29 -0800 (PST) X-Received: by 10.194.9.1 with SMTP id v1mr2281992wja.124.1416533729833; Thu, 20 Nov 2014 17:35:29 -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 ec2sm6481184wib.23.2014.11.20.17.35.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Nov 2014 17:35:28 -0800 (PST) Received: by trevor.secretlab.ca (Postfix, from userid 1000) id D73ADC41610; 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 4/8] of: Add of_reconfig_get_state_change() of notifier helper. Date: Fri, 21 Nov 2014 01:35:11 +0000 Message-Id: <1416533715-9758-5-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: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@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.51 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 Introduce of_reconfig_get_state_change() which allows an of notifier to query about device state changes. Signed-off-by: Pantelis Antoniou Signed-off-by: Grant Likely --- drivers/of/dynamic.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/of.h | 1 + 2 files changed, 97 insertions(+) diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c index 7c095bffef3a..7634c2f69d4a 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -85,6 +85,102 @@ int of_reconfig_notify(unsigned long action, void *p) return notifier_to_errno(rc); } +/* + * of_reconfig_get_state_change() - Returns new state of device + * @action - action of the of notifier + * @arg - argument of the of notifier + * + * Returns the new state of a device based on the notifier used. + * Returns 0 on device going from enabled to disabled, 1 on device + * going from disabled to enabled and -1 on no change. + */ +int of_reconfig_get_state_change(unsigned long action, void *arg) +{ + struct device_node *dn; + struct property *prop, *old_prop; + struct of_prop_reconfig *pr; + int is_status, status_state, old_status_state, prev_state, new_state; + + /* figure out if a device should be created or destroyed */ + dn = NULL; + prop = old_prop = NULL; + switch (action) { + case OF_RECONFIG_ATTACH_NODE: + case OF_RECONFIG_DETACH_NODE: + dn = arg; + prop = of_find_property(dn, "status", NULL); + break; + case OF_RECONFIG_ADD_PROPERTY: + case OF_RECONFIG_REMOVE_PROPERTY: + pr = arg; + dn = pr->dn; + prop = pr->prop; + break; + case OF_RECONFIG_UPDATE_PROPERTY: + pr = arg; + dn = pr->dn; + prop = pr->prop; + old_prop = pr->old_prop; + break; + default: + return -1; /* don't care */ + } + + is_status = 0; + status_state = -1; + old_status_state = -1; + prev_state = -1; + new_state = -1; + + if (prop && !strcmp(prop->name, "status")) { + is_status = 1; + status_state = !strcmp(prop->value, "okay") || + !strcmp(prop->value, "ok"); + if (old_prop) + old_status_state = !strcmp(old_prop->value, "okay") || + !strcmp(old_prop->value, "ok"); + } + + switch (action) { + case OF_RECONFIG_ATTACH_NODE: + prev_state = 0; + /* -1 & 0 status either missing or okay */ + new_state = status_state != 0; + break; + case OF_RECONFIG_DETACH_NODE: + /* -1 & 0 status either missing or okay */ + prev_state = status_state != 0; + new_state = 0; + break; + case OF_RECONFIG_ADD_PROPERTY: + if (is_status) { + /* no status property -> enabled (legacy) */ + prev_state = 1; + new_state = status_state; + } + break; + case OF_RECONFIG_REMOVE_PROPERTY: + if (is_status) { + prev_state = status_state; + /* no status property -> enabled (legacy) */ + new_state = 1; + } + break; + case OF_RECONFIG_UPDATE_PROPERTY: + if (is_status) { + prev_state = old_status_state != 0; + new_state = status_state != 0; + } + break; + } + + if (prev_state == new_state) + return -1; + + return new_state; +} +EXPORT_SYMBOL_GPL(of_reconfig_get_state_change); + int of_property_notify(int action, struct device_node *np, struct property *prop, struct property *oldprop) { diff --git a/include/linux/of.h b/include/linux/of.h index 27635c89d8c2..96f678515d8f 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -327,6 +327,7 @@ struct of_prop_reconfig { extern int of_reconfig_notifier_register(struct notifier_block *); extern int of_reconfig_notifier_unregister(struct notifier_block *); extern int of_reconfig_notify(unsigned long, void *); +extern int of_reconfig_get_state_change(unsigned long action, void *arg); extern int of_attach_node(struct device_node *); extern int of_detach_node(struct device_node *);