aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Nowicki <tomasz.nowicki@linaro.org>2014-02-13 18:20:56 +0100
committerGraeme Gregory <graeme.gregory@linaro.org>2014-06-03 09:24:25 +0100
commite47cdb3133980bc945368ab0c7ac3c84a9e24ec3 (patch)
tree470242e8711f748d6ed8b070f031819f8ce9ee00
parentbb2f806be2f8a3c35a822472a0c44e969ff926cf (diff)
downloadleg-kernel-e47cdb3133980bc945368ab0c7ac3c84a9e24ec3.tar.gz
ARM64, ACPI, SMP: Remove functions related to spin-table method.
PSCI method will be used for booting secondary CPUs, so acpi_get_cpu_release_address() is useless now. Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-rw-r--r--arch/arm64/include/asm/acpi.h6
-rw-r--r--arch/arm64/kernel/smp_spin_table.c11
-rw-r--r--drivers/acpi/plat/arm-core.c11
3 files changed, 3 insertions, 25 deletions
diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h
index 9f0029d6d082..dff95da19467 100644
--- a/arch/arm64/include/asm/acpi.h
+++ b/arch/arm64/include/asm/acpi.h
@@ -89,7 +89,6 @@ extern int (*acpi_suspend_lowlevel)(void);
extern int arm_cpu_to_apicid[NR_CPUS];
#define cpu_physical_id(cpu) arm_cpu_to_apicid[cpu]
-extern int acpi_get_cpu_release_address(int cpu, u64 *release_address);
extern int gic_acpi_init(void);
extern int cpu_acpi_read_ops(int cpu);
@@ -104,11 +103,6 @@ static inline int gic_acpi_init(void)
return -ENODEV;
}
-static inline int acpi_get_cpu_release_address(int cpu, u64 *release_address)
-{
- return -ENODEV;
-}
-
static inline int cpu_acpi_read_ops(int cpu)
{
return -ENODEV;
diff --git a/arch/arm64/kernel/smp_spin_table.c b/arch/arm64/kernel/smp_spin_table.c
index 58ed6036553d..a61b6020f40e 100644
--- a/arch/arm64/kernel/smp_spin_table.c
+++ b/arch/arm64/kernel/smp_spin_table.c
@@ -25,7 +25,6 @@
#include <asm/cpu_ops.h>
#include <asm/cputype.h>
#include <asm/smp_plat.h>
-#include <asm/acpi.h>
extern void secondary_holding_pen(void);
volatile unsigned long secondary_holding_pen_release = INVALID_HWID;
@@ -55,14 +54,10 @@ static int smp_spin_table_cpu_init(struct device_node *dn, unsigned int cpu)
*/
if (of_property_read_u64(dn, "cpu-release-addr",
&cpu_release_addr[cpu])) {
+ pr_err("CPU %d: missing or invalid cpu-release-addr property\n",
+ cpu);
- /* try ACPI way */
- if (acpi_get_cpu_release_address(cpu, &cpu_release_addr[cpu])) {
- pr_err("CPU %d: missing or invalid cpu-release-addr property\n",
- cpu);
-
- return -1;
- }
+ return -1;
}
return 0;
diff --git a/drivers/acpi/plat/arm-core.c b/drivers/acpi/plat/arm-core.c
index 4f3c41c136c7..f0bd7bb4562d 100644
--- a/drivers/acpi/plat/arm-core.c
+++ b/drivers/acpi/plat/arm-core.c
@@ -242,17 +242,6 @@ static int __init acpi_parse_madt_gic_entries(void)
return 0;
}
-/* Parked Address in ACPI GIC structure can be used as cpu release addr */
-int acpi_get_cpu_release_address(int cpu, u64 *release_address)
-{
- if (!release_address || !parked_address[cpu])
- return -EINVAL;
-
- *release_address = parked_address[cpu];
-
- return 0;
-}
-
int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
{
*irq = gsi_to_irq(gsi);