All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Boyd <sboyd@kernel.org>
To: Rob Herring <robh+dt@kernel.org>
Cc: linux-kernel@vger.kernel.org, patches@lists.linux.dev,
	linux-um@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org, kunit-dev@googlegroups.com,
	linux-kselftest@vger.kernel.org, devicetree@vger.kernel.org,
	Frank Rowand <frowand.list@gmail.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>
Subject: [PATCH v2 1/7] arm64: Unconditionally call unflatten_device_tree()
Date: Mon, 29 Jan 2024 16:45:00 -0800	[thread overview]
Message-ID: <20240130004508.1700335-2-sboyd@kernel.org> (raw)
In-Reply-To: <20240130004508.1700335-1-sboyd@kernel.org>

Call this function unconditionally so that we can populate an empty DTB
on platforms that don't boot with a firmware provided or builtin DTB.
Override 'initial_boot_params' to NULL when ACPI is in use but the
bootloader has loaded a DTB so that we don't allow both ACPI and DT to
be used during boot. If there isn't a valid initial_boot_params dtb then
unflatten_device_tree() returns early so this is fine.

Cc: Rob Herring <robh+dt@kernel.org>
Cc: Frank Rowand <frowand.list@gmail.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: <linux-arm-kernel@lists.infradead.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
---
 arch/arm64/kernel/setup.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 417a8a86b2db..ffb1942724ae 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -351,8 +351,11 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p)
 	/* Parse the ACPI tables for possible boot-time configuration */
 	acpi_boot_table_init();
 
-	if (acpi_disabled)
-		unflatten_device_tree();
+	/* Don't use the FDT from boot if ACPI is in use */
+	if (!acpi_disabled)
+		initial_boot_params = NULL;
+
+	unflatten_device_tree();
 
 	bootmem_init();
 
-- 
https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/
https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git


WARNING: multiple messages have this Message-ID (diff)
From: Stephen Boyd <sboyd@kernel.org>
To: Rob Herring <robh+dt@kernel.org>
Cc: linux-kernel@vger.kernel.org, patches@lists.linux.dev,
	linux-um@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org, kunit-dev@googlegroups.com,
	linux-kselftest@vger.kernel.org, devicetree@vger.kernel.org,
	Frank Rowand <frowand.list@gmail.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>
Subject: [PATCH v2 1/7] arm64: Unconditionally call unflatten_device_tree()
Date: Mon, 29 Jan 2024 16:45:00 -0800	[thread overview]
Message-ID: <20240130004508.1700335-2-sboyd@kernel.org> (raw)
In-Reply-To: <20240130004508.1700335-1-sboyd@kernel.org>

Call this function unconditionally so that we can populate an empty DTB
on platforms that don't boot with a firmware provided or builtin DTB.
Override 'initial_boot_params' to NULL when ACPI is in use but the
bootloader has loaded a DTB so that we don't allow both ACPI and DT to
be used during boot. If there isn't a valid initial_boot_params dtb then
unflatten_device_tree() returns early so this is fine.

Cc: Rob Herring <robh+dt@kernel.org>
Cc: Frank Rowand <frowand.list@gmail.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: <linux-arm-kernel@lists.infradead.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
---
 arch/arm64/kernel/setup.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 417a8a86b2db..ffb1942724ae 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -351,8 +351,11 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p)
 	/* Parse the ACPI tables for possible boot-time configuration */
 	acpi_boot_table_init();
 
-	if (acpi_disabled)
-		unflatten_device_tree();
+	/* Don't use the FDT from boot if ACPI is in use */
+	if (!acpi_disabled)
+		initial_boot_params = NULL;
+
+	unflatten_device_tree();
 
 	bootmem_init();
 
-- 
https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/
https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  reply	other threads:[~2024-01-30  0:45 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-30  0:44 [PATCH v2 0/7] of: populate of_root node if bootloader doesn't Stephen Boyd
2024-01-30  0:44 ` Stephen Boyd
2024-01-30  0:45 ` Stephen Boyd [this message]
2024-01-30  0:45   ` [PATCH v2 1/7] arm64: Unconditionally call unflatten_device_tree() Stephen Boyd
2024-01-31 20:54   ` Rob Herring
2024-01-31 20:54     ` Rob Herring
2024-01-31 22:59     ` Stephen Boyd
2024-01-31 22:59       ` Stephen Boyd
2024-02-02 16:30       ` Rob Herring
2024-02-02 16:30         ` Rob Herring
2024-01-30  0:45 ` [PATCH v2 2/7] um: " Stephen Boyd
2024-01-30  0:45   ` Stephen Boyd
2024-01-30  0:45 ` [PATCH v2 3/7] x86/of: Unconditionally call unflatten_and_copy_device_tree() Stephen Boyd
2024-01-30  0:45   ` Stephen Boyd
2024-01-30 13:30   ` Saurabh Singh Sengar
2024-01-30 13:30     ` Saurabh Singh Sengar
2024-01-30  0:45 ` [PATCH v2 4/7] of: Always unflatten in unflatten_and_copy_device_tree() Stephen Boyd
2024-01-30  0:45   ` Stephen Boyd
2024-01-30  0:45 ` [PATCH v2 5/7] of: Create of_root if no dtb provided by firmware Stephen Boyd
2024-01-30  0:45   ` Stephen Boyd
2024-01-30  0:45 ` [PATCH v2 6/7] of: unittest: treat missing of_root as error instead of fixing up Stephen Boyd
2024-01-30  0:45   ` Stephen Boyd
2024-01-30  0:45 ` [PATCH v2 7/7] of: Add KUnit test to confirm DTB is loaded Stephen Boyd
2024-01-30  0:45   ` Stephen Boyd

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240130004508.1700335-2-sboyd@kernel.org \
    --to=sboyd@kernel.org \
    --cc=catalin.marinas@arm.com \
    --cc=devicetree@vger.kernel.org \
    --cc=frowand.list@gmail.com \
    --cc=kunit-dev@googlegroups.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=linux-um@lists.infradead.org \
    --cc=mark.rutland@arm.com \
    --cc=patches@lists.linux.dev \
    --cc=robh+dt@kernel.org \
    --cc=will@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.