From patchwork Mon Apr 15 08:08:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 1085479 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AXe5w4mn"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44jLjW4vMWz9s00 for ; Mon, 15 Apr 2019 18:08:31 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 5220DC21E1D; Mon, 15 Apr 2019 08:08:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 90162C21DC1; Mon, 15 Apr 2019 08:08:24 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 71583C21DB3; Mon, 15 Apr 2019 08:08:23 +0000 (UTC) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by lists.denx.de (Postfix) with ESMTPS id 16D45C21D8A for ; Mon, 15 Apr 2019 08:08:23 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id k11so20636901wro.5 for ; Mon, 15 Apr 2019 01:08:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Nkdp1HNPRWoxF9PB4ZVpvVwBlNbsOurM5Tg8TJKWdbE=; b=AXe5w4mn4l9A1o4cBA6nLCflPCEraSB5ZieTjfrLTo8bD+7C6rno7ICh0419OdQE4J tMYTHC8XRiL7HBFHYC0GAAGyQiY9gS/43dKaXZzcRrKlAcPdqdpK73JgjTIf+UDGnnMW yM32w+x0zPUFmuSOV36XcBA8X+QAGv0CH9c4U6/mtg74EL2n95/xnoy+rbSObWHDWEiZ K6J8fZ6QfpEzA4znsUjGd/dTDDetr2uu02Jy4ZeWxZJVqnwFmoRRCFgtrjI3NS9Ftqlw SlApqRNUr2znJy6M6iQmz9rBxmut2reRFb2PZSPomjiNFI4ubmo2/royqMfCBpR3PGD3 zlRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Nkdp1HNPRWoxF9PB4ZVpvVwBlNbsOurM5Tg8TJKWdbE=; b=fjek8ZArhZ7aGQFwdI3ojux1LGYdjL8EDehJaqF9nb3aaV9Jxey1bHr9/RCTRufLzL wu6TxnSN9nqy0hMhAIvf5LWi27kAdBorwXKgcccXrJtD5/CmChLmW48CFEhwEM/WWwFG FC4Km+iuEVdFu6V6TdPHozMkAiNBwjSTzYVE+BYlg+LEFHIm4nFtCVGx7mcaSIIcZa0+ hRB9HwVWRMy6MTCSJlIQH8R23AE91cyk5hkmiaAiVGd2B5NSKii64bXoQA0Vm/0pgfP+ HXOXFeTmk0jVKjZY+PEs1fHkAd6HHk2kAe0tA3NXTUHzwpgAVXK26aHIW7Ne61CezFmr eUrA== X-Gm-Message-State: APjAAAUjlLFlgo+kOvbKIYW6HYOjCTW4joHrAJEnIPDea4vtgN31P8QA k79QMEcmemh0s7kQjz6TzRc= X-Google-Smtp-Source: APXvYqxHMNIpThEb9IGramch01ZTZV6NfR/3WaK0E0EmF+W7K9K5E68/2nzFBHEs7OFp6sjAjba2YQ== X-Received: by 2002:a5d:6706:: with SMTP id o6mr49196333wru.36.1555315702576; Mon, 15 Apr 2019 01:08:22 -0700 (PDT) Received: from localhost (p2E5BE61D.dip0.t-ipconnect.de. [46.91.230.29]) by smtp.gmail.com with ESMTPSA id x18sm69687606wrw.14.2019.04.15.01.08.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Apr 2019 01:08:22 -0700 (PDT) From: Thierry Reding To: Simon Glass Date: Mon, 15 Apr 2019 10:08:20 +0200 Message-Id: <20190415080821.441-1-thierry.reding@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 1/2] fdtdec: Use fdt_setprop_u32() for fdtdec_set_phandle() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Thierry Reding The fdt_setprop_u32() function does everything that we need, so we really only use the function as a convenience wrapper, in which case it can simply be a static inline function. Signed-off-by: Thierry Reding --- include/fdtdec.h | 5 ++++- lib/fdtdec.c | 7 ------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/include/fdtdec.h b/include/fdtdec.h index 266c58271f0b..110aa6ab6dea 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -1029,7 +1029,10 @@ int fdtdec_setup_memory_banksize(void); * @param phandle phandle to set for the given node * @return 0 on success or a negative error code on failure */ -int fdtdec_set_phandle(void *blob, int node, uint32_t phandle); +static inline int fdtdec_set_phandle(void *blob, int node, uint32_t phandle) +{ + return fdt_setprop_u32(blob, node, "phandle", phandle); +} /** * fdtdec_add_reserved_memory() - add or find a reserved-memory node diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 9c9c30234732..fea44a9a8c65 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1261,13 +1261,6 @@ __weak void *board_fdt_blob_setup(void) } #endif -int fdtdec_set_phandle(void *blob, int node, uint32_t phandle) -{ - fdt32_t value = cpu_to_fdt32(phandle); - - return fdt_setprop(blob, node, "phandle", &value, sizeof(value)); -} - static int fdtdec_init_reserved_memory(void *blob) { int na, ns, node, err; From patchwork Mon Apr 15 08:08:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 1085480 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HQbB063F"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44jLjz2XKFz9s00 for ; Mon, 15 Apr 2019 18:08:55 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id DAFE8C21E08; Mon, 15 Apr 2019 08:08:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 00EF1C21DB3; Mon, 15 Apr 2019 08:08:27 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A4387C21DD3; Mon, 15 Apr 2019 08:08:24 +0000 (UTC) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by lists.denx.de (Postfix) with ESMTPS id 61DB1C21D8A for ; Mon, 15 Apr 2019 08:08:24 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id a184so19386407wma.2 for ; Mon, 15 Apr 2019 01:08:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1ERBt5K3I/cEDIiWHodXtnviJS70GjG1fKmMcN9ZF24=; b=HQbB063FExXocyojlcT82cqB8045a8sGeJ5q4RI9hlUlY92lKqwc/gZ+DBpJ9Khmaz X1Iwp2njQDavG/NWnIrQ0/CeAaDc0P27Sm+9lUxq7d8yyxeaWXwqmgOQ1tgcK+vMF6Id 02ZEVK2Ibgteowk53iDo4fnKWkJUHaddTpCq2nUwdi4oVLXatei+wfxRbZVfBATauLpV cxPkbQtBDRv0YetU1fMsdoTDPFkJ95QJVpmsJaX+Hg+XaUJTuEkZ8yolmY2cXRFlDOC9 ZCr2hufzesz1Aenwhec+JuhtstWhXJ6DXA93ZSoIzKmGKorC/uz2qUJV9zT8gpYv0Ig+ /kFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1ERBt5K3I/cEDIiWHodXtnviJS70GjG1fKmMcN9ZF24=; b=UKZoT2I4AcS4JxWac/oASzPOBOoCATT7dhaC+D8jIVn31Yqr597j1ScyJzg0fF7qJk lYzyLJLwktBoWeLb4PrmAkYQIlfMBajW2mN2smXjFWQjN03pMlPWYQQoQGd/8DZjwV7+ 8ikxs8NfHcRZ/lGifcYZcYmGvWXEKLwJYbzTcHsUJZhvSVi0XspsLkSSN+9O9Bqn/FcF 164xsqJyGvJwk2lVZLiFYUZIwaZy1oLnQ3+PpqzELpBv/xhoJMAt8/bqN2C1mD2eb5GF 9wtDHh76yUktMqZDPUlW+e/LExS8y672SMomhlWUlPgFjRclwP06Gg0WpVvyPEuCkc3b ee4Q== X-Gm-Message-State: APjAAAVuZR/ZHit7p8YHzEWt2CTmInim4o9Sol8hQawTw33vjXQY1cUL +oKeFbmT1LWqcjiot9eFTSI= X-Google-Smtp-Source: APXvYqxhnnIrqVgZ41bscFwIkRa+1SUYuqw3/kOf1J/aSdFpB0YXDQutozAfacqZ5OWD5JRViwjrOQ== X-Received: by 2002:a1c:81c9:: with SMTP id c192mr20620354wmd.124.1555315703991; Mon, 15 Apr 2019 01:08:23 -0700 (PDT) Received: from localhost (p2E5BE61D.dip0.t-ipconnect.de. [46.91.230.29]) by smtp.gmail.com with ESMTPSA id l23sm14397419wmj.10.2019.04.15.01.08.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Apr 2019 01:08:23 -0700 (PDT) From: Thierry Reding To: Simon Glass Date: Mon, 15 Apr 2019 10:08:21 +0200 Message-Id: <20190415080821.441-2-thierry.reding@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190415080821.441-1-thierry.reding@gmail.com> References: <20190415080821.441-1-thierry.reding@gmail.com> MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 2/2] fdtdec: Remove fdt_{addr,size}_unpack() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Thierry Reding U-Boot already defines the {upper,lower}_32_bits() macros that have the same purpose. Use the existing macros instead of defining new APIs. Signed-off-by: Thierry Reding --- include/fdtdec.h | 24 ------------------------ lib/fdtdec.c | 8 ++++++-- lib/fdtdec_test.c | 8 ++++++-- 3 files changed, 12 insertions(+), 28 deletions(-) diff --git a/include/fdtdec.h b/include/fdtdec.h index 110aa6ab6dea..fa8e34f6f960 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -24,30 +24,6 @@ typedef phys_addr_t fdt_addr_t; typedef phys_size_t fdt_size_t; -static inline fdt32_t fdt_addr_unpack(fdt_addr_t addr, fdt32_t *upper) -{ - if (upper) -#ifdef CONFIG_PHYS_64BIT - *upper = addr >> 32; -#else - *upper = 0; -#endif - - return addr; -} - -static inline fdt32_t fdt_size_unpack(fdt_size_t size, fdt32_t *upper) -{ - if (upper) -#ifdef CONFIG_PHYS_64BIT - *upper = size >> 32; -#else - *upper = 0; -#endif - - return size; -} - #ifdef CONFIG_PHYS_64BIT #define FDT_ADDR_T_NONE (-1U) #define fdt_addr_to_cpu(reg) be64_to_cpu(reg) diff --git a/lib/fdtdec.c b/lib/fdtdec.c index fea44a9a8c65..d0ba88897335 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1300,6 +1300,7 @@ int fdtdec_add_reserved_memory(void *blob, const char *basename, fdt32_t cells[4] = {}, *ptr = cells; uint32_t upper, lower, phandle; int parent, node, na, ns, err; + fdt_size_t size; char name[64]; /* create an empty /reserved-memory node if one doesn't exist */ @@ -1340,7 +1341,8 @@ int fdtdec_add_reserved_memory(void *blob, const char *basename, * Unpack the start address and generate the name of the new node * base on the basename and the unit-address. */ - lower = fdt_addr_unpack(carveout->start, &upper); + upper = upper_32_bits(carveout->start); + lower = lower_32_bits(carveout->start); if (na > 1 && upper > 0) snprintf(name, sizeof(name), "%s@%x,%x", basename, upper, @@ -1374,7 +1376,9 @@ int fdtdec_add_reserved_memory(void *blob, const char *basename, *ptr++ = cpu_to_fdt32(lower); /* store one or two size cells */ - lower = fdt_size_unpack(carveout->end - carveout->start + 1, &upper); + size = carveout->end - carveout->start + 1; + upper = upper_32_bits(size); + lower = lower_32_bits(size); if (ns > 1) *ptr++ = cpu_to_fdt32(upper); diff --git a/lib/fdtdec_test.c b/lib/fdtdec_test.c index f6defe16c5a6..1f4f27054057 100644 --- a/lib/fdtdec_test.c +++ b/lib/fdtdec_test.c @@ -155,11 +155,13 @@ static int make_fdt_carveout_device(void *fdt, uint32_t na, uint32_t ns) }; fdt32_t cells[4], *ptr = cells; uint32_t upper, lower; + fdt_size_t size; char name[32]; int offset; /* store one or two address cells */ - lower = fdt_addr_unpack(carveout.start, &upper); + upper = upper_32_bits(carveout.start); + lower = lower_32_bits(carveout.start); if (na > 1 && upper > 0) snprintf(name, sizeof(name), "%s@%x,%x", basename, upper, @@ -173,7 +175,9 @@ static int make_fdt_carveout_device(void *fdt, uint32_t na, uint32_t ns) *ptr++ = cpu_to_fdt32(lower); /* store one or two size cells */ - lower = fdt_size_unpack(carveout.end - carveout.start + 1, &upper); + size = carveout.end - carveout.start + 1; + upper = upper_32_bits(size); + lower = lower_32_bits(size); if (ns > 1) *ptr++ = cpu_to_fdt32(upper);