From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 12 Sep 2022 17:56:50 +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 1oXlnm-002Vim-C7 for lore@lore.pengutronix.de; Mon, 12 Sep 2022 17:56:50 +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 1oXlnl-0001kI-4a for lore@pengutronix.de; Mon, 12 Sep 2022 17:56:49 +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=BQBtv9TKt65A3rfBQFPSxdtTxUPr8shfFIvyqNj92oY=; b=cN1ZMSEIiKr2z5uxUr2PgGJU0J aLNDUbgvAXx7wb20Vagg8qBl0XkvxN4jLxz6u5YBAmDsUYHE5/xJjSdrzmaACuU9mawj1oDAq4akL HQvW7+Zv3znBJlNSgKir5iB15rZUQAgzsE+OchQ1R9yMCvCavwZ/apNf904Uq2R9wJZE+tvUSopAL Wda2GRw0UOoMH7CNV6BREqCwSb5aXvP05ijFzggSe9kQ3HORgEkwNWs5o17xOtSg+ZqNBbGZx6KRX 61D5tZK0+nsdHQf4/K822w1LP8ju9PfsMMSO+m9Gyd2LbQUJTB+9FFt0URBUNqhTnClnn3OTJRVcr BrglglUA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oXllu-00BHsH-Vl; Mon, 12 Sep 2022 15:55:07 +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 1oXlln-00BHnX-50 for barebox@lists.infradead.org; Mon, 12 Sep 2022 15:54:48 +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 1oXllj-0001Qj-JD; Mon, 12 Sep 2022 17:54:43 +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 1oXllk-000KPR-Bc; Mon, 12 Sep 2022 17:54:42 +0200 Received: from afa by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oXlli-006ZLX-C2; Mon, 12 Sep 2022 17:54:42 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Mon, 12 Sep 2022 17:54:36 +0200 Message-Id: <20220912155436.1565755-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-20220912_085447_351759_782C83FE X-CRM114-Status: GOOD ( 13.43 ) 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.5 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2] of: implement of_prepend_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) Like of_append_property for adding at the end of properties, implement of_prepend_property for placing data into the front. This is especially useful to fixup most-specific compatibles into existing nodes. Signed-off-by: Ahmad Fatoum --- v1 -> v2: - simplify with malloc/memcpy instead of realloc/memmove (Sascha) --- drivers/of/base.c | 30 ++++++++++++++++++++++++++++++ include/of.h | 8 ++++++++ test/self/of_manipulation.c | 2 +- 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index 212b226eb55c..ea2a88764bb2 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2378,6 +2378,36 @@ int of_append_property(struct device_node *np, const char *name, const void *val return 0; } +int of_prepend_property(struct device_node *np, const char *name, const void *val, int len) +{ + struct property *pp; + const void *oldval; + void *buf; + int oldlen; + + pp = of_find_property(np, name, &oldlen); + if (!pp) { + of_new_property(np, name, val, len); + return 0; + } + + oldval = of_property_get_value(pp); + + buf = malloc(len + oldlen); + if (!buf) + return -ENOMEM; + + memcpy(buf, val, len); + memcpy(buf + len, oldval, oldlen); + + free(pp->value); + pp->value = buf; + pp->length = len + oldlen; + 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 153e75d3e51d..052d5fcad84c 100644 --- a/include/of.h +++ b/include/of.h @@ -135,6 +135,8 @@ 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 int of_prepend_property(struct device_node *np, const char *name, + 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, @@ -536,6 +538,12 @@ static inline int of_append_property(struct device_node *np, const char *p, return -ENOSYS; } +static inline int of_prepend_property(struct device_node *np, const char *name, + 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) { diff --git a/test/self/of_manipulation.c b/test/self/of_manipulation.c index 7e30a60ca687..f7f95fa269af 100644 --- a/test/self/of_manipulation.c +++ b/test/self/of_manipulation.c @@ -103,9 +103,9 @@ static void test_of_property_strings(struct device_node *root) of_append_property(np4, "property-single", "ayy", 4); - of_append_property(np4, "property-multi", "ayy", 4); of_append_property(np4, "property-multi", "bee", 4); of_append_property(np4, "property-multi", "sea", 4); + of_prepend_property(np4, "property-multi", "ayy", 4); assert_equal(np3, np4); } -- 2.30.2