From patchwork Wed May 10 15:47:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 13237037 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 616A1C77B7D for ; Wed, 10 May 2023 15:58:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5395B10E4DA; Wed, 10 May 2023 15:58:17 +0000 (UTC) Received: from mslow1.mail.gandi.net (mslow1.mail.gandi.net [217.70.178.240]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6FBF110E4D5 for ; Wed, 10 May 2023 15:58:12 +0000 (UTC) Received: from relay6-d.mail.gandi.net (unknown [217.70.183.198]) by mslow1.mail.gandi.net (Postfix) with ESMTP id C3AF4D2AB5 for ; Wed, 10 May 2023 15:48:09 +0000 (UTC) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 95F6AC000C; Wed, 10 May 2023 15:48:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1683733685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IYd4H+SE761zyTPoCHwwfUTe0y6OdgwEBPBK9090C4k=; b=IQoZhvrgB3cVqfOcAidaOCXCDeka1k9jJNjEQCom89NHXBuF+Rd/VZQZm0xj1Lrnm+40OE yTnjpZ0ASEqix34tB5MCwIPGVPcluPhv33R1VUlHanMqfYx7ZZ54ok9Ay0tMHwhc5W4UTo mtCwLMx8QmydsfOf8fct3GR20/Y5y7E8Kw3VfjDG7oaEo66EQgJlU59n0ZWvmpMIqvTRXY KDjACF3kEmG21kGVtCoYBKBeLv0OlVKTst0l90iKdXXRLE079dHee+AVqQImXxMPitDZE+ 3rAq+3cRIWclHdDEhOxh5Ob/xkf2nAJFDgcrAvzZF2ZXsoIuxcrf3/h+35P0/Q== From: Miquel Raynal To: Rob Herring Subject: [PATCH 1/5] of: module: Mutate of_device_modalias() into two helpers Date: Wed, 10 May 2023 17:47:59 +0200 Message-Id: <20230510154803.189096-2-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230510154803.189096-1-miquel.raynal@bootlin.com> References: <20230510154803.189096-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Mikko Perttunen , Thierry Reding , Thomas Petazzoni , Miquel Raynal , linux-tegra@vger.kernel.org, Frank Rowand Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Move the content of the helper providing printable modaliases in module.c. Call this new function from an of_device.c inline helper. There is no functional changes. However, as a side effect, we fix the return value of the inline helper (in the !CONFIG_OF case) which should be a ssize_t instead of int. Signed-off-by: Miquel Raynal --- drivers/of/device.c | 25 ------------------------- drivers/of/module.c | 19 +++++++++++++++++++ include/linux/of.h | 8 ++++++++ include/linux/of_device.h | 13 ++++++++++--- 4 files changed, 37 insertions(+), 28 deletions(-) diff --git a/drivers/of/device.c b/drivers/of/device.c index 0f00f1b80708..45ce83a8945f 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c @@ -246,31 +246,6 @@ const void *of_device_get_match_data(const struct device *dev) } EXPORT_SYMBOL(of_device_get_match_data); -/** - * of_device_modalias - Fill buffer with newline terminated modalias string - * @dev: Calling device - * @str: Modalias string - * @len: Size of @str - */ -ssize_t of_device_modalias(struct device *dev, char *str, ssize_t len) -{ - ssize_t sl; - - if (!dev || !dev->of_node || dev->of_node_reused) - return -ENODEV; - - sl = of_modalias(dev->of_node, str, len - 2); - if (sl < 0) - return sl; - if (sl > len - 2) - return -ENOMEM; - - str[sl++] = '\n'; - str[sl] = 0; - return sl; -} -EXPORT_SYMBOL_GPL(of_device_modalias); - /** * of_device_uevent - Display OF related uevent information * @dev: Device to display the uevent information for diff --git a/drivers/of/module.c b/drivers/of/module.c index 0e8aa974f0f2..c05fb8ca575c 100644 --- a/drivers/of/module.c +++ b/drivers/of/module.c @@ -44,6 +44,25 @@ ssize_t of_modalias(const struct device_node *np, char *str, ssize_t len) return tsize; } +ssize_t of_printable_modalias(const struct device_node *np, char *str, ssize_t len) +{ + ssize_t sl; + + if (!np) + return -ENODEV; + + sl = of_modalias(np, str, len - 2); + if (sl < 0) + return sl; + if (sl > len - 2) + return -ENOMEM; + + str[sl++] = '\n'; + str[sl] = 0; + return sl; +} +EXPORT_SYMBOL_GPL(of_printable_modalias); + int of_request_module(const struct device_node *np) { char *str; diff --git a/include/linux/of.h b/include/linux/of.h index 6ecde0515677..dcdd9396ac37 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -385,6 +385,8 @@ extern int of_count_phandle_with_args(const struct device_node *np, /* module functions */ extern ssize_t of_modalias(const struct device_node *np, char *str, ssize_t len); +extern ssize_t of_printable_modalias(const struct device_node *np, char *str, + ssize_t len); extern int of_request_module(const struct device_node *np); /* phandle iterator functions */ @@ -758,6 +760,12 @@ static inline ssize_t of_modalias(const struct device_node *np, char *str, return -ENODEV; } +static inline ssize_t of_printable_modalias(const struct device_node *np, + char *str, ssize_t len) +{ + return -ENODEV; +} + static inline int of_request_module(const struct device_node *np) { return -ENODEV; diff --git a/include/linux/of_device.h b/include/linux/of_device.h index 2c7a3d4bc775..bca66f59814a 100644 --- a/include/linux/of_device.h +++ b/include/linux/of_device.h @@ -26,7 +26,14 @@ static inline int of_driver_match_device(struct device *dev, return of_match_device(drv->of_match_table, dev) != NULL; } -extern ssize_t of_device_modalias(struct device *dev, char *str, ssize_t len); +static inline ssize_t of_device_modalias(struct device *dev, char *str, + ssize_t len) +{ + if (!dev || !dev->of_node || dev->of_node_reused) + return -ENODEV; + + return of_printable_modalias(dev->of_node, str, len); +} extern void of_device_uevent(const struct device *dev, struct kobj_uevent_env *env); extern int of_device_uevent_modalias(const struct device *dev, struct kobj_uevent_env *env); @@ -51,8 +58,8 @@ static inline int of_driver_match_device(struct device *dev, static inline void of_device_uevent(const struct device *dev, struct kobj_uevent_env *env) { } -static inline int of_device_modalias(struct device *dev, - char *str, ssize_t len) +static inline ssize_t of_device_modalias(struct device *dev, + char *str, ssize_t len) { return -ENODEV; } From patchwork Wed May 10 15:48:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 13237032 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6FF6CC77B7D for ; Wed, 10 May 2023 15:58:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 081BB10E4D3; Wed, 10 May 2023 15:58:14 +0000 (UTC) Received: from mslow1.mail.gandi.net (mslow1.mail.gandi.net [217.70.178.240]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6B0EA10E4D3 for ; Wed, 10 May 2023 15:58:12 +0000 (UTC) Received: from relay6-d.mail.gandi.net (unknown [217.70.183.198]) by mslow1.mail.gandi.net (Postfix) with ESMTP id CE82CD2B14 for ; Wed, 10 May 2023 15:48:09 +0000 (UTC) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 90E59C0005; Wed, 10 May 2023 15:48:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1683733686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F/KSDSRKpLHcB4gpgTZNIsinLN/YQM+hIOrBqkC1k88=; b=UyBOIGVDHTkQ8GTasBO0HB+J1Z++0S2Zw1KtqqxmwJ4aGo1ar2Fehj+YzqCd6nS9aiJGk/ QOiyr4fDBL+t9ntTKIlFiCOfk00S5AjWG/encJ5YI4PUdlSKCTOi15hO6HQjCB5SuTe7Lh HQsVgBhuEYVlvDsCJN2/yLuATuL7TI7gSsZo0nBDvUt0hcSkxvutbWZGDPoR8sYKECBzoi PhppTuKWj0NcjNng2XItbbpsvkn1N3dXJ367S0donGgt2cQYM3f25bYfyqKFgLGxyNgUY9 K9+1jyBXd2FOVnxVI2K6WYNswx6HUfUCQK8VyM62nc8x9N0nFQ9ABQ9+Y46jlw== From: Miquel Raynal To: Rob Herring Subject: [PATCH 2/5] of: module: Mutate of_device_uevent() into two helpers Date: Wed, 10 May 2023 17:48:00 +0200 Message-Id: <20230510154803.189096-3-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230510154803.189096-1-miquel.raynal@bootlin.com> References: <20230510154803.189096-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Mikko Perttunen , Thierry Reding , Thomas Petazzoni , Miquel Raynal , linux-tegra@vger.kernel.org, Frank Rowand Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Move the OF related logic inside of/module.c and use it from of_device.h with an inline helper so there is no visible change from the users point of view. Signed-off-by: Miquel Raynal --- drivers/of/device.c | 42 --------------------------------------- drivers/of/module.c | 41 ++++++++++++++++++++++++++++++++++++++ include/linux/of.h | 6 ++++++ include/linux/of_device.h | 17 +++++++++++++--- 4 files changed, 61 insertions(+), 45 deletions(-) diff --git a/drivers/of/device.c b/drivers/of/device.c index 45ce83a8945f..5e538e1ed623 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c @@ -246,48 +246,6 @@ const void *of_device_get_match_data(const struct device *dev) } EXPORT_SYMBOL(of_device_get_match_data); -/** - * of_device_uevent - Display OF related uevent information - * @dev: Device to display the uevent information for - * @env: Kernel object's userspace event reference to fill up - */ -void of_device_uevent(const struct device *dev, struct kobj_uevent_env *env) -{ - const char *compat, *type; - struct alias_prop *app; - struct property *p; - int seen = 0; - - if ((!dev) || (!dev->of_node)) - return; - - add_uevent_var(env, "OF_NAME=%pOFn", dev->of_node); - add_uevent_var(env, "OF_FULLNAME=%pOF", dev->of_node); - type = of_node_get_device_type(dev->of_node); - if (type) - add_uevent_var(env, "OF_TYPE=%s", type); - - /* Since the compatible field can contain pretty much anything - * it's not really legal to split it out with commas. We split it - * up using a number of environment variables instead. */ - of_property_for_each_string(dev->of_node, "compatible", p, compat) { - add_uevent_var(env, "OF_COMPATIBLE_%d=%s", seen, compat); - seen++; - } - add_uevent_var(env, "OF_COMPATIBLE_N=%d", seen); - - seen = 0; - mutex_lock(&of_mutex); - list_for_each_entry(app, &aliases_lookup, link) { - if (dev->of_node == app->np) { - add_uevent_var(env, "OF_ALIAS_%d=%s", seen, - app->alias); - seen++; - } - } - mutex_unlock(&of_mutex); -} - int of_device_uevent_modalias(const struct device *dev, struct kobj_uevent_env *env) { int sl; diff --git a/drivers/of/module.c b/drivers/of/module.c index c05fb8ca575c..c729675fdd04 100644 --- a/drivers/of/module.c +++ b/drivers/of/module.c @@ -8,6 +8,8 @@ #include #include +#include "of_private.h" + ssize_t of_modalias(const struct device_node *np, char *str, ssize_t len) { const char *compat; @@ -91,3 +93,42 @@ int of_request_module(const struct device_node *np) return ret; } EXPORT_SYMBOL_GPL(of_request_module); + +int of_uevent(struct device_node *np, struct kobj_uevent_env *env) +{ + const char *compat, *type; + struct alias_prop *app; + struct property *p; + int seen = 0; + + if (!np) + return -ENODEV; + + add_uevent_var(env, "OF_NAME=%pOFn", np); + add_uevent_var(env, "OF_FULLNAME=%pOF", np); + type = of_node_get_device_type(np); + if (type) + add_uevent_var(env, "OF_TYPE=%s", type); + + /* Since the compatible field can contain pretty much anything + * it's not really legal to split it out with commas. We split it + * up using a number of environment variables instead. */ + of_property_for_each_string(np, "compatible", p, compat) { + add_uevent_var(env, "OF_COMPATIBLE_%d=%s", seen, compat); + seen++; + } + add_uevent_var(env, "OF_COMPATIBLE_N=%d", seen); + + seen = 0; + mutex_lock(&of_mutex); + list_for_each_entry(app, &aliases_lookup, link) { + if (np == app->np) { + add_uevent_var(env, "OF_ALIAS_%d=%s", seen, + app->alias); + seen++; + } + } + mutex_unlock(&of_mutex); + + return 0; +} diff --git a/include/linux/of.h b/include/linux/of.h index dcdd9396ac37..d99f33fc25d3 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -388,6 +388,7 @@ extern ssize_t of_modalias(const struct device_node *np, char *str, ssize_t len) extern ssize_t of_printable_modalias(const struct device_node *np, char *str, ssize_t len); extern int of_request_module(const struct device_node *np); +extern int of_uevent(struct device_node *np, struct kobj_uevent_env *env); /* phandle iterator functions */ extern int of_phandle_iterator_init(struct of_phandle_iterator *it, @@ -771,6 +772,11 @@ static inline int of_request_module(const struct device_node *np) return -ENODEV; } +static inline int of_uevent(struct device_node *np, struct kobj_uevent_env *env) +{ + return -ENODEV; +} + static inline int of_phandle_iterator_init(struct of_phandle_iterator *it, const struct device_node *np, const char *list_name, diff --git a/include/linux/of_device.h b/include/linux/of_device.h index bca66f59814a..af5ee78e0c05 100644 --- a/include/linux/of_device.h +++ b/include/linux/of_device.h @@ -35,7 +35,15 @@ static inline ssize_t of_device_modalias(struct device *dev, char *str, return of_printable_modalias(dev->of_node, str, len); } -extern void of_device_uevent(const struct device *dev, struct kobj_uevent_env *env); +static inline int of_device_uevent(const struct device *dev, + struct kobj_uevent_env *env) +{ + if (!dev || !dev->of_node) + return -ENODEV; + + return of_uevent(dev->of_node, env); +} + extern int of_device_uevent_modalias(const struct device *dev, struct kobj_uevent_env *env); int of_dma_configure_id(struct device *dev, @@ -55,8 +63,11 @@ static inline int of_driver_match_device(struct device *dev, return 0; } -static inline void of_device_uevent(const struct device *dev, - struct kobj_uevent_env *env) { } +static inline int of_device_uevent(const struct device *dev, + struct kobj_uevent_env *env) +{ + return -ENODEV; +} static inline ssize_t of_device_modalias(struct device *dev, char *str, ssize_t len) From patchwork Wed May 10 15:48:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 13237035 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4D664C77B7D for ; Wed, 10 May 2023 15:58:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9A35C10E4D8; Wed, 10 May 2023 15:58:14 +0000 (UTC) Received: from mslow1.mail.gandi.net (mslow1.mail.gandi.net [217.70.178.240]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6D04110E4D4 for ; Wed, 10 May 2023 15:58:12 +0000 (UTC) Received: from relay6-d.mail.gandi.net (unknown [IPv6:2001:4b98:dc4:8::226]) by mslow1.mail.gandi.net (Postfix) with ESMTP id E24D3D2EB4 for ; Wed, 10 May 2023 15:48:10 +0000 (UTC) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id A716FC0004; Wed, 10 May 2023 15:48:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1683733687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eTzUAUn2/6zCa90roD3BEhvCRbYoR3aMy4PUneIBrPM=; b=UkiDwJ6PmmRH+dllni1nZppCO1kMi1iL8f0YSzz6HMHb6cDJPNmwTh8WsvIlDrbl1Ewpml JhgPduur1oojt7UZEDpsmRFpFSpSvpaIWASDDMJ5Ve+FT7l/C3A+se09IfN+emu6+OUdLi mZyQQ9NdIIYgn+zM3RQqh2WdLt9pnConqmEEEgHJKM1WxXbbl02tV2LlWxw+lWD8ETYa4Y rJjaHH7kho1KvYF9c9N1qMAtbWb7RP4uHWKLD8DsyfQuKYcJIJms84KTwMLlvgIHAdKeMM KDYkX8tZWSOsfDnSEnL3JVMw6pwKGJelLceNIYpxYqFT9kMWwX3JbWfPl9m3aw== From: Miquel Raynal To: Rob Herring Subject: [PATCH 3/5] of: module: Mutate of_device_uevent_modalias() into two helpers Date: Wed, 10 May 2023 17:48:01 +0200 Message-Id: <20230510154803.189096-4-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230510154803.189096-1-miquel.raynal@bootlin.com> References: <20230510154803.189096-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Mikko Perttunen , Thierry Reding , Thomas Petazzoni , Miquel Raynal , linux-tegra@vger.kernel.org, Frank Rowand Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Let's move the logic of the former helper into module.c and use it from an inline helper located under of_device.c. This way there is no change for users while the logic gets moved to an OF-only file. Signed-off-by: Miquel Raynal --- drivers/of/device.c | 23 ----------------------- drivers/of/module.c | 21 +++++++++++++++++++++ include/linux/of.h | 7 +++++++ include/linux/of_device.h | 9 ++++++++- 4 files changed, 36 insertions(+), 24 deletions(-) diff --git a/drivers/of/device.c b/drivers/of/device.c index 5e538e1ed623..7909eefc650e 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c @@ -245,26 +245,3 @@ const void *of_device_get_match_data(const struct device *dev) return match->data; } EXPORT_SYMBOL(of_device_get_match_data); - -int of_device_uevent_modalias(const struct device *dev, struct kobj_uevent_env *env) -{ - int sl; - - if ((!dev) || (!dev->of_node) || dev->of_node_reused) - return -ENODEV; - - /* Devicetree modalias is tricky, we add it in 2 steps */ - if (add_uevent_var(env, "MODALIAS=")) - return -ENOMEM; - - sl = of_modalias(dev->of_node, &env->buf[env->buflen-1], - sizeof(env->buf) - env->buflen); - if (sl < 0) - return sl; - if (sl >= (sizeof(env->buf) - env->buflen)) - return -ENOMEM; - env->buflen += sl; - - return 0; -} -EXPORT_SYMBOL_GPL(of_device_uevent_modalias); diff --git a/drivers/of/module.c b/drivers/of/module.c index c729675fdd04..874f3fb8220f 100644 --- a/drivers/of/module.c +++ b/drivers/of/module.c @@ -132,3 +132,24 @@ int of_uevent(struct device_node *np, struct kobj_uevent_env *env) return 0; } + +int of_uevent_modalias(const struct device_node *np, struct kobj_uevent_env *env) +{ + int sl; + + if (!np) + return -ENODEV; + + /* Devicetree modalias is tricky, we add it in 2 steps */ + if (add_uevent_var(env, "MODALIAS=")) + return -ENOMEM; + + sl = of_modalias(np, &env->buf[env->buflen-1], + sizeof(env->buf) - env->buflen); + if (sl >= (sizeof(env->buf) - env->buflen)) + return -ENOMEM; + env->buflen += sl; + + return 0; +} +EXPORT_SYMBOL_GPL(of_uevent_modalias); diff --git a/include/linux/of.h b/include/linux/of.h index d99f33fc25d3..203bd2895d94 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -389,6 +389,7 @@ extern ssize_t of_printable_modalias(const struct device_node *np, char *str, ssize_t len); extern int of_request_module(const struct device_node *np); extern int of_uevent(struct device_node *np, struct kobj_uevent_env *env); +extern int of_uevent_modalias(const struct device_node *np, struct kobj_uevent_env *env); /* phandle iterator functions */ extern int of_phandle_iterator_init(struct of_phandle_iterator *it, @@ -777,6 +778,12 @@ static inline int of_uevent(struct device_node *np, struct kobj_uevent_env *env) return -ENODEV; } +static inline int of_uevent_modalias(const struct device_node *np, + struct kobj_uevent_env *env) +{ + return -ENODEV; +} + static inline int of_phandle_iterator_init(struct of_phandle_iterator *it, const struct device_node *np, const char *list_name, diff --git a/include/linux/of_device.h b/include/linux/of_device.h index af5ee78e0c05..5e428bcf3d63 100644 --- a/include/linux/of_device.h +++ b/include/linux/of_device.h @@ -44,7 +44,14 @@ static inline int of_device_uevent(const struct device *dev, return of_uevent(dev->of_node, env); } -extern int of_device_uevent_modalias(const struct device *dev, struct kobj_uevent_env *env); +static inline int of_device_uevent_modalias(const struct device *dev, + struct kobj_uevent_env *env) +{ + if (!dev || !dev->of_node || dev->of_node_reused) + return -ENODEV; + + return of_uevent_modalias(dev->of_node, env); +} int of_dma_configure_id(struct device *dev, struct device_node *np, From patchwork Wed May 10 15:48:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 13237033 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 660A2C77B7D for ; Wed, 10 May 2023 15:58:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 709B810E4D7; Wed, 10 May 2023 15:58:14 +0000 (UTC) Received: from mslow1.mail.gandi.net (mslow1.mail.gandi.net [217.70.178.240]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7882110E4D7 for ; Wed, 10 May 2023 15:58:12 +0000 (UTC) Received: from relay6-d.mail.gandi.net (unknown [217.70.183.198]) by mslow1.mail.gandi.net (Postfix) with ESMTP id 121E5D3102 for ; Wed, 10 May 2023 15:48:13 +0000 (UTC) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id CA6E3C000B; Wed, 10 May 2023 15:48:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1683733689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GiIl6qNilxI/2RMNtfGSfbFmkF8Ao7IWY//F7MAhvic=; b=Pu/WyXGfzdCJsrmdb5oy8iGLmhu5ui/4pT0SytexaZmI/s4yZRRNG5oiAo6Hsy7uTKPE6s VNX9AuNiDlfNYJULsgEMGfR/K+crTTQVolBSzasPXilC7nEweltsmAsq/CyriYhIBoK085 vfJf3I5J0xJ8sW2S7X7cI7KuHf/2ZNG0K2/IYu/l/XYg+GXjoXdrIqoUBDQuIoAL4Gy+39 6IbNTbR8nWI3YIbqwMOqDpbFzlo/RKt5eqiwGnJGmywyrWeY7xa42pfjiq9PHr2pIfZ4XV fxqZ5euP0ZvHd8VMEB3OLO3Tl1xy8/IF7N/IxM4xTl9VBxdTYgH3zeI/HHMG/A== From: Miquel Raynal To: Rob Herring Subject: [PATCH 4/5] of: module: Export of_uevent() Date: Wed, 10 May 2023 17:48:02 +0200 Message-Id: <20230510154803.189096-5-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230510154803.189096-1-miquel.raynal@bootlin.com> References: <20230510154803.189096-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Mikko Perttunen , Thierry Reding , Thomas Petazzoni , Miquel Raynal , linux-tegra@vger.kernel.org, Frank Rowand Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The content of of_uevent() is currently hardcoded in a driver that can be compiled as a module. Nothing prevents of_uevent() to be exported to modules, most of the other helpers in of_device.c actually are.The reason why this helper was not exported is because it has been so far only useful in drivers/base, which is built-in anyway. With the idea of getting rid of the hardcoded implementation of of_uevent() in other places in the kernel, let's export it to GPL modules (very much like its cousins in the same file). Signed-off-by: Miquel Raynal --- drivers/of/module.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/of/module.c b/drivers/of/module.c index 874f3fb8220f..8b402a716951 100644 --- a/drivers/of/module.c +++ b/drivers/of/module.c @@ -132,6 +132,7 @@ int of_uevent(struct device_node *np, struct kobj_uevent_env *env) return 0; } +EXPORT_SYMBOL_GPL(of_uevent); int of_uevent_modalias(const struct device_node *np, struct kobj_uevent_env *env) { From patchwork Wed May 10 15:48:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 13237036 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F0469C7EE23 for ; Wed, 10 May 2023 15:58:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C4CCF10E4D9; Wed, 10 May 2023 15:58:15 +0000 (UTC) Received: from mslow1.mail.gandi.net (mslow1.mail.gandi.net [217.70.178.240]) by gabe.freedesktop.org (Postfix) with ESMTPS id 31A3B10E4D5 for ; Wed, 10 May 2023 15:58:14 +0000 (UTC) Received: from relay6-d.mail.gandi.net (unknown [217.70.183.198]) by mslow1.mail.gandi.net (Postfix) with ESMTP id 18E9DD32BB for ; Wed, 10 May 2023 15:48:14 +0000 (UTC) Received: (Authenticated sender: miquel.raynal@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 073A0C000C; Wed, 10 May 2023 15:48:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1683733690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o8C8MXrqjqKXj0eKsxGXL9GkrBq/7JcKAOeht6U8KtQ=; b=jrmGFUr2y+aOVqpJ1iPloWve2lq8N4iHH6SoENv2W/wV94WrcuwK8jOqlG7rPvLt6gckhN gvzm94tlydwTS5IAluF6icZG/5auLBEKIUhgJgnsgZCsJseLP8iZ2duxFoPVJ4FFI8itRm Qqltvlr4+O7bdd/MMgublxvFBUvHaam1Dyc9gIvpT11ca+1kPdL3p56QFa2XGUC9GDbfWR LPr75aieSdqJVFFIkFxE8wtBPDxETpKU28oNQ/9FeOoRq+dpF9Zmn1XihIqsgVtb50GrRw xVSkPb4DRopl5PhnUFfgsGAZWDgZdxOS5uNNF0+QR1Ocw0KLQ5Oq3ITr6KVtvA== From: Miquel Raynal To: Rob Herring Subject: [PATCH 5/5] gpu: host1x: Stop open-coding of_device_uevent() Date: Wed, 10 May 2023 17:48:03 +0200 Message-Id: <20230510154803.189096-6-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230510154803.189096-1-miquel.raynal@bootlin.com> References: <20230510154803.189096-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Mikko Perttunen , Thierry Reding , Thomas Petazzoni , Miquel Raynal , linux-tegra@vger.kernel.org, Frank Rowand Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" There is apparently no reasons to open-code of_device_uevent() besides: - The helper receives a struct device while we want to use the of_node member of the struct device *parent*. - of_device_uevent() could not be called by modules because of a missing EXPORT_SYMBOL*(). In practice, the former point is not very constraining, just calling of_device_uevent(dev->parent, ...) would have made the trick. The latter point is more an observation rather than a real blocking point because nothing prevented of_uevent() (called by the inline function of_device_uevent()) to be exported to modules. In practice, this helper is now exported, so nothing prevent us from using of_device_uevent() anymore. Let's use the core helper directly instead of open-coding it. Cc: Thierry Reding Cc: David Airlie Cc: Daniel Vetter Cc: Mikko Perttunen Cc: Rob Herring Cc: Frank Rowand Signed-off-by: Miquel Raynal --- This patch depends on the changes performed earlier in the series under the drivers/of/ folder. --- drivers/gpu/host1x/bus.c | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c index 4d16a3396c4a..6434a183fb72 100644 --- a/drivers/gpu/host1x/bus.c +++ b/drivers/gpu/host1x/bus.c @@ -338,34 +338,15 @@ static int host1x_device_match(struct device *dev, struct device_driver *drv) return strcmp(dev_name(dev), drv->name) == 0; } +/* + * Note that this is really only needed for backwards compatibility + * with libdrm, which parses this information from sysfs and will + * fail if it can't find the OF_FULLNAME, specifically. + */ static int host1x_device_uevent(const struct device *dev, struct kobj_uevent_env *env) { - struct device_node *np = dev->parent->of_node; - unsigned int count = 0; - struct property *p; - const char *compat; - - /* - * This duplicates most of of_device_uevent(), but the latter cannot - * be called from modules and operates on dev->of_node, which is not - * available in this case. - * - * Note that this is really only needed for backwards compatibility - * with libdrm, which parses this information from sysfs and will - * fail if it can't find the OF_FULLNAME, specifically. - */ - add_uevent_var(env, "OF_NAME=%pOFn", np); - add_uevent_var(env, "OF_FULLNAME=%pOF", np); - - of_property_for_each_string(np, "compatible", p, compat) { - add_uevent_var(env, "OF_COMPATIBLE_%u=%s", count, compat); - count++; - } - - add_uevent_var(env, "OF_COMPATIBLE_N=%u", count); - - return 0; + return of_device_uevent((const struct device *)&dev->parent, env); } static int host1x_dma_configure(struct device *dev)