On Wed, Mar 11, 2015 at 12:39:44PM +0000, Hanjun Guo wrote:
> From: Al Stone <al.stone@xxxxxxxxxx>
>
> ACPI reduced hardware mode is disabled by default, but ARM64
> can only run properly in ACPI hardware reduced mode, so select
> ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64.
>
> If the firmware is not using hardware reduced ACPI mode, we
> will disable ACPI to avoid nightmare such as accessing some
> registers which are not available on ARM64.
>
> CC: Catalin Marinas <catalin.marinas@xxxxxxx>
> CC: Will Deacon <will.deacon@xxxxxxx>
> Reviewed-by: Grant Likely <grant.likely@xxxxxxxxxx>
> Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@xxxxxxx>
> Tested-by: Yijing Wang <wangyijing@xxxxxxxxxx>
> Tested-by: Mark Langsdorf <mlangsdo@xxxxxxxxxx>
> Tested-by: Jon Masters <jcm@xxxxxxxxxx>
> Tested-by: Timur Tabi <timur@xxxxxxxxxxxxxx>
> Tested-by: Robert Richter <rrichter@xxxxxxxxxx>
> Acked-by: Robert Richter <rrichter@xxxxxxxxxx>
> Signed-off-by: Al Stone <al.stone@xxxxxxxxxx>
> Signed-off-by: Hanjun Guo <hanjun.guo@xxxxxxxxxx>
> ---
> arch/arm64/Kconfig | 1 +
> arch/arm64/kernel/acpi.c | 8 +++++++-
> 2 files changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
> index 1b8e973..d00ab9a 100644
> --- a/arch/arm64/Kconfig
> +++ b/arch/arm64/Kconfig
> @@ -1,5 +1,6 @@
> config ARM64
> def_bool y
> + select ACPI_REDUCED_HARDWARE_ONLY if ACPI
> select ARCH_BINFMT_ELF_RANDOMIZE_PIE
> select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
> select ARCH_HAS_GCOV_PROFILE_ALL
> diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
> index 6468f88..5819ef7 100644
> --- a/arch/arm64/kernel/acpi.c
> +++ b/arch/arm64/kernel/acpi.c
> @@ -303,6 +303,11 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table)
> */
> if (table->revision > 5 ||
> (table->revision == 5 && fadt->minor_revision >= 1)) {
> + if (!acpi_gbl_reduced_hardware) {
> + pr_err("Not hardware reduced ACPI mode, will not be supported\n");
> + goto disable_acpi;
> + }
> +
I reviewed the code and found that acpi_parse_fadt has become very
complex to read and understand. On top of that, I still do not understand
why you check PSCI presence in there (to print a warning ?) and as it
was raised before disable_acpi() is scattered all over the place.
I do not understand why we enable ACPI to disable it again if
one of the checks fails, IMHO it is better to leave it disabled,
carry out the checks and enable ACPI if all of them pass.
I came up with the patch attached on top of your series, which should be
split, tested on Juno, please test, let me know your opinion and shout if
you spot something wrong, it should simplify things a lot.
I wonder if acpi_get_table_with_size() usage is frowned upon, but you
use it anyway and it helps us remove the FADT parsing function that
in my opinion is useless, since its return value is dumped by ACPI
core.
Thanks,
Lorenzo
---
arch/arm64/kernel/acpi.c | 92 ++++++++++++++++++++++++------------------------
1 file changed, 46 insertions(+), 46 deletions(-)
diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
index 5819ef7..b7497fa 100644
--- a/arch/arm64/kernel/acpi.c
+++ b/arch/arm64/kernel/acpi.c
@@ -291,56 +291,23 @@ void acpi_unregister_gsi(u32 gsi)
}
EXPORT_SYMBOL_GPL(acpi_unregister_gsi);
-static int __init acpi_parse_fadt(struct acpi_table_header *table)
-{
- struct acpi_table_fadt *fadt = (struct acpi_table_fadt *)table;
-
- /*
- * Revision in table header is the FADT Major revision, and there
- * is a minor revision of FADT which was introduced by ACPI 5.1,
- * we only deal with ACPI 5.1 or newer revision to get GIC and SMP
- * boot protocol configuration data, or we will disable ACPI.
- */
- if (table->revision > 5 ||
- (table->revision == 5 && fadt->minor_revision >= 1)) {
- if (!acpi_gbl_reduced_hardware) {
- pr_err("Not hardware reduced ACPI mode, will not be supported\n");
- goto disable_acpi;
- }
-
- /*
- * ACPI 5.1 only has two explicit methods to boot up SMP,
- * PSCI and Parking protocol, but the Parking protocol is
- * only specified for ARMv7 now, so make PSCI as the only
- * way for the SMP boot protocol before some updates for
- * the Parking protocol spec.
- */
- if (acpi_psci_present())
- return 0;
-
- pr_warn("No PSCI support, will not bring up secondary CPUs\n");
- return -EOPNOTSUPP;
- }
-
- pr_warn("Unsupported FADT revision %d.%d, should be 5.1+, will disable ACPI\n",
- table->revision, fadt->minor_revision);
-
-disable_acpi:
- disable_acpi();
- return -EINVAL;
-}
-
/*
* acpi_boot_table_init() called from setup_arch(), always.
* 1. find RSDP and get its address, and then find XSDT
* 2. extract all tables and checksums them all
* 3. check ACPI FADT revision
+ * 4. check ACPI FADT HW reduced flag
*
* We can parse ACPI boot-time tables such as MADT after
* this function is called.
*/
void __init acpi_boot_table_init(void)
{
+ struct acpi_table_header *table;
+ struct acpi_table_fadt *fadt;
+ acpi_status status;
+ acpi_size tbl_size;
+
/*
* Enable ACPI instead of device tree unless
* - ACPI has been disabled explicitly (acpi=off), or
@@ -351,19 +318,52 @@ void __init acpi_boot_table_init(void)
(!param_acpi_force && of_scan_flat_dt(dt_scan_depth1_nodes, NULL)))
return;
- enable_acpi();
-
/* Initialize the ACPI boot-time table parser. */
if (acpi_table_init()) {
- disable_acpi();
+ pr_err("Failed to init ACPI tables\n");
return;
}
- if (acpi_table_parse(ACPI_SIG_FADT, acpi_parse_fadt)) {
- /* disable ACPI if no FADT is found */
- disable_acpi();
- pr_err("Can't find FADT\n");
+ /*
+ * FADT is required on arm64; retrieve it to check its presence
+ * and carry out revision and ACPI HW reduced compliancy tests
+ */
+ status = acpi_get_table_with_size(ACPI_SIG_FADT, 0, &table, &tbl_size);
+ if (ACPI_FAILURE(status)) {
+ const char *msg = acpi_format_exception(status);
+
+ pr_err("Failed to get FADT table, %s\n", msg);
+ return;
}
+
+ fadt = (struct acpi_table_fadt *)table;
+
+ /*
+ * Revision in table header is the FADT Major revision, and there
+ * is a minor revision of FADT which was introduced by ACPI 5.1,
+ * we only deal with ACPI 5.1 or newer revision to get GIC and SMP
+ * boot protocol configuration data.
+ */
+ if (table->revision < 5 ||
+ (table->revision == 5 && fadt->minor_revision < 1)) {
+ pr_err("Unsupported FADT revision %d.%d, should be 5.1+\n",
+ table->revision, fadt->minor_revision);
+ goto out_unmap;
+ }
+
+ if (!(fadt->flags & ACPI_FADT_HW_REDUCED)) {
+ pr_err("FADT not ACPI hardware reduced compliant\n");
+ goto out_unmap;
+ }
+
+ enable_acpi();
+
+ /*
+ * acpi_get_table_with_size() creates FADT table mapping that
+ * should be released after parsing and before resuming boot
+ */
+out_unmap:
+ early_acpi_os_unmap_memory((char *)table, tbl_size);
}
void __init acpi_gic_init(void)
--
2.2.1
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
