From patchwork Thu May 28 08:46:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1299567 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=mVtkdn7k; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49XhCH1Bwzz9sSF for ; Thu, 28 May 2020 18:47:03 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EFC2D813B3; Thu, 28 May 2020 10:46:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mVtkdn7k"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0F4D281C95; Thu, 28 May 2020 10:46:55 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 42F568120B for ; Thu, 28 May 2020 10:46:52 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pj1-x1044.google.com with SMTP id ci23so2827512pjb.5 for ; Thu, 28 May 2020 01:46:52 -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; bh=Ke3sdz+Cqeo2c3SZf23uu3Jm6CzF2wgi/V8Ohz1bqUQ=; b=mVtkdn7kXB5FCRYwnDB9VKHuuu7Ge7Gq19zmgKvLCPZzsb370Nda+7nLtVOlJe0MvB 9GD4jViXlJoztuJ82plk+JvzX9HimajVlwFpHLv968Hl5s/Eb0LDEPenXSUTSCUURlIp 0x66tt94a2Jhxw7ATddXCRbT8mlfa7rrBnGKsV5xaBiNWqmkEqsXpoqptn8h0oyZELnR SEHeRdVpJk8t8H9j/7i7lqz5cxuI8CAkopaMoPNuWevV4qNBvxaYYIJ5xBg0H5uoEhad YNzD871AYPwllnmKEa7ZRS0srxiD33bqX1WoAMiARBsn9nl04N2GesZ5AIeAhNChBazb ZBJA== 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; bh=Ke3sdz+Cqeo2c3SZf23uu3Jm6CzF2wgi/V8Ohz1bqUQ=; b=ozxGH2MYUEe2/ZQbA9nRshrogfeM7nl9YE0EN3Vkptk85IfORjfojguB4iJt7QqnZ5 tY++RQHhzDsO7pexr3MoABzzK4zhl6HEW3gM2/BqnSf6Gl1ke7wxDJ/zSbdfoic5D0QH vaFC2LYAZKOYcxIOrIOtSBOeHNnSVpisaXiprGDJXi42rk1j88J0OJpMF1bNdyjkPei5 nIBOmEbGr3sxo/Okr/eRF3Cxwc4d6KS8o1K2yW+VT65ys5K8JpOKXz4eEpDy/ByJplF+ kp2Jiquv9K8wuAkelDfcvS4eIXmMcdgnj+FONPfJSFYu7NDGrUzznyQi+2uHAIsK9Gf5 pRiQ== X-Gm-Message-State: AOAM530+p09jwsKYhA7cNhdywdQaBWryL5PT+jabvhN/Q4yMGwN+lrpS 1+ksNYPQQNRP/1XxcB+w4RQ= X-Google-Smtp-Source: ABdhPJxwwd5pdHv0N+7sLYkYHy9jrkvqN7wyzTR4zZBjZbxPRIDorgutqZOSUzDhKfogiVM3FMhRoQ== X-Received: by 2002:a17:90a:ad86:: with SMTP id s6mr424634pjq.193.1590655610537; Thu, 28 May 2020 01:46:50 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id z18sm4140200pfj.148.2020.05.28.01.46.49 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 28 May 2020 01:46:50 -0700 (PDT) From: Bin Meng To: Rick Chen , U-Boot Mailing List Cc: Bin Meng Subject: [PATCH v2 1/3] riscv: Avoid the reserved memory fixup if src and dst point to the same place Date: Thu, 28 May 2020 01:46:42 -0700 Message-Id: <1590655604-13704-1-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean From: Bin Meng The copy of reserved memory node from source dtb to destination dtb can be avoided if they point to the same place. This is useful when OF_PRIOR_STAGE is used. Signed-off-by: Bin Meng Reviewed-by: Rick Chen --- arch/riscv/lib/fdt_fixup.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c index 6db48ad..5f523f0 100644 --- a/arch/riscv/lib/fdt_fixup.c +++ b/arch/riscv/lib/fdt_fixup.c @@ -82,10 +82,9 @@ int riscv_fdt_copy_resv_mem_node(const void *src, void *dst) * @fdt: Pointer to the device tree in which reserved memory node needs to be * added. * - * In RISC-V, any board compiled with OF_SEPARATE needs to copy the reserved - * memory node from the device tree provided by the firmware to the device tree - * used by U-Boot. This is a common function that individual board fixup - * functions can invoke. + * In RISC-V, any board needs to copy the reserved memory node from the device + * tree provided by the firmware to the device tree used by U-Boot. This is a + * common function that individual board fixup functions can invoke. * * Return: 0 on success or error otherwise. */ @@ -95,6 +94,11 @@ int riscv_board_reserved_mem_fixup(void *fdt) void *src_fdt_addr; src_fdt_addr = map_sysmem(gd->arch.firmware_fdt_addr, 0); + + /* avoid the copy if we are using the same device tree */ + if (src_fdt_addr == fdt) + return 0; + err = riscv_fdt_copy_resv_mem_node(src_fdt_addr, fdt); if (err < 0) return err;