aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Stone <ahs3@redhat.com>2013-11-09 17:08:02 -0700
committerGraeme Gregory <graeme.gregory@linaro.org>2013-11-19 10:30:37 +0000
commit618dcbbb051bab37f5f22c337c0b80c5fd0be94b (patch)
treed1c5d5fb9c86870c4dd4c5787b31e5e39cd3e1a6
parentd54d12560112064e0c2beaea1c2700685915388d (diff)
downloadleg-kernel-618dcbbb051bab37f5f22c337c0b80c5fd0be94b.tar.gz
ACPI: ARM/ARM64: ensure the ACPI FACS global_lock is never used in HW reduced mode
This patch is dependent on the CONFIG_ACPI_REDUCED_HARDWARE patch already being in place. Signed-off-by: Al Stone <al.stone@linaro.org> Acked-by: Graeme Gregory <graeme.gregory@linaro.org>
-rw-r--r--arch/arm/include/asm/acpi.h3
-rw-r--r--arch/arm64/include/asm/acpi.h3
-rw-r--r--drivers/acpi/plat/arm/boot.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/include/asm/acpi.h b/arch/arm/include/asm/acpi.h
index ca7efaa09cce..cf67b0943e42 100644
--- a/arch/arm/include/asm/acpi.h
+++ b/arch/arm/include/asm/acpi.h
@@ -82,6 +82,7 @@
/* Blob handling macros */
#define ACPI_BLOB_HEADER_SIZE 8
+#ifndef CONFIG_ACPI_REDUCED_HARDWARE
int __acpi_acquire_global_lock(unsigned int *lock);
int __acpi_release_global_lock(unsigned int *lock);
@@ -90,9 +91,9 @@ int __acpi_release_global_lock(unsigned int *lock);
#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \
((Acq) = __acpi_release_global_lock(&facs->global_lock))
+#endif
/* Basic configuration for ACPI */
-/* BOZO: hardware reduced acpi only? */
#ifdef CONFIG_ACPI
extern int acpi_disabled;
extern int acpi_noirq;
diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h
index a19b73faa1fc..bb9411fad04c 100644
--- a/arch/arm64/include/asm/acpi.h
+++ b/arch/arm64/include/asm/acpi.h
@@ -60,6 +60,7 @@
/* Blob handling macros */
#define ACPI_BLOB_HEADER_SIZE 8
+#ifndef CONFIG_ACPI_REDUCED_HARDWARE
int __acpi_acquire_global_lock(unsigned int *lock);
int __acpi_release_global_lock(unsigned int *lock);
@@ -68,9 +69,9 @@ int __acpi_release_global_lock(unsigned int *lock);
#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \
((Acq) = __acpi_release_global_lock(&facs->global_lock))
+#endif
/* Basic configuration for ACPI */
-/* BOZO: hardware reduced acpi only? */
#ifdef CONFIG_ACPI
extern int acpi_disabled;
extern int acpi_noirq;
diff --git a/drivers/acpi/plat/arm/boot.c b/drivers/acpi/plat/arm/boot.c
index 4fcdd9f35593..1a6d225e3071 100644
--- a/drivers/acpi/plat/arm/boot.c
+++ b/drivers/acpi/plat/arm/boot.c
@@ -786,6 +786,7 @@ static int __init parse_acpi(char *arg)
}
early_param("acpi", parse_acpi);
+#if (!ACPI_REDUCED_HARDWARE)
int __acpi_acquire_global_lock(unsigned int *lock)
{
unsigned int old, new, val;
@@ -807,3 +808,4 @@ int __acpi_release_global_lock(unsigned int *lock)
} while (unlikely (val != old));
return old & 0x1;
}
+#endif