From: Hanjun Guo <hanjun.guo@linaro.org>
To: Catalin Marinas <catalin.marinas@arm.com>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
Mark Rutland <mark.rutland@arm.com>,
Grant Likely <grant.likely@linaro.org>,
Will Deacon <will.deacon@arm.com>
Cc: Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>,
Graeme Gregory <graeme.gregory@linaro.org>,
Sudeep Holla <Sudeep.Holla@arm.com>, Jon Masters <jcm@redhat.com>,
Jason Cooper <jason@lakedaemon.net>,
Marc Zyngier <marc.zyngier@arm.com>,
Bjorn Helgaas <bhelgaas@google.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Mark Brown <broonie@kernel.org>, Rob Herring <robh@kernel.org>,
Robert Richter <rric@kernel.org>,
Randy Dunlap <rdunlap@infradead.org>,
Charles.Garcia-Tobin@arm.com, phoenix.liyi@huawei.com,
Timur Tabi <timur@codeaurora.org>,
Ashwin Chaugule <ashwinc@codeaurora.org>,
suravee.suthikulpanit@amd.com,
Mark Langsdorf <mlangsdo@redhat.com>,
wangyijing@huawei.com, linux-acpi@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org,
Hanjun Guo <hanjun.guo@linaro.org>,
Jonathan Corbet <corbet@lwn.net>,
Leif Lindholm <leif.lindholm@linaro.org>,
Matt Fleming <matt.fleming@intel.com>
Subject: [PATCH v8 08/21] dt / chosen: Add linux,uefi-stub-generated-dtb property
Date: Mon, 2 Feb 2015 20:45:36 +0800 [thread overview]
Message-ID: <1422881149-8177-9-git-send-email-hanjun.guo@linaro.org> (raw)
In-Reply-To: <1422881149-8177-1-git-send-email-hanjun.guo@linaro.org>
When system supporting both DT and ACPI but firmware providing
no dtb, we can use this linux,uefi-stub-generated-dtb property
to let kernel know that we can try ACPI configuration data even
if no "acpi=force" is passed in early parameters.
CC: Mark Rutland <mark.rutland@arm.com>
CC: Jonathan Corbet <corbet@lwn.net>
CC: Catalin Marinas <catalin.marinas@arm.com>
CC: Will Deacon <will.deacon@arm.com>
CC: Leif Lindholm <leif.lindholm@linaro.org>
CC: Grant Likely <grant.likely@linaro.org>
CC: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
---
Documentation/arm/uefi.txt | 3 +++
arch/arm64/include/asm/acpi.h | 1 +
arch/arm64/kernel/setup.c | 30 ++++++++++++++++++++++++++++++
drivers/firmware/efi/libstub/fdt.c | 8 ++++++++
4 files changed, 42 insertions(+)
diff --git a/Documentation/arm/uefi.txt b/Documentation/arm/uefi.txt
index d60030a..5f86eae 100644
--- a/Documentation/arm/uefi.txt
+++ b/Documentation/arm/uefi.txt
@@ -60,5 +60,8 @@ linux,uefi-mmap-desc-ver | 32-bit | Version of the mmap descriptor format.
--------------------------------------------------------------------------------
linux,uefi-stub-kern-ver | string | Copy of linux_banner from build.
--------------------------------------------------------------------------------
+linux,uefi-stub-generated-dtb | bool | Indication for no DTB provided by
+ | | firmware.
+--------------------------------------------------------------------------------
For verbose debug messages, specify 'uefi_debug' on the kernel command line.
diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h
index 496c33b..9fcf632 100644
--- a/arch/arm64/include/asm/acpi.h
+++ b/arch/arm64/include/asm/acpi.h
@@ -49,6 +49,7 @@ static inline void arch_fix_phys_package_id(int num, u32 slot) { }
#else
static inline void disable_acpi(void) { }
+static inline void enable_acpi(void) { }
#endif /* CONFIG_ACPI */
#endif /*_ASM_ACPI_H*/
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index fc4fb7b..510a681 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -371,6 +371,29 @@ static void __init request_standard_resources(void)
}
}
+static int __init dt_scan_chosen(unsigned long node, const char *uname,
+ int depth, void *data)
+{
+ const char *p;
+
+ if (depth != 1 || !data || (strcmp(uname, "chosen") != 0))
+ return 0;
+
+ p = of_get_flat_dt_prop(node, "linux,uefi-stub-generated-dtb", NULL);
+ *(bool *)data = p ? true : false;
+
+ return 1;
+}
+
+static bool __init is_uefi_stub_generated_dtb(void)
+{
+ bool flag = false;
+
+ of_scan_flat_dt(dt_scan_chosen, &flag);
+
+ return flag;
+}
+
u64 __cpu_logical_map[NR_CPUS] = { [0 ... NR_CPUS-1] = INVALID_HWID };
void __init setup_arch(char **cmdline_p)
@@ -399,6 +422,13 @@ void __init setup_arch(char **cmdline_p)
parse_early_param();
/*
+ * If no dtb provided by firmware, enable ACPI and give system a
+ * chance to boot with ACPI configuration data
+ */
+ if (is_uefi_stub_generated_dtb() && acpi_disabled)
+ enable_acpi();
+
+ /*
* Unmask asynchronous aborts after bringing up possible earlycon.
* (Report possible System Errors once we can report this occurred)
*/
diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c
index c846a96..3777d50 100644
--- a/drivers/firmware/efi/libstub/fdt.c
+++ b/drivers/firmware/efi/libstub/fdt.c
@@ -154,6 +154,14 @@ efi_status_t update_fdt(efi_system_table_t *sys_table, void *orig_fdt,
if (status)
goto fdt_set_fail;
+ /* Add a property to show the dtb is generated by uefi stub */
+ if (!orig_fdt) {
+ status = fdt_setprop(fdt, node,
+ "linux,uefi-stub-generated-dtb", NULL, 0);
+ if (status)
+ goto fdt_set_fail;
+ }
+
return EFI_SUCCESS;
fdt_set_fail:
--
1.9.1
next prev parent reply other threads:[~2015-02-02 12:49 UTC|newest]
Thread overview: 123+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-02 12:45 [PATCH v8 00/21] Introduce ACPI for ARM64 based on ACPI 5.1 Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 01/21] acpi: add arm64 to the platforms that use ioremap Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 02/21] acpi: fix acpi_os_ioremap for arm64 Hanjun Guo
2015-02-02 22:14 ` Rafael J. Wysocki
2015-02-03 9:08 ` Hanjun Guo
2015-02-03 11:37 ` Catalin Marinas
2015-02-03 11:41 ` Ard Biesheuvel
2015-02-03 17:29 ` Mark Salter
2015-02-03 22:04 ` Rafael J. Wysocki
2015-02-04 10:48 ` Russell King - ARM Linux
2015-02-04 13:22 ` Rafael J. Wysocki
2015-02-04 15:53 ` Bjorn Helgaas
2015-02-04 16:25 ` Russell King - ARM Linux
2015-02-04 16:38 ` David Woodhouse
2015-02-04 16:41 ` Bjorn Helgaas
2015-02-04 11:25 ` Catalin Marinas
2015-02-04 16:08 ` Mark Salter
2015-02-04 16:16 ` Timur Tabi
2015-02-04 17:52 ` Catalin Marinas
2015-02-04 17:57 ` Catalin Marinas
2015-02-04 18:58 ` Mark Salter
2015-02-05 10:41 ` Catalin Marinas
2015-02-05 10:47 ` Ard Biesheuvel
2015-02-05 10:59 ` Catalin Marinas
2015-02-05 11:14 ` Graeme Gregory
2015-02-05 12:07 ` Catalin Marinas
2015-02-05 12:52 ` Graeme Gregory
2015-02-05 14:50 ` Catalin Marinas
2015-02-05 12:55 ` Ard Biesheuvel
2015-02-05 13:54 ` Mark Salter
2015-02-05 16:42 ` [Linaro-acpi] " Al Stone
2015-02-05 17:48 ` Catalin Marinas
2015-02-05 22:16 ` Ard Biesheuvel
2015-02-06 10:36 ` Catalin Marinas
2015-02-06 11:08 ` Ard Biesheuvel
2015-02-06 14:16 ` Catalin Marinas
2015-02-07 1:44 ` Ard Biesheuvel
2015-02-05 1:24 ` Rafael J. Wysocki
2015-02-02 12:45 ` [PATCH v8 03/21] arm64: allow late use of early_ioremap Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 04/21] ARM64 / ACPI: Get RSDP and ACPI boot-time tables Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 05/21] ACPI / sleep: Introduce sleep_arm.c Hanjun Guo
2015-02-02 22:18 ` Rafael J. Wysocki
2015-02-03 16:18 ` Graeme Gregory
2015-02-02 12:45 ` [PATCH v8 06/21] ARM64 / ACPI: Introduce PCI stub functions for ACPI Hanjun Guo
2015-02-03 12:15 ` Catalin Marinas
2015-02-03 13:30 ` Hanjun Guo
2015-02-03 14:55 ` Rafael J. Wysocki
2015-02-04 9:06 ` Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 07/21] ARM64 / ACPI: Introduce early_param for "acpi" and pass acpi=force to enable ACPI Hanjun Guo
2015-02-02 12:45 ` Hanjun Guo [this message]
2015-02-02 13:40 ` [PATCH v8 08/21] dt / chosen: Add linux,uefi-stub-generated-dtb property Leif Lindholm
2015-02-02 13:50 ` Graeme Gregory
2015-02-02 16:32 ` Mark Rutland
2015-02-06 10:34 ` G Gregory
2015-02-07 3:36 ` Hanjun Guo
2015-02-07 5:03 ` Ard Biesheuvel
2015-02-07 6:51 ` Hanjun Guo
2015-02-09 11:46 ` Mark Rutland
2015-02-11 2:44 ` Ard Biesheuvel
2015-02-11 6:33 ` Stefano Stabellini
2015-02-11 6:53 ` Ard Biesheuvel
2015-02-11 7:07 ` Stefano Stabellini
2015-02-02 12:45 ` [PATCH v8 09/21] ARM64 / ACPI: Disable ACPI if FADT revision is less than 5.1 Hanjun Guo
2015-02-03 17:20 ` Catalin Marinas
2015-02-04 9:38 ` Hanjun Guo
2015-02-04 13:06 ` Lorenzo Pieralisi
2015-02-05 9:45 ` Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 10/21] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 11/21] ARM64 / ACPI: Get PSCI flags in FADT for PSCI init Hanjun Guo
2015-02-04 16:43 ` Lorenzo Pieralisi
2015-02-05 9:48 ` Hanjun Guo
2015-02-05 17:11 ` [Linaro-acpi] " Al Stone
2015-02-05 17:49 ` Lorenzo Pieralisi
2015-02-05 19:03 ` Al Stone
2015-02-06 7:56 ` Hanjun Guo
2015-02-06 16:21 ` Lorenzo Pieralisi
2015-02-02 12:45 ` [PATCH v8 12/21] ACPI / table: Print GIC information when MADT is parsed Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 13/21] ARM64 / ACPI: Parse MADT for SMP initialization Hanjun Guo
2015-02-03 13:53 ` Mark Rutland
2015-02-04 9:05 ` Hanjun Guo
2015-02-04 10:30 ` Mark Rutland
2015-02-05 9:20 ` Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 14/21] ACPI / processor: Make it possible to get CPU hardware ID via GICC Hanjun Guo
2015-02-03 14:17 ` Mark Rutland
2015-02-03 20:09 ` Catalin Marinas
2015-02-04 9:48 ` Hanjun Guo
2015-02-04 11:21 ` Catalin Marinas
2015-02-05 9:27 ` Hanjun Guo
2015-02-05 10:52 ` Catalin Marinas
2015-02-09 6:55 ` Will Deacon
2015-02-09 9:52 ` Catalin Marinas
2015-02-02 12:45 ` [PATCH v8 15/21] ARM64 / ACPI: Introduce ACPI_IRQ_MODEL_GIC and register device's gsi Hanjun Guo
2015-02-09 6:34 ` Will Deacon
2015-02-09 6:53 ` Hanjun Guo
2015-02-09 7:07 ` Will Deacon
2015-02-02 12:45 ` [PATCH v8 16/21] irqchip: Add GICv2 specific ACPI boot support Hanjun Guo
2015-02-02 22:23 ` Rafael J. Wysocki
2015-02-03 15:38 ` Tomasz Nowicki
2015-02-02 12:45 ` [PATCH v8 17/21] clocksource / arch_timer: Parse GTDT to initialize arch timer Hanjun Guo
2015-02-02 22:23 ` Rafael J. Wysocki
2015-02-03 13:28 ` Hanjun Guo
2015-02-04 18:59 ` Lorenzo Pieralisi
2015-02-05 10:11 ` Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 18/21] ARM64 / ACPI: Select ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64 Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 19/21] ARM64 / ACPI: Enable ARM64 in Kconfig Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 20/21] Documentation: ACPI for ARM64 Hanjun Guo
2015-02-02 19:01 ` Timur Tabi
2015-02-03 8:44 ` Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 21/21] arm64: ACPI: additions of ACPI documentation for arm64 Hanjun Guo
2015-02-04 0:40 ` Al Stone
2015-02-04 18:12 ` Mark Brown
2015-02-04 19:06 ` Al Stone
2015-02-05 2:02 ` Mark Brown
2015-02-03 16:47 ` [PATCH v8 00/21] Introduce ACPI for ARM64 based on ACPI 5.1 Mark Rutland
2015-02-03 17:43 ` [Linaro-acpi] " Al Stone
2015-02-04 9:41 ` Hanjun Guo
2015-02-04 20:29 ` Timur Tabi
2015-02-05 10:16 ` Hanjun Guo
2015-02-12 10:02 ` Robert Richter
2015-02-13 2:48 ` Hanjun Guo
2015-02-19 16:10 ` Robert Richter
[not found] ` <a314cdbbefb349acbb8f47d6e806989f@NASANEXM01D.na.qualcomm.com>
2015-02-13 0:50 ` Jonathan (Zhixiong) Zhang
2015-02-13 7:50 ` Hanjun Guo
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=1422881149-8177-9-git-send-email-hanjun.guo@linaro.org \
--to=hanjun.guo@linaro.org \
--cc=Charles.Garcia-Tobin@arm.com \
--cc=Lorenzo.Pieralisi@arm.com \
--cc=Sudeep.Holla@arm.com \
--cc=arnd@arndb.de \
--cc=ashwinc@codeaurora.org \
--cc=bhelgaas@google.com \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=corbet@lwn.net \
--cc=daniel.lezcano@linaro.org \
--cc=graeme.gregory@linaro.org \
--cc=grant.likely@linaro.org \
--cc=jason@lakedaemon.net \
--cc=jcm@redhat.com \
--cc=leif.lindholm@linaro.org \
--cc=linaro-acpi@lists.linaro.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=mark.rutland@arm.com \
--cc=matt.fleming@intel.com \
--cc=mlangsdo@redhat.com \
--cc=olof@lixom.net \
--cc=phoenix.liyi@huawei.com \
--cc=rdunlap@infradead.org \
--cc=rjw@rjwysocki.net \
--cc=robh@kernel.org \
--cc=rric@kernel.org \
--cc=suravee.suthikulpanit@amd.com \
--cc=timur@codeaurora.org \
--cc=wangyijing@huawei.com \
--cc=will.deacon@arm.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).