Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull initial ACPI support for arm64 from Will Deacon:
 "This series introduces preliminary ACPI 5.1 support to the arm64
  kernel using the "hardware reduced" profile.  We don't support any
  peripherals yet, so it's fairly limited in scope:

   - MEMORY init (UEFI)

   - ACPI discovery (RSDP via UEFI)

   - CPU init (FADT)

   - GIC init (MADT)

   - SMP boot (MADT + PSCI)

   - ACPI Kconfig options (dependent on EXPERT)

  ACPI for arm64 has been in development for a while now and hardware
  has been available that can boot with either FDT or ACPI tables.  This
  has been made possible by both changes to the ACPI spec to cater for
  ARM-based machines (known as "hardware-reduced" in ACPI parlance) but
  also a Linaro-driven effort to get this supported on top of the Linux
  kernel.  This pull request is the result of that work.

  These changes allow us to initialise the CPUs, interrupt controller,
  and timers via ACPI tables, with memory information and cmdline coming
  from EFI.  We don't support a hybrid ACPI/FDT scheme.  Of course,
  there is still plenty of work to do (a serial console would be nice!)
  but I expect that to happen on a per-driver basis after this core
  series has been merged.

  Anyway, the diff stat here is fairly horrible, but splitting this up
  and merging it via all the different subsystems would have been
  extremely painful.  Instead, we've got all the relevant Acks in place
  and I've not seen anything other than trivial (Kconfig) conflicts in
  -next (for completeness, I've included my resolution below).  Nearly
  half of the insertions fall under Documentation/.

  So, we'll see how this goes.  Right now, it all depends on EXPERT and
  I fully expect people to use FDT by default for the immediate future"

* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (31 commits)
  ARM64 / ACPI: make acpi_map_gic_cpu_interface() as void function
  ARM64 / ACPI: Ignore the return error value of acpi_map_gic_cpu_interface()
  ARM64 / ACPI: fix usage of acpi_map_gic_cpu_interface
  ARM64: kernel: acpi: honour acpi=force command line parameter
  ARM64: kernel: acpi: refactor ACPI tables init and checks
  ARM64: kernel: psci: let ACPI probe PSCI version
  ARM64: kernel: psci: factor out probe function
  ACPI: move arm64 GSI IRQ model to generic GSI IRQ layer
  ARM64 / ACPI: Don't unflatten device tree if acpi=force is passed
  ARM64 / ACPI: additions of ACPI documentation for arm64
  Documentation: ACPI for ARM64
  ARM64 / ACPI: Enable ARM64 in Kconfig
  XEN / ACPI: Make XEN ACPI depend on X86
  ARM64 / ACPI: Select ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64
  clocksource / arch_timer: Parse GTDT to initialize arch timer
  irqchip: Add GICv2 specific ACPI boot support
  ARM64 / ACPI: Introduce ACPI_IRQ_MODEL_GIC and register device's gsi
  ACPI / processor: Make it possible to get CPU hardware ID via GICC
  ACPI / processor: Introduce phys_cpuid_t for CPU hardware ID
  ARM64 / ACPI: Parse MADT for SMP initialization
  ...

17 files changed, 621 insertions, 43 deletions

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index da5f20e8cc50..4269dba63cf1 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1,5 +1,7 @@
 config ARM64
         def_bool y
+        select ACPI_GENERIC_GSI if ACPI
+        select ACPI_REDUCED_HARDWARE_ONLY if ACPI
         select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
         select ARCH_HAS_ELF_RANDOMIZE
         select ARCH_HAS_GCOV_PROFILE_ALL
@@ -758,6 +760,8 @@ source "drivers/Kconfig"
 
 source "drivers/firmware/Kconfig"
 
+source "drivers/acpi/Kconfig"
+
 source "fs/Kconfig"
 
 source "arch/arm64/kvm/Kconfig"
diff --git a/arch/arm64/include/asm/acenv.h b/arch/arm64/include/asm/acenv.h
new file mode 100644
index 000000000000..b49166fde7ea
--- /dev/null
+++ b/arch/arm64/include/asm/acenv.h
@@ -0,0 +1,18 @@
+/*
+ * ARM64 specific ACPICA environments and implementation
+ *
+ * Copyright (C) 2014, Linaro Ltd.
+ *   Author: Hanjun Guo <hanjun.guo@linaro.org>
+ *   Author: Graeme Gregory <graeme.gregory@linaro.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _ASM_ACENV_H
+#define _ASM_ACENV_H
+
+/* It is required unconditionally by ACPI core, update it when needed. */
+
+#endif /* _ASM_ACENV_H */
diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h
new file mode 100644
index 000000000000..59c05d8ea4a0
--- /dev/null
+++ b/arch/arm64/include/asm/acpi.h
@@ -0,0 +1,96 @@
+/*
+ *  Copyright (C) 2013-2014, Linaro Ltd.
+ *      Author: Al Stone <al.stone@linaro.org>
+ *      Author: Graeme Gregory <graeme.gregory@linaro.org>
+ *      Author: Hanjun Guo <hanjun.guo@linaro.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation;
+ */
+
+#ifndef _ASM_ACPI_H
+#define _ASM_ACPI_H
+
+#include <linux/mm.h>
+#include <linux/irqchip/arm-gic-acpi.h>
+
+#include <asm/cputype.h>
+#include <asm/smp_plat.h>
+
+/* Basic configuration for ACPI */
+#ifdef  CONFIG_ACPI
+/* ACPI table mapping after acpi_gbl_permanent_mmap is set */
+static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys,
+                                            acpi_size size)
+{
+        if (!page_is_ram(phys >> PAGE_SHIFT))
+                return ioremap(phys, size);
+
+        return ioremap_cache(phys, size);
+}
+#define acpi_os_ioremap acpi_os_ioremap
+
+typedef u64 phys_cpuid_t;
+#define PHYS_CPUID_INVALID INVALID_HWID
+
+#define acpi_strict 1   /* No out-of-spec workarounds on ARM64 */
+extern int acpi_disabled;
+extern int acpi_noirq;
+extern int acpi_pci_disabled;
+
+/* 1 to indicate PSCI 0.2+ is implemented */
+static inline bool acpi_psci_present(void)
+{
+        return acpi_gbl_FADT.arm_boot_flags & ACPI_FADT_PSCI_COMPLIANT;
+}
+
+/* 1 to indicate HVC must be used instead of SMC as the PSCI conduit */
+static inline bool acpi_psci_use_hvc(void)
+{
+        return acpi_gbl_FADT.arm_boot_flags & ACPI_FADT_PSCI_USE_HVC;
+}
+
+static inline void disable_acpi(void)
+{
+        acpi_disabled = 1;
+        acpi_pci_disabled = 1;
+        acpi_noirq = 1;
+}
+
+static inline void enable_acpi(void)
+{
+        acpi_disabled = 0;
+        acpi_pci_disabled = 0;
+        acpi_noirq = 0;
+}
+
+/*
+ * The ACPI processor driver for ACPI core code needs this macro
+ * to find out this cpu was already mapped (mapping from CPU hardware
+ * ID to CPU logical ID) or not.
+ */
+#define cpu_physical_id(cpu) cpu_logical_map(cpu)
+
+/*
+ * It's used from ACPI core in kdump to boot UP system with SMP kernel,
+ * with this check the ACPI core will not override the CPU index
+ * obtained from GICC with 0 and not print some error message as well.
+ * Since MADT must provide at least one GICC structure for GIC
+ * initialization, CPU will be always available in MADT on ARM64.
+ */
+static inline bool acpi_has_cpu_in_madt(void)
+{
+        return true;
+}
+
+static inline void arch_fix_phys_package_id(int num, u32 slot) { }
+void __init acpi_init_cpus(void);
+
+#else
+static inline bool acpi_psci_present(void) { return false; }
+static inline bool acpi_psci_use_hvc(void) { return false; }
+static inline void acpi_init_cpus(void) { }
+#endif /* CONFIG_ACPI */
+
+#endif /*_ASM_ACPI_H*/
diff --git a/arch/arm64/include/asm/cpu_ops.h b/arch/arm64/include/asm/cpu_ops.h
index da301ee7395c..5a31d6716914 100644
--- a/arch/arm64/include/asm/cpu_ops.h
+++ b/arch/arm64/include/asm/cpu_ops.h
@@ -66,5 +66,6 @@ struct cpu_operations {
 extern const struct cpu_operations *cpu_ops[NR_CPUS];
 int __init cpu_read_ops(struct device_node *dn, int cpu);
 void __init cpu_read_bootcpu_ops(void);
+const struct cpu_operations *cpu_get_ops(const char *name);
 
 #endif /* ifndef __ASM_CPU_OPS_H */
diff --git a/arch/arm64/include/asm/fixmap.h b/arch/arm64/include/asm/fixmap.h
index 926495686554..95e6b6dcbe37 100644
--- a/arch/arm64/include/asm/fixmap.h
+++ b/arch/arm64/include/asm/fixmap.h
@@ -62,6 +62,9 @@ void __init early_fixmap_init(void);
 
 #define __early_set_fixmap __set_fixmap
 
+#define __late_set_fixmap __set_fixmap
+#define __late_clear_fixmap(idx) __set_fixmap((idx), 0, FIXMAP_PAGE_CLEAR)
+
 extern void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot);
 
 #include <asm-generic/fixmap.h>
diff --git a/arch/arm64/include/asm/irq.h b/arch/arm64/include/asm/irq.h
index 94c53674a31d..bbb251b14746 100644
--- a/arch/arm64/include/asm/irq.h
+++ b/arch/arm64/include/asm/irq.h
@@ -1,6 +1,8 @@
 #ifndef __ASM_IRQ_H
 #define __ASM_IRQ_H
 
+#include <linux/irqchip/arm-gic-acpi.h>
+
 #include <asm-generic/irq.h>
 
 struct pt_regs;
@@ -8,4 +10,15 @@ struct pt_regs;
 extern void migrate_irqs(void);
 extern void set_handle_irq(void (*handle_irq)(struct pt_regs *));
 
+static inline void acpi_irq_init(void)
+{
+        /*
+         * Hardcode ACPI IRQ chip initialization to GICv2 for now.
+         * Proper irqchip infrastructure will be implemented along with
+         * incoming  GICv2m|GICv3|ITS bits.
+         */
+        acpi_gic_init();
+}
+#define acpi_irq_init acpi_irq_init
+
 #endif
diff --git a/arch/arm64/include/asm/pci.h b/arch/arm64/include/asm/pci.h
index 872ba939fcb2..b008a72f8bc0 100644
--- a/arch/arm64/include/asm/pci.h
+++ b/arch/arm64/include/asm/pci.h
@@ -27,6 +27,12 @@
 extern int isa_dma_bridge_buggy;
 
 #ifdef CONFIG_PCI
+static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
+{
+        /* no legacy IRQ on arm64 */
+        return -ENODEV;
+}
+
 static inline int pci_proc_domain(struct pci_bus *bus)
 {
         return 1;
diff --git a/arch/arm64/include/asm/psci.h b/arch/arm64/include/asm/psci.h
index e5312ea0ec1a..2454bc59c916 100644
--- a/arch/arm64/include/asm/psci.h
+++ b/arch/arm64/include/asm/psci.h
@@ -14,6 +14,7 @@
 #ifndef __ASM_PSCI_H
 #define __ASM_PSCI_H
 
-int psci_init(void);
+int psci_dt_init(void);
+int psci_acpi_init(void);
 
 #endif /* __ASM_PSCI_H */
diff --git a/arch/arm64/include/asm/smp.h b/arch/arm64/include/asm/smp.h
index 780f82c827b6..bf22650b1a78 100644
--- a/arch/arm64/include/asm/smp.h
+++ b/arch/arm64/include/asm/smp.h
@@ -39,9 +39,10 @@ extern void show_ipi_list(struct seq_file *p, int prec);
 extern void handle_IPI(int ipinr, struct pt_regs *regs);
 
 /*
- * Setup the set of possible CPUs (via set_cpu_possible)
+ * Discover the set of possible CPUs and determine their
+ * SMP operations.
  */
-extern void smp_init_cpus(void);
+extern void of_smp_init_cpus(void);
 
 /*
  * Provide a function to raise an IPI cross call on CPUs in callmap.
diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile
index b12e15b80516..426d0763c81b 100644
--- a/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@ -35,6 +35,7 @@ arm64-obj-$(CONFIG_KGDB)		+= kgdb.o
 arm64-obj-$(CONFIG_EFI)                 += efi.o efi-stub.o efi-entry.o
 arm64-obj-$(CONFIG_PCI)                 += pci.o
 arm64-obj-$(CONFIG_ARMV8_DEPRECATED)    += armv8_deprecated.o
+arm64-obj-$(CONFIG_ACPI)                += acpi.o
 
 obj-y                                   += $(arm64-obj-y) vdso/
 obj-m                                   += $(arm64-obj-m)
diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
new file mode 100644
index 000000000000..8b839558838e
--- /dev/null
+++ b/arch/arm64/kernel/acpi.c
@@ -0,0 +1,345 @@
+/*
+ *  ARM64 Specific Low-Level ACPI Boot Support
+ *
+ *  Copyright (C) 2013-2014, Linaro Ltd.
+ *      Author: Al Stone <al.stone@linaro.org>
+ *      Author: Graeme Gregory <graeme.gregory@linaro.org>
+ *      Author: Hanjun Guo <hanjun.guo@linaro.org>
+ *      Author: Tomasz Nowicki <tomasz.nowicki@linaro.org>
+ *      Author: Naresh Bhat <naresh.bhat@linaro.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+
+#define pr_fmt(fmt) "ACPI: " fmt
+
+#include <linux/acpi.h>
+#include <linux/bootmem.h>
+#include <linux/cpumask.h>
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <linux/irqdomain.h>
+#include <linux/memblock.h>
+#include <linux/of_fdt.h>
+#include <linux/smp.h>
+
+#include <asm/cputype.h>
+#include <asm/cpu_ops.h>
+#include <asm/smp_plat.h>
+
+int acpi_noirq = 1;             /* skip ACPI IRQ initialization */
+int acpi_disabled = 1;
+EXPORT_SYMBOL(acpi_disabled);
+
+int acpi_pci_disabled = 1;      /* skip ACPI PCI scan and IRQ initialization */
+EXPORT_SYMBOL(acpi_pci_disabled);
+
+/* Processors with enabled flag and sane MPIDR */
+static int enabled_cpus;
+
+/* Boot CPU is valid or not in MADT */
+static bool bootcpu_valid  __initdata;
+
+static bool param_acpi_off __initdata;
+static bool param_acpi_force __initdata;
+
+static int __init parse_acpi(char *arg)
+{
+        if (!arg)
+                return -EINVAL;
+
+        /* "acpi=off" disables both ACPI table parsing and interpreter */
+        if (strcmp(arg, "off") == 0)
+                param_acpi_off = true;
+        else if (strcmp(arg, "force") == 0) /* force ACPI to be enabled */
+                param_acpi_force = true;
+        else
+                return -EINVAL; /* Core will print when we return error */
+
+        return 0;
+}
+early_param("acpi", parse_acpi);
+
+static int __init dt_scan_depth1_nodes(unsigned long node,
+                                       const char *uname, int depth,
+                                       void *data)
+{
+        /*
+         * Return 1 as soon as we encounter a node at depth 1 that is
+         * not the /chosen node.
+         */
+        if (depth == 1 && (strcmp(uname, "chosen") != 0))
+                return 1;
+        return 0;
+}
+
+/*
+ * __acpi_map_table() will be called before page_init(), so early_ioremap()
+ * or early_memremap() should be called here to for ACPI table mapping.
+ */
+char *__init __acpi_map_table(unsigned long phys, unsigned long size)
+{
+        if (!size)
+                return NULL;
+
+        return early_memremap(phys, size);
+}
+
+void __init __acpi_unmap_table(char *map, unsigned long size)
+{
+        if (!map || !size)
+                return;
+
+        early_memunmap(map, size);
+}
+
+/**
+ * acpi_map_gic_cpu_interface - generates a logical cpu number
+ * and map to MPIDR represented by GICC structure
+ */
+static void __init
+acpi_map_gic_cpu_interface(struct acpi_madt_generic_interrupt *processor)
+{
+        int i;
+        u64 mpidr = processor->arm_mpidr & MPIDR_HWID_BITMASK;
+        bool enabled = !!(processor->flags & ACPI_MADT_ENABLED);
+
+        if (mpidr == INVALID_HWID) {
+                pr_info("Skip MADT cpu entry with invalid MPIDR\n");
+                return;
+        }
+
+        total_cpus++;
+        if (!enabled)
+                return;
+
+        if (enabled_cpus >=  NR_CPUS) {
+                pr_warn("NR_CPUS limit of %d reached, Processor %d/0x%llx ignored.\n",
+                        NR_CPUS, total_cpus, mpidr);
+                return;
+        }
+
+        /* Check if GICC structure of boot CPU is available in the MADT */
+        if (cpu_logical_map(0) == mpidr) {
+                if (bootcpu_valid) {
+                        pr_err("Firmware bug, duplicate CPU MPIDR: 0x%llx in MADT\n",
+                               mpidr);
+                        return;
+                }
+
+                bootcpu_valid = true;
+        }
+
+        /*
+         * Duplicate MPIDRs are a recipe for disaster. Scan
+         * all initialized entries and check for
+         * duplicates. If any is found just ignore the CPU.
+         */
+        for (i = 1; i < enabled_cpus; i++) {
+                if (cpu_logical_map(i) == mpidr) {
+                        pr_err("Firmware bug, duplicate CPU MPIDR: 0x%llx in MADT\n",
+                               mpidr);
+                        return;
+                }
+        }
+
+        if (!acpi_psci_present())
+                return;
+
+        cpu_ops[enabled_cpus] = cpu_get_ops("psci");
+        /* CPU 0 was already initialized */
+        if (enabled_cpus) {
+                if (!cpu_ops[enabled_cpus])
+                        return;
+
+                if (cpu_ops[enabled_cpus]->cpu_init(NULL, enabled_cpus))
+                        return;
+
+                /* map the logical cpu id to cpu MPIDR */
+                cpu_logical_map(enabled_cpus) = mpidr;
+        }
+
+        enabled_cpus++;
+}
+
+static int __init
+acpi_parse_gic_cpu_interface(struct acpi_subtable_header *header,
+                                const unsigned long end)
+{
+        struct acpi_madt_generic_interrupt *processor;
+
+        processor = (struct acpi_madt_generic_interrupt *)header;
+
+        if (BAD_MADT_ENTRY(processor, end))
+                return -EINVAL;
+
+        acpi_table_print_madt_entry(header);
+        acpi_map_gic_cpu_interface(processor);
+        return 0;
+}
+
+/* Parse GIC cpu interface entries in MADT for SMP init */
+void __init acpi_init_cpus(void)
+{
+        int count, i;
+
+        /*
+         * do a partial walk of MADT to determine how many CPUs
+         * we have including disabled CPUs, and get information
+         * we need for SMP init
+         */
+        count = acpi_table_parse_madt(ACPI_MADT_TYPE_GENERIC_INTERRUPT,
+                        acpi_parse_gic_cpu_interface, 0);
+
+        if (!count) {
+                pr_err("No GIC CPU interface entries present\n");
+                return;
+        } else if (count < 0) {
+                pr_err("Error parsing GIC CPU interface entry\n");
+                return;
+        }
+
+        if (!bootcpu_valid) {
+                pr_err("MADT missing boot CPU MPIDR, not enabling secondaries\n");
+                return;
+        }
+
+        for (i = 0; i < enabled_cpus; i++)
+                set_cpu_possible(i, true);
+
+        /* Make boot-up look pretty */
+        pr_info("%d CPUs enabled, %d CPUs total\n", enabled_cpus, total_cpus);
+}
+
+/*
+ * acpi_fadt_sanity_check() - Check FADT presence and carry out sanity
+ *                            checks on it
+ *
+ * Return 0 on success,  <0 on failure
+ */
+static int __init acpi_fadt_sanity_check(void)
+{
+        struct acpi_table_header *table;
+        struct acpi_table_fadt *fadt;
+        acpi_status status;
+        acpi_size tbl_size;
+        int ret = 0;
+
+        /*
+         * 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 -ENODEV;
+        }
+
+        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);
+                ret = -EINVAL;
+                goto out;
+        }
+
+        if (!(fadt->flags & ACPI_FADT_HW_REDUCED)) {
+                pr_err("FADT not ACPI hardware reduced compliant\n");
+                ret = -EINVAL;
+        }
+
+out:
+        /*
+         * acpi_get_table_with_size() creates FADT table mapping that
+         * should be released after parsing and before resuming boot
+         */
+        early_acpi_os_unmap_memory(table, tbl_size);
+        return ret;
+}
+
+/*
+ * 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.
+ *
+ * On return ACPI is enabled if either:
+ *
+ * - ACPI tables are initialized and sanity checks passed
+ * - acpi=force was passed in the command line and ACPI was not disabled
+ *   explicitly through acpi=off command line parameter
+ *
+ * ACPI is disabled on function return otherwise
+ */
+void __init acpi_boot_table_init(void)
+{
+        /*
+         * Enable ACPI instead of device tree unless
+         * - ACPI has been disabled explicitly (acpi=off), or
+         * - the device tree is not empty (it has more than just a /chosen node)
+         *   and ACPI has not been force enabled (acpi=force)
+         */
+        if (param_acpi_off ||
+            (!param_acpi_force && of_scan_flat_dt(dt_scan_depth1_nodes, NULL)))
+                return;
+
+        /*
+         * ACPI is disabled at this point. Enable it in order to parse
+         * the ACPI tables and carry out sanity checks
+         */
+        enable_acpi();
+
+        /*
+         * If ACPI tables are initialized and FADT sanity checks passed,
+         * leave ACPI enabled and carry on booting; otherwise disable ACPI
+         * on initialization error.
+         * If acpi=force was passed on the command line it forces ACPI
+         * to be enabled even if its initialization failed.
+         */
+        if (acpi_table_init() || acpi_fadt_sanity_check()) {
+                pr_err("Failed to init ACPI tables\n");
+                if (!param_acpi_force)
+                        disable_acpi();
+        }
+}
+
+void __init acpi_gic_init(void)
+{
+        struct acpi_table_header *table;
+        acpi_status status;
+        acpi_size tbl_size;
+        int err;
+
+        if (acpi_disabled)
+                return;
+
+        status = acpi_get_table_with_size(ACPI_SIG_MADT, 0, &table, &tbl_size);
+        if (ACPI_FAILURE(status)) {
+                const char *msg = acpi_format_exception(status);
+
+                pr_err("Failed to get MADT table, %s\n", msg);
+                return;
+        }
+
+        err = gic_v2_acpi_init(table);
+        if (err)
+                pr_err("Failed to initialize GIC IRQ controller");
+
+        early_acpi_os_unmap_memory((char *)table, tbl_size);
+}
diff --git a/arch/arm64/kernel/cpu_ops.c b/arch/arm64/kernel/cpu_ops.c
index cce952440c64..fb8ff9ba467a 100644
--- a/arch/arm64/kernel/cpu_ops.c
+++ b/arch/arm64/kernel/cpu_ops.c
@@ -35,7 +35,7 @@ static const struct cpu_operations *supported_cpu_ops[] __initconst = {
         NULL,
 };
 
-static const struct cpu_operations * __init cpu_get_ops(const char *name)
+const struct cpu_operations * __init cpu_get_ops(const char *name)
 {
         const struct cpu_operations **ops = supported_cpu_ops;
 
diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c
index 6f93c24ca801..4095379dc069 100644
--- a/arch/arm64/kernel/pci.c
+++ b/arch/arm64/kernel/pci.c
@@ -10,6 +10,7 @@
  *
  */
 
+#include <linux/acpi.h>
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
@@ -46,3 +47,27 @@ int pcibios_add_device(struct pci_dev *dev)
 
         return 0;
 }
+
+/*
+ * raw_pci_read/write - Platform-specific PCI config space access.
+ */
+int raw_pci_read(unsigned int domain, unsigned int bus,
+                  unsigned int devfn, int reg, int len, u32 *val)
+{
+        return -ENXIO;
+}
+
+int raw_pci_write(unsigned int domain, unsigned int bus,
+                unsigned int devfn, int reg, int len, u32 val)
+{
+        return -ENXIO;
+}
+
+#ifdef CONFIG_ACPI
+/* Root bridge scanning */
+struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
+{
+        /* TODO: Should be revisited when implementing PCI on ACPI */
+        return NULL;
+}
+#endif
diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c
index 9b8a70ae64a1..ea18cb53921e 100644
--- a/arch/arm64/kernel/psci.c
+++ b/arch/arm64/kernel/psci.c
@@ -15,6 +15,7 @@
 
 #define pr_fmt(fmt) "psci: " fmt
 
+#include <linux/acpi.h>
 #include <linux/init.h>
 #include <linux/of.h>
 #include <linux/smp.h>
@@ -24,6 +25,7 @@
 #include <linux/slab.h>
 #include <uapi/linux/psci.h>
 
+#include <asm/acpi.h>
 #include <asm/compiler.h>
 #include <asm/cpu_ops.h>
 #include <asm/errno.h>
@@ -273,39 +275,8 @@ static void psci_sys_poweroff(void)
         invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0);
 }
 
-/*
- * PSCI Function IDs for v0.2+ are well defined so use
- * standard values.
- */
-static int __init psci_0_2_init(struct device_node *np)
+static void __init psci_0_2_set_functions(void)
 {
-        int err, ver;
-
-        err = get_set_conduit_method(np);
-
-        if (err)
-                goto out_put_node;
-
-        ver = psci_get_version();
-
-        if (ver == PSCI_RET_NOT_SUPPORTED) {
-                /* PSCI v0.2 mandates implementation of PSCI_ID_VERSION. */
-                pr_err("PSCI firmware does not comply with the v0.2 spec.\n");
-                err = -EOPNOTSUPP;
-                goto out_put_node;
-        } else {
-                pr_info("PSCIv%d.%d detected in firmware.\n",
-                                PSCI_VERSION_MAJOR(ver),
-                                PSCI_VERSION_MINOR(ver));
-
-                if (PSCI_VERSION_MAJOR(ver) == 0 &&
-                                PSCI_VERSION_MINOR(ver) < 2) {
-                        err = -EINVAL;
-                        pr_err("Conflicting PSCI version detected.\n");
-                        goto out_put_node;
-                }
-        }
-
         pr_info("Using standard PSCI v0.2 function IDs\n");
         psci_function_id[PSCI_FN_CPU_SUSPEND] = PSCI_0_2_FN64_CPU_SUSPEND;
         psci_ops.cpu_suspend = psci_cpu_suspend;
@@ -329,6 +300,60 @@ static int __init psci_0_2_init(struct device_node *np)
         arm_pm_restart = psci_sys_reset;
 
         pm_power_off = psci_sys_poweroff;
+}
+
+/*
+ * Probe function for PSCI firmware versions >= 0.2
+ */
+static int __init psci_probe(void)
+{
+        int ver = psci_get_version();
+
+        if (ver == PSCI_RET_NOT_SUPPORTED) {
+                /*
+                 * PSCI versions >=0.2 mandates implementation of
+                 * PSCI_VERSION.
+                 */
+                pr_err("PSCI firmware does not comply with the v0.2 spec.\n");
+                return -EOPNOTSUPP;
+        } else {
+                pr_info("PSCIv%d.%d detected in firmware.\n",
+                                PSCI_VERSION_MAJOR(ver),
+                                PSCI_VERSION_MINOR(ver));
+
+                if (PSCI_VERSION_MAJOR(ver) == 0 &&
+                                PSCI_VERSION_MINOR(ver) < 2) {
+                        pr_err("Conflicting PSCI version detected.\n");
+                        return -EINVAL;
+                }
+        }
+
+        psci_0_2_set_functions();
+
+        return 0;
+}
+
+/*
+ * PSCI init function for PSCI versions >=0.2
+ *
+ * Probe based on PSCI PSCI_VERSION function
+ */
+static int __init psci_0_2_init(struct device_node *np)
+{
+        int err;
+
+        err = get_set_conduit_method(np);
+
+        if (err)
+                goto out_put_node;
+        /*
+         * Starting with v0.2, the PSCI specification introduced a call
+         * (PSCI_VERSION) that allows probing the firmware version, so
+         * that PSCI function IDs and version specific initialization
+         * can be carried out according to the specific version reported
+         * by firmware
+         */
+        err = psci_probe();
 
 out_put_node:
         of_node_put(np);
@@ -381,7 +406,7 @@ static const struct of_device_id psci_of_match[] __initconst = {
         {},
 };
 
-int __init psci_init(void)
+int __init psci_dt_init(void)
 {
         struct device_node *np;
         const struct of_device_id *matched_np;
@@ -396,6 +421,27 @@ int __init psci_init(void)
         return init_fn(np);
 }
 
+/*
+ * We use PSCI 0.2+ when ACPI is deployed on ARM64 and it's
+ * explicitly clarified in SBBR
+ */
+int __init psci_acpi_init(void)
+{
+        if (!acpi_psci_present()) {
+                pr_info("is not implemented in ACPI.\n");
+                return -EOPNOTSUPP;
+        }
+
+        pr_info("probing for conduit method from ACPI.\n");
+
+        if (acpi_psci_use_hvc())
+                invoke_psci_fn = __invoke_psci_fn_hvc;
+        else
+                invoke_psci_fn = __invoke_psci_fn_smc;
+
+        return psci_probe();
+}
+
 #ifdef CONFIG_SMP
 
 static int __init cpu_psci_cpu_init(struct device_node *dn, unsigned int cpu)
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 51ef97274b52..74753132c3ac 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <linux/acpi.h>
 #include <linux/export.h>
 #include <linux/kernel.h>
 #include <linux/stddef.h>
@@ -46,6 +47,7 @@
 #include <linux/efi.h>
 #include <linux/personality.h>
 
+#include <asm/acpi.h>
 #include <asm/fixmap.h>
 #include <asm/cpu.h>
 #include <asm/cputype.h>
@@ -395,18 +397,27 @@ void __init setup_arch(char **cmdline_p)
         efi_init();
         arm64_memblock_init();
 
+        /* Parse the ACPI tables for possible boot-time configuration */
+        acpi_boot_table_init();
+
         paging_init();
         request_standard_resources();
 
         early_ioremap_reset();
 
-        unflatten_device_tree();
-
-        psci_init();
+        if (acpi_disabled) {
+                unflatten_device_tree();
+                psci_dt_init();
+                cpu_read_bootcpu_ops();
+#ifdef CONFIG_SMP
+                of_smp_init_cpus();
+#endif
+        } else {
+                psci_acpi_init();
+                acpi_init_cpus();
+        }
 
-        cpu_read_bootcpu_ops();
 #ifdef CONFIG_SMP
-        smp_init_cpus();
         smp_build_mpidr_hash();
 #endif
 
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index 714411f62391..2cb008177252 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -323,7 +323,7 @@ void __init smp_prepare_boot_cpu(void)
  * cpu logical map array containing MPIDR values related to logical
  * cpus. Assumes that cpu_logical_map(0) has already been initialized.
  */
-void __init smp_init_cpus(void)
+void __init of_smp_init_cpus(void)
 {
         struct device_node *dn = NULL;
         unsigned int i, cpu = 1;
diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c
index 1a7125c3099b..42f9195cf2f8 100644
--- a/arch/arm64/kernel/time.c
+++ b/arch/arm64/kernel/time.c
@@ -35,6 +35,7 @@
 #include <linux/delay.h>
 #include <linux/clocksource.h>
 #include <linux/clk-provider.h>
+#include <linux/acpi.h>
 
 #include <clocksource/arm_arch_timer.h>
 
@@ -72,6 +73,12 @@ void __init time_init(void)
 
         tick_setup_hrtimer_broadcast();
 
+        /*
+         * Since ACPI or FDT will only one be available in the system,
+         * we can use acpi_generic_timer_init() here safely
+         */
+        acpi_generic_timer_init();
+
         arch_timer_rate = arch_timer_get_rate();
         if (!arch_timer_rate)
                 panic("Unable to initialise architected timer.\n");