From patchwork Thu May 28 08:46:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1299568 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=85.214.62.61; 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=HeAdcY6s; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 49XhCS30Xwz9sSF for ; Thu, 28 May 2020 18:47:16 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2E14F81CD7; Thu, 28 May 2020 10:46:59 +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="HeAdcY6s"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ACAA48179A; 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-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) (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 1B5FF813B3 for ; Thu, 28 May 2020 10:46:53 +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-pf1-x444.google.com with SMTP id 131so4862841pfv.13 for ; Thu, 28 May 2020 01:46:53 -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; bh=jvzapaF63ySIAfnhhxC7IbLsl2GWpKUmwjjlY6TpXSo=; b=HeAdcY6sEo1fk6pXNC4zJWlFT5CG/dLqEE0+PTpLg0YUq1gJYski9fQ/OX5jymTzXS DLXq6bTdw7XhUYlTwG8A6vWI9wx4Bb1uszHIb+sif0H4TLm4oP0LKv73bM4zfdo47crP 7GQc8BlXUOlxusCx1peEA1tqYYuECiZ9lPWUaDpS0IOxF9N+8sUhlo1/5pNNJbYF4XuB w8CWWgg/llst0mTeCp58GUbsVxZN5KUa5/y4qtjOM36s5UV2t0kSjaEoe+sgHacJOlFq 7s2eOrbMFL5ku80QSCy8cvr8/o+tCgcDcLS7ydHzmTjuIRiNf4EDYgfm8VIXLbi6uQSq CN+Q== 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; bh=jvzapaF63ySIAfnhhxC7IbLsl2GWpKUmwjjlY6TpXSo=; b=lMCI+lTzikZlWskWadpU0N3u4fDbqs58TMk+sHGn8hKVJWR51db1RAGfCLNrUQKlLx 2/Q3sdPnw/fXOFthsUs+7ADdigEw+H79RvhfoeGa4Tvn8fs3evyCAO3iYkAuVlpvUlsQ DdOasiVVVFXhgBCJstDcsjjkpTNgu+4K18nbTKq0klxWdd225HebaZm0Q8sJnUSA4PK2 663K53gowELzFGDjlM/cy4fIx6RgrhDHbRX35f+VyX8eWsTD4Emn4fc78CgMOShexe19 sA32NbfNKOPg7n3F9ciJNwC6xBfbP2xzm7iiMXLbZWvAx5IZzMouZ3sLfjC3IyXSXQlh Oyfw== X-Gm-Message-State: AOAM531FqQDlhTsL0U5xM5LwDis5MXbSG06q6uCPfTcf/eVRd2n92Puj RfwL385bxtz/6yb7nWog4u4= X-Google-Smtp-Source: ABdhPJxXa0yterpwhb4wAJCia6fvQ6VakTvuHauTA3rXaLEvr65c6bPkWi8sHCS6NK+NOo41SrjHwQ== X-Received: by 2002:a62:a504:: with SMTP id v4mr1962052pfm.117.1590655611368; Thu, 28 May 2020 01:46:51 -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.50 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 28 May 2020 01:46:51 -0700 (PDT) From: Bin Meng To: Rick Chen , U-Boot Mailing List Cc: Bin Meng Subject: [PATCH v2 2/3] riscv: Expand the DT size before copy reserved memory node Date: Thu, 28 May 2020 01:46:43 -0700 Message-Id: <1590655604-13704-2-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1590655604-13704-1-git-send-email-bmeng.cn@gmail.com> References: <1590655604-13704-1-git-send-email-bmeng.cn@gmail.com> 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 FDT blob might not have sufficient space to hold a copy of reserved memory node. Expand it before the copy. Reported-by: Rick Chen Signed-off-by: Bin Meng --- arch/riscv/lib/fdt_fixup.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c index 5f523f0..1290a64 100644 --- a/arch/riscv/lib/fdt_fixup.c +++ b/arch/riscv/lib/fdt_fixup.c @@ -41,6 +41,12 @@ int riscv_fdt_copy_resv_mem_node(const void *src, void *dst) return 0; } + err = fdt_open_into(dst, dst, fdt_totalsize(dst) + 32); + if (err < 0) { + printf("Device Tree can't be expanded to accommodate new node"); + return err; + } + fdt_for_each_subnode(node, src, offset) { name = fdt_get_name(src, node, NULL);