From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 09 Aug 2022 12:09:46 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oLMBE-00HFwD-AQ for lore@lore.pengutronix.de; Tue, 09 Aug 2022 12:09:46 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oLMBF-0003Er-7L for lore@pengutronix.de; Tue, 09 Aug 2022 12:09:45 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=4zJTKgJrgDo1rnh1JxgjXNvs3vSGmLMvPPJy/X+jHSA=; b=az0Rzji0qj5SyT20CIeWGKVw9x uE80aaIQz9XOQ8l8pixl6ibqNAjE6DPUA7rkg616hRHJLJW+8Mg61JBHzhE6ev8RoyoOL6PiYXq1T I8t7U1U2bUoXS6EY/b5byyw8T05oR/hW1RZ0NGFC/eUeZeE0zs80OBqCuehIHHUHGp6Znw/X/BWyG mePaAhkUYFO8+pjAmi/iplfCH6eLbbM2tozQqilGTQYwvEdljMwi+dtyjOdTO6H8UEN+2akU96icL OWwu9MxaFTdxoKi0/tbjM3ykTEl4AXXS3bK0yTTbbVZJWFBVF8+B1sRSaLXXrd3d+VJHQaIpa3VKf 2XqX0EIg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oLM9w-003Co8-Lr; Tue, 09 Aug 2022 10:08:24 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oLM9p-003Cle-QU for barebox@lists.infradead.org; Tue, 09 Aug 2022 10:08:19 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oLM9o-00033q-K5; Tue, 09 Aug 2022 12:08:16 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oLM9l-002gZV-Kj; Tue, 09 Aug 2022 12:08:15 +0200 Received: from afa by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oLM9n-00676S-3X; Tue, 09 Aug 2022 12:08:15 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Tue, 9 Aug 2022 12:08:13 +0200 Message-Id: <20220809100814.1455984-1-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220809_030817_879608_5CDA53BF X-CRM114-Status: GOOD ( 11.99 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.0 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2 1/2] of: implement of_append_property X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) barebox TLVs can be fixed up into a device tree for OS consumption. In case of repeated TLVs, we will want barebox to append onto an existing property. Add a helper that facilitates this. Signed-off-by: Ahmad Fatoum --- v1 -> v2: - early exist with of_new_property instead to simplify code (Sascha) --- drivers/of/base.c | 33 +++++++++++++++++++++++++++++++++ include/of.h | 8 ++++++++ 2 files changed, 41 insertions(+) diff --git a/drivers/of/base.c b/drivers/of/base.c index 101b2f74c74f..6d762ac43898 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2321,6 +2321,39 @@ int of_set_property(struct device_node *np, const char *name, const void *val, i return 0; } +int of_append_property(struct device_node *np, const char *name, const void *val, int len) +{ + struct property *pp; + int orig_len; + void *buf; + + if (!np) + return -ENOENT; + + pp = of_find_property(np, name, NULL); + if (!pp) { + of_new_property(np, name, val, len); + return 0; + } + + orig_len = pp->length; + buf = realloc(pp->value, orig_len + len); + if (!buf) + return -ENOMEM; + + memcpy(buf + orig_len, val, len); + + pp->value = buf; + pp->length += len; + + if (pp->value_const) { + memcpy(buf, pp->value_const, orig_len); + pp->value_const = NULL; + } + + return 0; +} + int of_property_sprintf(struct device_node *np, const char *propname, const char *fmt, ...) { diff --git a/include/of.h b/include/of.h index c65cef5a5a7c..97b4b3dd79bd 100644 --- a/include/of.h +++ b/include/of.h @@ -131,6 +131,8 @@ extern struct device_node *of_get_cpu_node(int cpu, unsigned int *thread); extern int of_set_property(struct device_node *node, const char *p, const void *val, int len, int create); +extern int of_append_property(struct device_node *np, const char *p, + const void *val, int len); extern struct property *of_new_property(struct device_node *node, const char *name, const void *data, int len); extern struct property *of_new_property_const(struct device_node *node, @@ -515,6 +517,12 @@ static inline int of_set_property(struct device_node *node, const char *p, return -ENOSYS; } +static inline int of_append_property(struct device_node *np, const char *p, + const void *val, int len) +{ + return -ENOSYS; +} + static inline struct property *of_new_property(struct device_node *node, const char *name, const void *data, int len) { -- 2.30.2