From patchwork Mon Sep 21 14:02:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 7231371 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D26E29F6DA for ; Mon, 21 Sep 2015 14:06:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D69F12068E for ; Mon, 21 Sep 2015 14:06:51 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D05B3207AD for ; Mon, 21 Sep 2015 14:06:50 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ze1hv-0002Yv-RR; Mon, 21 Sep 2015 14:04:39 +0000 Received: from mail-wi0-x231.google.com ([2a00:1450:400c:c05::231]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ze1hL-00024A-D6 for linux-arm-kernel@lists.infradead.org; Mon, 21 Sep 2015 14:04:05 +0000 Received: by wiclk2 with SMTP id lk2so113275844wic.1 for ; Mon, 21 Sep 2015 07:03:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=iLzv7YFqEGev156/ZTYC2DJmz3+gHS1DOJMBh5rewOs=; b=VaW/SopsOaDvK35LOtvQnlSBypEHGs3OD1PHOLxoXCeoV9NLCCijNnrZoRCFyDmSHK IjP+zySAubF3oLP6Dyz1k61nkBTluf9lZEgCIEcFfyduRTLEOPEocOC+gHNnjKAP4k64 ZC8bIWY4SSZ0wzoMsbqTc31uoovWBXvhMGCBPXWq6ElP+tMq484FxvMCgq7/r8O4rQjZ 3WVBWSlGLwhxYsELKcsbvXXJbrYI8HOUo4AErmigWMYsHqa23GbugevBrTbjavApyuck PW4SXOSkTOh9WWYSn45dpHcTAAm7jz7CX3FNoOkH0kXC59p/XZAQJwfqlD5RnyKMVxKY h5qQ== X-Received: by 10.194.220.227 with SMTP id pz3mr1904874wjc.26.1442844219384; Mon, 21 Sep 2015 07:03:39 -0700 (PDT) Received: from cizrna.lan ([109.72.12.69]) by smtp.gmail.com with ESMTPSA id gk9sm13687031wib.9.2015.09.21.07.03.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Sep 2015 07:03:38 -0700 (PDT) From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Subject: [PATCH v6 04/22] of: add function to allow probing a device from a OF node Date: Mon, 21 Sep 2015 16:02:44 +0200 Message-Id: <1442844182-27787-5-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1442844182-27787-1-git-send-email-tomeu.vizoso@collabora.com> References: <1442844182-27787-1-git-send-email-tomeu.vizoso@collabora.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150921_070403_771868_9B946465 X-CRM114-Status: GOOD ( 19.55 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tomeu Vizoso , devicetree@vger.kernel.org, linux-acpi@vger.kernel.org, Arnd Bergmann , Stephen Warren , Greg Kroah-Hartman , Linus Walleij , Dmitry Torokhov , "Rafael J. Wysocki" , Rob Herring , Javier Martinez Canillas , Mark Brown , Thierry Reding , Alan Stern , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Walks the OF tree up and finds the closest ancestor that has a struct device associated with it, probing it if isn't bound to a driver yet. The above should ensure that the dependency represented by the passed OF node is available, because probing a device should cause its descendants to be probed as well (when they get registered). Subsystems can use this when looking up resources for drivers, to reduce the chances of deferred probes because of the probing order of devices. Signed-off-by: Tomeu Vizoso --- Changes in v5: - Move the assignment to device_node->device for AMBA devices to another commit. - Hold a reference to the struct device while it's in use in of_device_probe(). Changes in v4: - Rename of_platform_probe to of_device_probe - Use device_node.device instead of device_node.platform_dev Changes in v3: - Set and use device_node.platform_dev instead of reversing the logic to find the platform device that encloses a device node. - Drop the fwnode API to probe firmware nodes and add OF-only API for now. I think this same scheme could be used for machines with ACPI, but I haven't been able to find one that had to defer its probes because of the device probe order. drivers/of/device.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++ include/linux/of_device.h | 3 +++ 2 files changed, 64 insertions(+) diff --git a/drivers/of/device.c b/drivers/of/device.c index 8b91ea241b10..836be71fc90e 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c @@ -286,3 +286,64 @@ int of_device_uevent_modalias(struct device *dev, struct kobj_uevent_env *env) return 0; } + +/** + * of_device_probe() - Probe device associated with OF node + * @np: node to probe + * + * Probe the device associated with the passed device node. + */ +void of_device_probe(struct device_node *np) +{ + struct device_node *target; + struct device *dev = NULL; + + if (!of_root || !of_node_check_flag(of_root, OF_POPULATED_BUS)) + return; + + if (!np) + return; + + of_node_get(np); + + /* Find the closest ancestor that has a device associated */ + for (target = np; + !of_node_is_root(target); + target = of_get_next_parent(target)) + if (get_device(target->device)) { + dev = target->device; + break; + } + + of_node_put(target); + + if (!dev) { + pr_warn("Couldn't find a device for node '%s'\n", + of_node_full_name(np)); + return; + } + + /* + * Device is bound or is being probed right now. If we have bad luck + * and the dependency isn't ready when it's needed, deferred probe + * will save us. + */ + if (dev->driver) + goto out; + + /* + * Probing a device should cause its descendants to be probed as + * well, which includes the passed device node. + */ + if (device_attach(dev) != 1) + /* + * This cannot be a warning for now because clock nodes have a + * compatible string but the clock framework doesn't follow + * the device/driver model yet. + */ + dev_dbg(dev, "Probe failed for %s\n", of_node_full_name(np)); + +out: + put_device(dev); +} +EXPORT_SYMBOL_GPL(of_device_probe); diff --git a/include/linux/of_device.h b/include/linux/of_device.h index cc7dd687a89d..da8d489e73ad 100644 --- a/include/linux/of_device.h +++ b/include/linux/of_device.h @@ -40,6 +40,7 @@ extern ssize_t of_device_get_modalias(struct device *dev, extern void of_device_uevent(struct device *dev, struct kobj_uevent_env *env); extern int of_device_uevent_modalias(struct device *dev, struct kobj_uevent_env *env); +extern void of_device_probe(struct device_node *np); static inline void of_device_node_put(struct device *dev) { @@ -84,6 +85,8 @@ static inline int of_device_uevent_modalias(struct device *dev, return -ENODEV; } +static inline void of_device_probe(struct device_node *np) { } + static inline void of_device_node_put(struct device *dev) { } static inline const struct of_device_id *__of_match_device(