From patchwork Mon Feb 14 11:25:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 1592449 X-Patchwork-Delegate: pbrobinson@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=samsung.com header.i=@samsung.com header.a=rsa-sha256 header.s=mail20170921 header.b=EuP5//u0; dkim-atps=neutral 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=) 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)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Jy2351hWBz9s0r for ; Mon, 14 Feb 2022 22:25:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 18F7E83BA0; Mon, 14 Feb 2022 12:25:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=samsung.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=samsung.com header.i=@samsung.com header.b="EuP5//u0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F2C6A83B99; Mon, 14 Feb 2022 12:25:41 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) (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 7936E83BD4 for ; Mon, 14 Feb 2022 12:25:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=samsung.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=m.szyprowski@samsung.com Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20220214112523euoutp01cf5d728628e935b1ac6f39145fe59310~To2BY7sBf2012820128euoutp01N for ; Mon, 14 Feb 2022 11:25:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20220214112523euoutp01cf5d728628e935b1ac6f39145fe59310~To2BY7sBf2012820128euoutp01N DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1644837923; bh=6/wC2561SKo8QIAmMDU+qu6DsBQZ9Te+6B9fTZ+ppVU=; h=From:To:Cc:Subject:Date:References:From; b=EuP5//u0izFptouNttDpvrDYye+gbRqwI/Gqjaci8ylmkR6PVjc5Kfq0/RMN2ZpwN wAIYGmfFnlTdbTECYgfq0FeOWvatD54PuC1R9a/VEml+RQGvF+zS4fsnRdL0zxJY/4 vrjmJTmrQuLResmrN9XcA6B6g9go8Hmkj2jnUOvY= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20220214112522eucas1p1c1545b5cfe1e309415fb385515e32f7c~To2A1UOa-2163221632eucas1p1O; Mon, 14 Feb 2022 11:25:22 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id C5.64.10260.22C3A026; Mon, 14 Feb 2022 11:25:22 +0000 (GMT) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20220214112521eucas1p29a55a3602038118bad3a905955ad4389~To2AECb0O0720207202eucas1p2I; Mon, 14 Feb 2022 11:25:21 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20220214112521eusmtrp123ee333ff5b5cb0d7b1bc8d8db932a71~To2ADNt882560725607eusmtrp1q; Mon, 14 Feb 2022 11:25:21 +0000 (GMT) X-AuditID: cbfec7f5-bf3ff70000002814-ef-620a3c222e3b Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id F8.F4.09522.12C3A026; Mon, 14 Feb 2022 11:25:21 +0000 (GMT) Received: from AMDC2765.digital.local (unknown [106.120.51.73]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20220214112521eusmtip25c57fc4b300f7db6c3cfaa51f0797c2a~To1-q67Vj1936419364eusmtip2U; Mon, 14 Feb 2022 11:25:21 +0000 (GMT) From: Marek Szyprowski To: u-boot@lists.denx.de Cc: Marek Szyprowski , Matthias Brugger , Jaehoon Chung Subject: [PATCH] rpi: always set fdt_addr to the correct value Date: Mon, 14 Feb 2022 12:25:05 +0100 Message-Id: <20220214112505.26814-1-m.szyprowski@samsung.com> X-Mailer: git-send-email 2.17.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrBIsWRmVeSWpSXmKPExsWy7djP87pKNlxJBhPuS1vc+NXGarH2yF12 iwWTn7BavN3bye7A4nH2zg5Gj74tqxg91m+5yhLAHMVlk5Kak1mWWqRvl8CV8XbdWZaC3ewV Pw+tYWxgnMDWxcjJISFgIvF4wnr2LkYuDiGBFYwSWy9uYINwvjBKfP03lQXC+cwo8XnaZVaY lq7/D6ASyxkljp5dxgjX0rP1OBNIFZuAoUTX2y6wJSICEhK/+q8ygtjMAvUSe2a/ZAGxhQXs JNbN2ggWZxFQlej+0A0U5+DgFbCVmNPMA7FMXmL1hgPMEPYtdol7s+xBSiQEXCRebraBCAtL vDq+hR3ClpE4PbkH7DYJgWZGiYfn1rJDOD2MEpebZjBCVFlL3Dn3iw1kELOApsT6XfoQYUeJ 6WdAngSZzydx460gxMV8EpO2TWeGCPNKdLQJQVSrScw6vg5u7cELl6Cu9JDo+rgaHFRCArES +6/vY57AKDcLYdcCRsZVjOKppcW56anFxnmp5XrFibnFpXnpesn5uZsYgZF9+t/xrzsYV7z6 qHeIkYmD8RCjBAezkghv3FnOJCHelMTKqtSi/Pii0pzU4kOM0hwsSuK8yZkbEoUE0hNLUrNT UwtSi2CyTBycUg1MepE7mvLEt/Oy2x7sP/1EcLdC58rODzsjU04rtvZ/XvREa+5Sg/pUQxmH qE2VJvLxcw8nV9w5IG33r7U5ntGpRDnf6lta2FanNvmLBZMuZXNxiOnUXDuZMCv23rKZjXxN 0vx6h7PqbnKfXuyz0DFshY/a6rqG1P8v3KVKTL588tuXwfv504ZFHxUvzX7cdNwsf+UCS995 t916Hlh7G+kmVBSf7Qpccmiz2hl9nh4VBu3NLMLv1qzJCfsfe8xmy1zvrAijEsvDzw5vfvpn WmXWBIZ1DDGxr1bf+cS0dfETifwHDucMLY6yBp64vuRrFn+x50aj8EWLlnK1P6zY/zfyra9H R6u8XuS/rSW2nRlKLMUZiYZazEXFiQB0FiCPWwMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrALMWRmVeSWpSXmKPExsVy+t/xe7qKNlxJBldvKFvc+NXGarH2yF12 iwWTn7BavN3bye7A4nH2zg5Gj74tqxg91m+5yhLAHKVnU5RfWpKqkJFfXGKrFG1oYaRnaGmh Z2RiqWdobB5rZWSqpG9nk5Kak1mWWqRvl6CX8XbdWZaC3ewVPw+tYWxgnMDWxcjJISFgItH1 /wFLFyMXh5DAUkaJg7P+skIkZCROTmuAsoUl/lzrYoMo+sQocfHNPGaQBJuAoUTX2y6wSSIC EhK/+q8yghQxCzQySjzv+gKWEBawk1g3ayMjiM0ioCrR/aEbaB0HB6+ArcScZh6IBfISqzcc YJ7AyLOAkWEVo0hqaXFuem6xoV5xYm5xaV66XnJ+7iZGYFBtO/Zz8w7Gea8+6h1iZOJgPMQo wcGsJMIbd5YzSYg3JbGyKrUoP76oNCe1+BCjKdC6icxSosn5wLDOK4k3NDMwNTQxszQwtTQz VhLn9SzoSBQSSE8sSc1OTS1ILYLpY+LglGpgKi42EZmWquIx7U7GXKavy5rYC4/tMJramtd1 zGXtx1kParSt5u2q3y1xU1OE9Yrz4tyvN4vzd+itPXxYe+L2iJdqk30OKUntfX3uREzNo2iJ yk3lJ/Zbt2sFuK67MP3uFr5XjIHnFPZc9O6u3sm0dnqEfFjqn1dvepO2RZ/rN5oyTS8lIzX9 SN7u96Wrw5l+zop9k3nFd3V836z2+/IvOfpe6i5et8T30UelvV0W61K8/GR8jMONph0MaKy6 L3X9VI1L9sUF/m/sSvW4QwN/chedsnbh0xX9Gth2jNHtUemWfM5FG44yFIXuz8xfPznjr1Pm gtfLXBOmLRaPCEg/Oae9cN0f5ZK3as/esdhcUWIpzkg01GIuKk4EAHbV/8azAgAA X-CMS-MailID: 20220214112521eucas1p29a55a3602038118bad3a905955ad4389 X-Msg-Generator: CA X-RootMTR: 20220214112521eucas1p29a55a3602038118bad3a905955ad4389 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20220214112521eucas1p29a55a3602038118bad3a905955ad4389 References: X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.5 at phobos.denx.de X-Virus-Status: Clean The fdt_addr env have meaning only for the current runtime and it depends on the dtb size or firmware version. If one save the environment to disk and the loads it on the latter boot, the fdt_addr might change, what result in passing incorrect dtb address to the kernel. Fix this by always setting the fdt_addr env. This fixes system operation after saving the env to disk and updating i.e. dtb files or firmware. Signed-off-by: Marek Szyprowski Reviewed-by: Jaehoon Chung --- board/raspberrypi/rpi/rpi.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index bc3cc597adb..6d6d2e69234 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -347,9 +347,6 @@ static void set_fdtfile(void) */ static void set_fdt_addr(void) { - if (env_get("fdt_addr")) - return; - if (fdt_magic(fw_dtb_pointer) != FDT_MAGIC) return;