From patchwork Wed Jun 17 23:51:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Atish Patra X-Patchwork-Id: 1311691 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=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=h6gvOMRs; 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 49nMMQ38Jbz9sRW for ; Thu, 18 Jun 2020 09:53:06 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 78FE48205E; Thu, 18 Jun 2020 01:52:21 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="h6gvOMRs"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8D56882052; Thu, 18 Jun 2020 01:52:13 +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,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from esa3.hgst.iphmx.com (esa3.hgst.iphmx.com [216.71.153.141]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0ADBF82052 for ; Thu, 18 Jun 2020 01:51:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=wdc.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=prvs=4303c61a0=atish.patra@wdc.com DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1592437922; x=1623973922; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gVZCIOiwgVYKj2ZemedC5Nua5sikMJ5qLqOLBGjeKe0=; b=h6gvOMRsi8VwfJd/8w6iu8hZjF9xcEUD4td/g7AkVwGuMy8aCqt/wysp yhgHO81AIUfmkB+2+S9Y01c9D9+7GpFeQD/xNa4CjFXc8v4r01BMGrZgs 1ZxRNWqhCmjdRPER6DkScqJRzTXiGVbvADkZqsWg/PNhaXrMfm4CbSWG8 v3xT+mz6S5C5SPlowujDKZH+/5r3YtNj4XJBdcfwgqtv6FkqDlZC4JeMn IliLGlpZHHETaq3cKEC8O40idA9+YG59fhAjPy0Uw5SLG7p4f1vKgQKUX jxbcg48EjMckZ6LVkMzBnmnfhlI058ISmQb5QScDrLGZ3BtKWNnotntZU w==; IronPort-SDR: ZlT+c/cc9nCyGr4dHZxGhFtSYrnOvs+vG3Nyp/5Z+HXonOCY1xN/71POFkoXskQ1eALi8njT9Y gqwW9J9Nj+LmQ8HeYiaSo3tiEYexcstz8A7y0jrBXMQUf2l+sAIYosOoMY3u30tSfUeYjGsHo1 r5WFUfOMSj2HeUPmW93dGvqwqyHxvajS9Fyfh7V/4i+Oi9Zh31x67+4mIXkNbYzwvaxzMTw/kA a+3fsk+BQR9vCOKmdvJqPhi7hlumFJgB36BmsY1d9kChnh7qW2XSK7GfDpBg+7PDCgfYxQVJuu Uek= X-IronPort-AV: E=Sophos;i="5.73,524,1583164800"; d="scan'208";a="144587784" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 18 Jun 2020 07:51:36 +0800 IronPort-SDR: ttMWEK1B/vDDedpOTYzMJLFDpb3Ao6yqJh9SDovP8rsIA0ToJi+5NsFqS2cc0BbeIrn878C/ux wdNQBbzY7cHQN9BsGsDOyanxgoz0S+Xd0= Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jun 2020 16:40:16 -0700 IronPort-SDR: Dke1Hxw3cZjnlJ1vU9p/upz8jBeDNw6FidiaBxaLf84oF+Eu1QnkOCMDIuo2sDB6/YJE8LsbZe KapI+btcU44w== WDCIronportException: Internal Received: from usa003000.ad.shared (HELO jedi-01.hgst.com) ([10.86.58.137]) by uls-op-cesaip02.wdc.com with ESMTP; 17 Jun 2020 16:51:35 -0700 From: Atish Patra To: u-boot@lists.denx.de Cc: Atish Patra , Anup Patel , Bin Meng , Heinrich Schuchardt , Jagan Teki , Marek Vasut , Simon Goldschmidt , David Abdurachmanov , Tom Rini Subject: [PATCH 2/2] riscv: Do not return error if reserved node already exists Date: Wed, 17 Jun 2020 16:51:31 -0700 Message-Id: <20200617235131.21374-2-atish.patra@wdc.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20200617235131.21374-1-atish.patra@wdc.com> References: <20200617235131.21374-1-atish.patra@wdc.com> MIME-Version: 1.0 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 Not all errors are fatal. If a reserved memory node already exists in the destination device tree, we can continue to boot without failing. Signed-off-by: Atish Patra --- arch/riscv/lib/fdt_fixup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c index f2ec37b57b15..00b84dccbef0 100644 --- a/arch/riscv/lib/fdt_fixup.c +++ b/arch/riscv/lib/fdt_fixup.c @@ -62,7 +62,7 @@ int riscv_fdt_copy_resv_mem_node(const void *src, void *dst) pmp_mem.end = addr + size - 1; err = fdtdec_add_reserved_memory(dst, basename, &pmp_mem, &phandle); - if (err < 0) { + if (err < 0 && err != FDT_ERR_EXISTS) { printf("failed to add reserved memory: %d\n", err); return err; }