From patchwork Mon May 20 16:05:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 1102112 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="iKmgbFUx"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 4573f043Zpz9s1c for ; Tue, 21 May 2019 02:05:44 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 247D5C21E16; Mon, 20 May 2019 16:05:24 +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 8D640C21EF7; Mon, 20 May 2019 16:05:21 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9128DC21EC8; Mon, 20 May 2019 16:05:13 +0000 (UTC) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by lists.denx.de (Postfix) with ESMTPS id F1956C21E88 for ; Mon, 20 May 2019 16:05:09 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id f204so13907947wme.0 for ; Mon, 20 May 2019 09:05:09 -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=3nfHqSYn2/pawsLkKSfoBpeCoq5lEO2gTgAefvTDj6Q=; b=iKmgbFUxsuVBmcVI/yMt8gBy6tzeSPcXQn4dWiCxrFxgMiE9yl3hqkZ6pWaKUqreVk 9fzmQA0QXsijHPeQkAPW3wpx0JanRX7aHnBoAu0bjdX8D4vew++6UCLbLx5QS+JHSBDs nHaxRQD/TImmk792VhWELy+3t4XV6efPP3Cl3waB4x5Ltc6Oe3ZvyU/ZLIHAL1IJDUzK AUavd6YhbUAvXvIlH/VGD0bVlPDG8wYVnB4v9247qJ5L9H8hrEFflO3LYz7CO0cwTHLt Rr/eWsh5pbFtM8D75F6DFkI0jDuNMP+mab5RDZhdW6tH18TSYiA3riTzoc8yqHFaFOnE ygzA== 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=3nfHqSYn2/pawsLkKSfoBpeCoq5lEO2gTgAefvTDj6Q=; b=juQZDF4xmBsRYEQgy7xtLXFOTo0ou2ktemPQPY6g08KSE8VhsfdPbIVweveiXengOm aqEX8e2paJC2dGNgAz6DGPkTK7XYmuXOA/vamM4b31WoZENYjnlSFU6oyLdBLKH8yi4l 2XWEhJDtq6q/dI7IhK61gbeu90gWA+iVQqew9sIkb6VZklbwaoKFD06dFw8YdB6KR5un x0Etjz1GwkhFl7iJ6bFCR5vG/BcQIERVjQQJyq3Xp4lJp6/uT6QhDtFk9Q5fUghNl9oZ 0xGZ5ZT8NTIIvEUO4wDgXDHmScH+Uk+qAlgKVm+HRP7wJySWCnKQRhjbEfTHcBUeHxxe 63fA== X-Gm-Message-State: APjAAAVRfUWrlI5wTpF5cEVrym9+UXk8sueYmV0OHLtD/qfV3FINJoAy RRvtfJq4Y9ovdNWbtYuqeTA= X-Google-Smtp-Source: APXvYqxotI6XUxGLjCBosiSgl8f9Th1HZ7C+7Wwq80YqiLo8nrK/pJ6lSXCpmUwUXJxCIHCmEslrgg== X-Received: by 2002:a05:600c:21d7:: with SMTP id x23mr13171974wmj.87.1558368309540; Mon, 20 May 2019 09:05:09 -0700 (PDT) Received: from localhost (p2E5BEF36.dip0.t-ipconnect.de. [46.91.239.54]) by smtp.gmail.com with ESMTPSA id x187sm19676894wmb.33.2019.05.20.09.05.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 May 2019 09:05:08 -0700 (PDT) From: Thierry Reding To: Simon Glass Date: Mon, 20 May 2019 18:05:05 +0200 Message-Id: <20190520160505.22553-2-thierry.reding@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520160505.22553-1-thierry.reding@gmail.com> References: <20190520160505.22553-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 54efcc3d46ac..e8bfd1fb1ec3 100644 --- a/lib/fdtdec_test.c +++ b/lib/fdtdec_test.c @@ -156,11 +156,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, @@ -174,7 +176,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);