Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1oOgu5-0005BA-E0 for mharc-grub-devel@gnu.org; Thu, 18 Aug 2022 10:53:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56476) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oOgu3-00055H-Ph for grub-devel@gnu.org; Thu, 18 Aug 2022 10:53:47 -0400 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]:38190) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oOgu1-0001Kv-0l for grub-devel@gnu.org; Thu, 18 Aug 2022 10:53:46 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0BFC26115A; Thu, 18 Aug 2022 14:53:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5FCAAC433D6; Thu, 18 Aug 2022 14:53:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660834422; bh=z9jMag34Revwi7M6Emn7rGcB11u4C8eugx68+5BNMlo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LG/3WHyjmYeOzvWA7ugpb7hopAAQQaB1tWvdJE8mZLb3ML8QqMXUleXHtqjhGY8Q7 BKrO6EIVcYrFb2F7poAO+DiswygsowDyQoCDSQ6BOwYIydKdAfNVDxf5Es4Cf3pI/m O58j1S1fULMvsR/XTOhfCGjHM/xePqPu6PhQSGyMa5bDIS5sB4dRbmcNDC/SZnK3OI /Nx4QN+LuhkE7fDxmWq5qcJBbRiR/lTC+bs6bKSG59PtqMdSIwHLYGF1wVzGHRh+98 RaUpNAod7PUwNOgdfv9EK9KvKe+LqvwaMg8LYhCsP8+pSn35wNYQ6LNtrG7twSqIOQ b8/PUsRYEEhvQ== From: Ard Biesheuvel To: grub-devel@gnu.org Cc: Ard Biesheuvel , Daniel Kiper , Leif Lindholm , Nikita Ermakov , Atish Patra , Huacai Chen , Heinrich Schuchardt , dann frazier , Julian Andres Klode Subject: [PATCH v3 8/8] linux: ignore FDT unless we need to modify it Date: Thu, 18 Aug 2022 16:51:35 +0200 Message-Id: <20220818145135.2208251-9-ardb@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220818145135.2208251-1-ardb@kernel.org> References: <20220818145135.2208251-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2700; i=ardb@kernel.org; h=from:subject; bh=z9jMag34Revwi7M6Emn7rGcB11u4C8eugx68+5BNMlo=; b=owEB7QES/pANAwAKAcNPIjmS2Y8kAcsmYgBi/lH1KK6IPTVPDKx+siEaFSTJsXj+Fw/qUZF1Ki29 Zli3NcSJAbMEAAEKAB0WIQT72WJ8QGnJQhU3VynDTyI5ktmPJAUCYv5R9QAKCRDDTyI5ktmPJEUgC/ 9evvOzy2dJ3c/rwx8w11csT4w4TfrfQMW6s6MxmQWtp+bL7T+51AzfrLaSJJF+j6ZBq/ciymvy4x/q Ov3GYHhAcTqCeOHtv6/YlHx4PC62uy6NJw9M7E6jRCnTlX4UlLtvsJiLbpOwKZ+mvx++d2rHOg743D HIIK6fQwbt/x4ec2JtnJoq80crm2Gy3TG2lIWduyS/2jHcdfPH8br7YFcdFS6MW09IpIfjVvUZj+hM 5uHDnHfuwbYIldW2vZ7ssXO6niHgMDs+1M0nVBMlTaC0rGVwmX2apED2ceyDcpnMYZ5M1mlUhwozDq v/m6S4MmD6QWb5+mqEDUDVRujZ242wwwTvyufk+LjEwz+08gS8dztNEHf61jMH8bqegbL8YCHZj7Wy tjVbIGcmpwrZq8VSlaTUvNGYuUhejV02vc07zBm88O2LrHSikBzhu8AM8z7cR09T1t5zD5TBJl5eBl CUTj3PO/k617SKr9Hl3HWdhs9Gkb2cFhWplljSCpdcH7E= X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2604:1380:4641:c500::1; envelope-from=ardb@kernel.org; helo=dfw.source.kernel.org X-Spam_score_int: -71 X-Spam_score: -7.2 X-Spam_bar: ------- X-Spam_report: (-7.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Aug 2022 14:53:48 -0000 Now that we implemented support for the LoadFile2 protocol for initrd loading, there is no longer a need to pass the initrd parameters via the device tree. This means that when the LoadFile2 protocol is being used, there is no reason to update the device tree in the first place, and so we can ignore it entirely. The only remaining reason to deal with the devicetree is if we are using the 'devicetree' command to load one from disk, so tweak the logic in grub_fdt_install() to take that into account. Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- grub-core/loader/arm64/linux.c | 22 ++++++++++---------- grub-core/loader/efi/fdt.c | 7 +++++-- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c index 8b7fbb35fb72..36396e9f7ff5 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -133,21 +133,21 @@ finalize_params_linux (void) void *fdt; - fdt = grub_fdt_load (GRUB_EFI_LINUX_FDT_EXTRA_SPACE); + /* Set initrd info */ + if (initrd_start && initrd_end > initrd_start) + { + fdt = grub_fdt_load (GRUB_EFI_LINUX_FDT_EXTRA_SPACE); - if (!fdt) - goto failure; + if (!fdt) + goto failure; - node = grub_fdt_find_subnode (fdt, 0, "chosen"); - if (node < 0) - node = grub_fdt_add_subnode (fdt, 0, "chosen"); + node = grub_fdt_find_subnode (fdt, 0, "chosen"); + if (node < 0) + node = grub_fdt_add_subnode (fdt, 0, "chosen"); - if (node < 1) - goto failure; + if (node < 1) + goto failure; - /* Set initrd info */ - if (initrd_start && initrd_end > initrd_start) - { grub_dprintf ("linux", "Initrd @ %p-%p\n", (void *) initrd_start, (void *) initrd_end); diff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c index c86f283d756b..771d455c7319 100644 --- a/grub-core/loader/efi/fdt.c +++ b/grub-core/loader/efi/fdt.c @@ -89,13 +89,16 @@ grub_fdt_install (void) grub_efi_guid_t fdt_guid = GRUB_EFI_DEVICE_TREE_GUID; grub_efi_status_t status; + if (!fdt && !loaded_fdt) + return GRUB_ERR_NONE; + b = grub_efi_system_table->boot_services; - status = b->install_configuration_table (&fdt_guid, fdt); + status = b->install_configuration_table (&fdt_guid, fdt ?: loaded_fdt); if (status != GRUB_EFI_SUCCESS) return grub_error (GRUB_ERR_IO, "failed to install FDT"); grub_dprintf ("fdt", "Installed/updated FDT configuration table @ %p\n", - fdt); + fdt ?: loaded_fdt); return GRUB_ERR_NONE; } -- 2.35.1