This patch set is based on Graeme's patches "ARM: ACPI: simplify directory structure" and "ARM: ACPI: remove irq type switching from core".
Hanjun Guo (3): ARM / ACPI: Remove acpi_lapic and acpi_ioapic related code ARM / ACPI: Remove the global lock definition in header file ARM / ACPI: Remove unused variables
arch/arm/include/asm/acpi.h | 11 ----------- arch/arm64/include/asm/acpi.h | 11 ----------- drivers/acpi/plat/arm-core.c | 23 +---------------------- 3 files changed, 1 insertion(+), 44 deletions(-)
Variable acpi_lapic and acpi_ioapic are used for x86 MPS (Multi-processor Spec) stuff, it is not needed for ARM, remove them.
Signed-off-by: Hanjun Guo hanjun.guo@linaro.org --- drivers/acpi/plat/arm-core.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/drivers/acpi/plat/arm-core.c b/drivers/acpi/plat/arm-core.c index 6710631..291d36b 100644 --- a/drivers/acpi/plat/arm-core.c +++ b/drivers/acpi/plat/arm-core.c @@ -71,8 +71,6 @@ int acpi_noirq; /* skip ACPI IRQ initialization */ int acpi_pci_disabled; /* skip ACPI PCI scan and IRQ initialization */ EXPORT_SYMBOL(acpi_pci_disabled);
-int acpi_lapic; -int acpi_ioapic; int acpi_strict;
u8 acpi_sci_flags __initdata; @@ -506,8 +504,6 @@ static void __init acpi_process_madt(void) */ error = acpi_parse_madt_lapic_entries(); if (!error) { - acpi_lapic = 1; - /* * Parse MADT IO-APIC entries */ @@ -515,16 +511,7 @@ static void __init acpi_process_madt(void) } }
- /* - * ACPI supports both logical (e.g. Hyper-Threading) and physical - * processors, where MPS only supports physical. - */ - if (acpi_lapic && acpi_ioapic) - pr_info("Using ACPI (MADT) for SMP configuration " - "information\n"); - else if (acpi_lapic) - pr_info("Using ACPI for processor (LAPIC) " - "configuration information\n"); + pr_info("Using ACPI for processor (GIC) configuration information\n");
return; } @@ -541,9 +528,6 @@ static void __init acpi_process_madt(void) * other side effects. * * side effects of acpi_boot_init: - * acpi_lapic = 1 if LAPIC found - * acpi_ioapic = 1 if IOAPIC found - * if (acpi_lapic && acpi_ioapic) smp_found_config = 1; * if acpi_blacklisted() acpi_disabled = 1; * acpi_irq_model=... * ...
ARM/ARM64 is linked to reduced hardware now, global lock is not needed anymore.
Signed-off-by: Hanjun Guo hanjun.guo@linaro.org --- arch/arm/include/asm/acpi.h | 11 ----------- arch/arm64/include/asm/acpi.h | 11 ----------- 2 files changed, 22 deletions(-)
diff --git a/arch/arm/include/asm/acpi.h b/arch/arm/include/asm/acpi.h index cf67b09..651a15c 100644 --- a/arch/arm/include/asm/acpi.h +++ b/arch/arm/include/asm/acpi.h @@ -82,17 +82,6 @@ /* 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); - -#define ACPI_ACQUIRE_GLOBAL_LOCK(facs, Acq) \ - ((Acq) = __acpi_acquire_global_lock(&facs->global_lock)) - -#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \ - ((Acq) = __acpi_release_global_lock(&facs->global_lock)) -#endif - /* Basic configuration for ACPI */ #ifdef CONFIG_ACPI extern int acpi_disabled; diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index bb9411f..8dc632a 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -60,17 +60,6 @@ /* 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); - -#define ACPI_ACQUIRE_GLOBAL_LOCK(facs, Acq) \ - ((Acq) = __acpi_acquire_global_lock(&facs->global_lock)) - -#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \ - ((Acq) = __acpi_release_global_lock(&facs->global_lock)) -#endif - /* Basic configuration for ACPI */ #ifdef CONFIG_ACPI extern int acpi_disabled;
These variables are for x86 only, remove them.
Signed-off-by: Hanjun Guo hanjun.guo@linaro.org --- drivers/acpi/plat/arm-core.c | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/drivers/acpi/plat/arm-core.c b/drivers/acpi/plat/arm-core.c index 291d36b..8031ec3 100644 --- a/drivers/acpi/plat/arm-core.c +++ b/drivers/acpi/plat/arm-core.c @@ -73,11 +73,6 @@ EXPORT_SYMBOL(acpi_pci_disabled);
int acpi_strict;
-u8 acpi_sci_flags __initdata; -int acpi_sci_override_gsi __initdata; -int acpi_skip_timer_override __initdata; -int acpi_use_timer_override __initdata; -int acpi_fix_pin2_polarity __initdata; static u64 acpi_lapic_addr __initdata;
struct acpi_arm_root acpi_arm_rsdp_info; /* info about RSDP from FDT */
All
Acked-by: Graeme Gregory graeme.gregory@linaro.org
On Thu, Nov 21, 2013 at 02:39:17PM +0800, Hanjun Guo wrote:
This patch set is based on Graeme's patches "ARM: ACPI: simplify directory structure" and "ARM: ACPI: remove irq type switching from core".
Hanjun Guo (3): ARM / ACPI: Remove acpi_lapic and acpi_ioapic related code ARM / ACPI: Remove the global lock definition in header file ARM / ACPI: Remove unused variables
arch/arm/include/asm/acpi.h | 11 ----------- arch/arm64/include/asm/acpi.h | 11 ----------- drivers/acpi/plat/arm-core.c | 23 +---------------------- 3 files changed, 1 insertion(+), 44 deletions(-)
-- 1.7.9.5
Linaro-acpi mailing list Linaro-acpi@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-acpi
-
Graeme Gregory -
Hanjun Guo