Linaro-acpi

linaro-acpi@lists.linaro.org

820 discussions

[RFC PATCH] acpi: arm64: move initialisation functions into arm-core

by Graeme Gregory

Instead of littering platform with multiple functions more them into the arm-core.c file. Stub them out in the !CONFIG_ACPI case. Signed-off-by: Graeme Gregory <graeme.gregory(a)linaro.org> --- arch/arm64/include/asm/acpi.h | 6 ++++++ arch/arm64/kernel/setup.c | 13 +------------ drivers/acpi/plat/arm-core.c | 9 +++++++++ 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index 9095a7f..2611769 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -80,7 +80,13 @@ struct acpi_arm_root { }; extern struct acpi_arm_root acpi_arm_rsdp_info; +#ifdef CONFIG_ACPI void arm_acpi_reserve_memory(void); +void arm_acpi_init(void); +#else +inline void arm_acpi_reserve_memory(void) {return;} +inline void arm_acpi_init(void) {return;} +#endif /* Low-level suspend routine. */ extern int (*acpi_suspend_lowlevel)(void); diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 7e2a71c..707b857 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -263,22 +263,11 @@ void __init setup_arch(char **cmdline_p) arm64_memblock_init(); -#ifdef CONFIG_ACPI arm_acpi_reserve_memory(); -#endif efi_init(); -#ifdef CONFIG_ACPI - /* - * Parse the ACPI tables for possible boot-time configuration - */ - acpi_boot_table_init(); - early_acpi_boot_init(); - boot_cpu_apic_id = read_cpuid_mpidr() & MPIDR_HWID_BITMASK; - acpi_boot_init(); - prefill_possible_map(); -#endif + arm_acpi_init(); paging_init(); request_standard_resources(); diff --git a/drivers/acpi/plat/arm-core.c b/drivers/acpi/plat/arm-core.c index bb37efe..f8798fc 100644 --- a/drivers/acpi/plat/arm-core.c +++ b/drivers/acpi/plat/arm-core.c @@ -42,6 +42,7 @@ #include <asm/io.h> #include <asm/smp.h> #include <asm/acpi.h> +#include <asm/cputype.h> /* * We never plan to use RSDT on arm/arm64 as its deprecated in spec but this @@ -621,6 +622,14 @@ void __init arm_acpi_reserve_memory() memblock_remove(addr - section_offset, num_sections * SECTION_SIZE); } +void arm_acpi_init(void) { + acpi_boot_table_init(); + early_acpi_boot_init(); + boot_cpu_apic_id = read_cpuid_mpidr() & MPIDR_HWID_BITMASK; + acpi_boot_init(); + prefill_possible_map(); +} + static int __init parse_acpi(char *arg) { if (!arg) -- 1.8.4.2

10 years, 11 months

[PATCH] ACPI: correct minor typos

by al.stone＠linaro.org

From: Al Stone <al.stone(a)linaro.org> Correct "coolign" to "cooling" and "*_ptg" to "*_pctg" as intended. This changes comment text only. Signed-off-by: Al Stone <al.stone(a)linaro.org> --- drivers/acpi/processor_thermal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c index d1d2e7f..1ea79739 100644 --- a/drivers/acpi/processor_thermal.c +++ b/drivers/acpi/processor_thermal.c @@ -186,14 +186,14 @@ static int cpufreq_set_cur_state(unsigned int cpu, int state) #endif -/* thermal coolign device callbacks */ +/* thermal cooling device callbacks */ static int acpi_processor_max_state(struct acpi_processor *pr) { int max_state = 0; /* * There exists four states according to - * cpufreq_thermal_reduction_ptg. 0, 1, 2, 3 + * cpufreq_thermal_reduction_pctg. 0, 1, 2, 3 */ max_state += cpufreq_get_max_state(pr->id); if (pr->flags.throttling) -- 1.8.3.1

10 years, 11 months

[PATCH 1/2] ACPI / dock: Remove the redundant if (acpi_disabled) check

by Hanjun Guo

acpi_dock_init() will only be called in acpi_scan_init(), and the code logic shows that if (acpi_disabled) is redundant: acpi_init(); if (acpi_disabled) return; acpi_scan_init(); acpi_dock_init(); if (acpi_disabled) /* redundant */ return; Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> --- This patch set is inspired by Rob's question for my ACPI ARM64 core patches :) drivers/acpi/dock.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index 8da6be9..61d0c3f 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -893,9 +893,6 @@ find_dock_and_bay(acpi_handle handle, u32 lvl, void *context, void **rv) void __init acpi_dock_init(void) { - if (acpi_disabled) - return; - /* look for dock stations and bays */ acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX, find_dock_and_bay, NULL, NULL, NULL); -- 1.7.9.5

10 years, 11 months

[PATCH] ACPI / table: Replace '1' with specific error in return value

by Hanjun Guo

In commit 7f8f97c3cc (ACPI: acpi_table_parse() now returns success/fail, not count), it return '1' when no table found, replace -ENODEV here to make it more resonable. Fix the same problem in acpi_table_init() too. Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> --- drivers/acpi/tables.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index d67a1fe..4ec4425 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -306,7 +306,7 @@ int __init acpi_table_parse(char *id, acpi_tbl_table_handler handler) early_acpi_os_unmap_memory(table, tbl_size); return 0; } else - return 1; + return -ENODEV; } /* @@ -351,7 +351,7 @@ int __init acpi_table_init(void) status = acpi_initialize_tables(initial_tables, ACPI_MAX_TABLES, 0); if (ACPI_FAILURE(status)) - return 1; + return -EINVAL; check_multiple_madt(); return 0; -- 1.7.9.5

10 years, 11 months

[RFC part3 PATCH 0/2] Using ACPI GTDT table to initialize arch timer

by Hanjun Guo

This is the last part of patch set for core of ARM64 ACPI, and is based on the patch set part2 "Using ACPI MADT table to initialise SMP and GIC". ACPI GTDT (Generic Timer Description Table) is used for ARM/ARM64 only, and contains the information for arch timer initialisation. This patch trys to convert the arch timer to ACPI using GTDT. After this patch set was posted, we already finished the SMP, GIC and arch timer initialisation, which all are essential for ARM64 core system running, then we will focus on converting the device drivers to ACPI. Here is the GTDT ASL code I used: --- platforms/foundation-v8.acpi/gtdt.asl | 35 ++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/platforms/foundation-v8.acpi/gtdt.asl b/platforms/foundation-v8.acpi/gtdt.asl index 18c821a..714d61c 100644 --- a/platforms/foundation-v8.acpi/gtdt.asl +++ b/platforms/foundation-v8.acpi/gtdt.asl @@ -1,5 +1,6 @@ /* * Copyright (c) 2013, Al Stone <al.stone(a)linaro.org> + * Hanjun Guo <hanjun.guo(a)linaro.org> * * [GTDT] Generic Timer Description Table * Format: [ByteLength] FieldName : HexFieldValue @@ -21,22 +22,32 @@ [0004] Flags (decoded below) : 00000001 Memory Present : 1 -[0004] Secure PL1 Interrupt : 00000000 -[0004] SPL1 Flags (decoded below) : 00000000 - Trigger Mode : 0 +/* In Foundation model's dts file, the last cell of interrupts + * is 0xff01, it means its cpu mask is FF, and trigger type + * and flag is 1 = low-to-high edge triggered. + * + * so in ACPI the Trigger Mode is 1 - Edge triggered, and + * Polarity is 0 - Active high as ACPI spec describled. + * + * using direct mapping for hwirqs, it means that we using + * ID [16, 31] for PPI, not [0, 15] used in FDT. + */ +[0004] Secure PL1 Interrupt : 0000001d +[0004] SPL1 Flags (decoded below) : 00000001 + Trigger Mode : 1 Polarity : 0 -[0004] Non-Secure PL1 Interrupt : 00000000 -[0004] NSPL1 Flags (decoded below) : 00000000 - Trigger Mode : 0 +[0004] Non-Secure PL1 Interrupt : 0000001e +[0004] NSPL1 Flags (decoded below) : 00000001 + Trigger Mode : 1 Polarity : 0 -[0004] Virtual Timer Interrupt : 00000000 -[0004] VT Flags (decoded below) : 00000000 - Trigger Mode : 0 +[0004] Virtual Timer Interrupt : 0000001b +[0004] VT Flags (decoded below) : 00000001 + Trigger Mode : 1 Polarity : 0 -[0004] Non-Secure PL2 Interrupt : 00000000 -[0004] NSPL2 Flags (decoded below) : 00000000 - Trigger Mode : 0 +[0004] Non-Secure PL2 Interrupt : 0000001a +[0004] NSPL2 Flags (decoded below) : 00000001 + Trigger Mode : 1 Polarity : 0 Hanjun Guo (2): clocksource / arch_timer: Use ACPI GTDT table to initialize arch timer ARM64 / clocksource: Use arch_timer_acpi_init() arch/arm64/kernel/time.c | 4 ++ drivers/clocksource/arm_arch_timer.c | 129 ++++++++++++++++++++++++++++++---- include/clocksource/arm_arch_timer.h | 7 +- 3 files changed, 124 insertions(+), 16 deletions(-) -- 1.7.9.5

10 years, 11 months

[PATCH] ACPI: remove trailing whitespace

by al.stone＠linaro.org

From: Al Stone <al.stone(a)linaro.org> Minor cleanup: remove some extra trailing white space. Signed-off-by: Al Stone <al.stone(a)linaro.org> --- drivers/acpi/osl.c | 2 +- drivers/acpi/processor_idle.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 54a20ff..44c07eb 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -1282,7 +1282,7 @@ acpi_status acpi_os_wait_semaphore(acpi_handle handle, u32 units, u16 timeout) jiffies = MAX_SCHEDULE_TIMEOUT; else jiffies = msecs_to_jiffies(timeout); - + ret = down_timeout(sem, jiffies); if (ret) status = AE_TIME; diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 644516d..597cdab 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -598,7 +598,7 @@ static int acpi_processor_power_verify(struct acpi_processor *pr) case ACPI_STATE_C2: if (!cx->address) break; - cx->valid = 1; + cx->valid = 1; break; case ACPI_STATE_C3: -- 1.8.3.1

10 years, 11 months

[PATCH] ACPI: ARM: remove blob offset

by naresh.bhat＠linaro.org

From: Naresh Bhat <naresh.bhat(a)linaro.org> ACPI: ARM: remove blob offset we are no longer using it. Signed-off-by: Naresh Bhat <naresh.bhat(a)linaro.org> Signed-off-by: Graeme Gregory <graeme.gregory(a)linaro.org> --- drivers/acpi/osl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 212ae09..a7dc366 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -283,7 +283,6 @@ void acpi_find_arm_root_pointer(acpi_physical_address *pa) } address = phys_to_virt(acpi_arm_rsdp_info.phys_address); - address += ACPI_BLOB_HEADER_SIZE; *pa = (acpi_physical_address)address; rp = (struct acpi_table_rsdp *)address; -- 1.7.9.5

10 years, 11 months

[PATCH] ARM64 ACPI: define acpi_suspend_lowlevel as NULL

by naresh.bhat＠linaro.org

From: Naresh Bhat <naresh.bhat(a)linaro.org> We had a missing symbol so define this as NULL for arm as it is currenly unused on arm64 platform Signed-off-by: Naresh Bhat <naresh.bhat(a)linaro.org> --- arch/arm64/include/asm/acpi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index 5f17424..9095a7f 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -83,7 +83,7 @@ extern struct acpi_arm_root acpi_arm_rsdp_info; void arm_acpi_reserve_memory(void); /* Low-level suspend routine. */ -extern int acpi_suspend_lowlevel(void); +extern int (*acpi_suspend_lowlevel)(void); extern void prefill_possible_map(void); -- 1.7.9.5

10 years, 11 months

[PATCH] AcpiTables: Switch to PNPID as LNRO

by naresh.bhat＠linaro.org

From: Naresh Bhat <naresh.bhat(a)linaro.org> Use official PNPID as LNRO in all acpi tables Signed-off-by: Naresh Bhat <naresh.bhat(a)linaro.org> --- .../AcpiTables/ArmVExpress-FVP-AArch64/dsdt.asl | 4 ++-- .../Drivers/AcpiTables/exynos5250-arndale/Dsdt.asl | 2 +- ArmPkg/Drivers/AcpiTables/foundation-v8/Dsdt.asl | 4 ++-- ArmPkg/Drivers/AcpiTables/rtsm_ve-aemv8a/Dsdt.asl | 2 +- ArmPkg/Drivers/AcpiTables/rtsm_ve-v7/Dsdt.asl | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ArmPkg/Drivers/AcpiTables/ArmVExpress-FVP-AArch64/dsdt.asl b/ArmPkg/Drivers/AcpiTables/ArmVExpress-FVP-AArch64/dsdt.asl index f74b69b..76ddfa3 100644 --- a/ArmPkg/Drivers/AcpiTables/ArmVExpress-FVP-AArch64/dsdt.asl +++ b/ArmPkg/Drivers/AcpiTables/ArmVExpress-FVP-AArch64/dsdt.asl @@ -267,7 +267,7 @@ DefinitionBlock ( } Device (NET0) { - Name (_HID, "LINA0003") + Name (_HID, "LNRO0003") Name (_UID, 0) Method (_CRS, 0x0, Serialized) { @@ -280,7 +280,7 @@ DefinitionBlock ( } Device (PMU0) { - Name (_HID, "LINA0007") + Name (_HID, "LNRO0007") Name (_UID, 0) Method (_CRS, 0x0, Serialized) { diff --git a/ArmPkg/Drivers/AcpiTables/exynos5250-arndale/Dsdt.asl b/ArmPkg/Drivers/AcpiTables/exynos5250-arndale/Dsdt.asl index 4f97ba9..da4302e 100644 --- a/ArmPkg/Drivers/AcpiTables/exynos5250-arndale/Dsdt.asl +++ b/ArmPkg/Drivers/AcpiTables/exynos5250-arndale/Dsdt.asl @@ -20,7 +20,7 @@ DefinitionBlock ( } Device (I2C) { - Name (_HID, "LINA0001") + Name (_HID, "LNRO0001") Name (_UID, 0) Method (_CRS, 0x0, Serialized) { diff --git a/ArmPkg/Drivers/AcpiTables/foundation-v8/Dsdt.asl b/ArmPkg/Drivers/AcpiTables/foundation-v8/Dsdt.asl index 58dfd12..0fe2190 100644 --- a/ArmPkg/Drivers/AcpiTables/foundation-v8/Dsdt.asl +++ b/ArmPkg/Drivers/AcpiTables/foundation-v8/Dsdt.asl @@ -241,7 +241,7 @@ DefinitionBlock ( } Device (NET0) { - Name (_HID, "LINA0003") + Name (_HID, "LNRO0003") Name (_UID, 0) Method (_CRS, 0x0, Serialized) { @@ -254,7 +254,7 @@ DefinitionBlock ( } Device (VIRT) { - Name (_HID, "LINA0005") + Name (_HID, "LNRO0005") Name (_UID, 0) Method (_CRS, 0x0, Serialized) { diff --git a/ArmPkg/Drivers/AcpiTables/rtsm_ve-aemv8a/Dsdt.asl b/ArmPkg/Drivers/AcpiTables/rtsm_ve-aemv8a/Dsdt.asl index c4185fe..eb5566c 100644 --- a/ArmPkg/Drivers/AcpiTables/rtsm_ve-aemv8a/Dsdt.asl +++ b/ArmPkg/Drivers/AcpiTables/rtsm_ve-aemv8a/Dsdt.asl @@ -240,7 +240,7 @@ DefinitionBlock ( } Device (NET0) { - Name (_HID, "LINA0003") + Name (_HID, "LNRO0003") Name (_UID, 0) Method (_CRS, 0x0, Serialized) { diff --git a/ArmPkg/Drivers/AcpiTables/rtsm_ve-v7/Dsdt.asl b/ArmPkg/Drivers/AcpiTables/rtsm_ve-v7/Dsdt.asl index c4185fe..eb5566c 100644 --- a/ArmPkg/Drivers/AcpiTables/rtsm_ve-v7/Dsdt.asl +++ b/ArmPkg/Drivers/AcpiTables/rtsm_ve-v7/Dsdt.asl @@ -240,7 +240,7 @@ DefinitionBlock ( } Device (NET0) { - Name (_HID, "LINA0003") + Name (_HID, "LNRO0003") Name (_UID, 0) Method (_CRS, 0x0, Serialized) { -- 1.7.9.5

10 years, 11 months

[PATCH] ACPI / platform: Use official HID as LNRO

by naresh.bhat＠linaro.org

From: Naresh Bhat <naresh.bhat(a)linaro.org> Use the official HID as LNRO from temporary LINA. Signed-off-by: Naresh Bhat <naresh.bhat(a)linaro.org> --- arch/arm64/kernel/perf_event.c | 2 +- drivers/acpi/acpi_platform.c | 10 +++++----- drivers/mfd/vexpress-sysreg.c | 2 +- drivers/net/ethernet/smsc/smc91x.c | 2 +- drivers/virtio/virtio_mmio.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index 460f158..a5d297b 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -1237,7 +1237,7 @@ static struct of_device_id armpmu_of_device_ids[] = { #ifdef CONFIG_ACPI static const struct acpi_device_id armpmu_acpi_match[] = { - { "LINA0007", }, + { "LNRO0007", }, {}, }; #endif diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c index 74beb94..1359eda 100644 --- a/drivers/acpi/acpi_platform.c +++ b/drivers/acpi/acpi_platform.c @@ -31,11 +31,11 @@ static const struct acpi_device_id acpi_platform_device_ids[] = { { "PNP0D40" }, /* arm64 platform devices */ - { "LINA0003" }, /* smc91x for ethernet */ - { "LINA0005" }, /* virtio mmio */ - { "LINA0007" }, /* armv8 pmu */ - { "LINA0009" }, /* vexpress-sysreg */ - { "LINA000A" }, /* uart-pl011 */ + { "LNRO0003" }, /* smc91x for ethernet */ + { "LNRO0005" }, /* virtio mmio */ + { "LNRO0007" }, /* armv8 pmu */ + { "LNRO0009" }, /* vexpress-sysreg */ + { "LNRO000A" }, /* uart-pl011 */ { } }; diff --git a/drivers/mfd/vexpress-sysreg.c b/drivers/mfd/vexpress-sysreg.c index 9e39075..31f60ff 100644 --- a/drivers/mfd/vexpress-sysreg.c +++ b/drivers/mfd/vexpress-sysreg.c @@ -515,7 +515,7 @@ static const struct of_device_id vexpress_sysreg_match[] = { #ifdef CONFIG_ACPI static const struct acpi_device_id vexpress_sysreg_acpi_match[] = { - { "LINA0009", }, + { "LNRO0009", }, { } }; #endif diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c index 7aa517d..46f241d 100644 --- a/drivers/net/ethernet/smsc/smc91x.c +++ b/drivers/net/ethernet/smsc/smc91x.c @@ -2387,7 +2387,7 @@ MODULE_DEVICE_TABLE(of, smc91x_match); #ifdef CONFIG_ACPI static const struct acpi_device_id smc91x_acpi_match[] = { - { "LINA0003", }, + { "LNRO0003", }, { } }; MODULE_DEVICE_TABLE(acpi, smc91x_acpi_match); diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c index 81d539f..39007aa 100644 --- a/drivers/virtio/virtio_mmio.c +++ b/drivers/virtio/virtio_mmio.c @@ -637,7 +637,7 @@ MODULE_DEVICE_TABLE(of, virtio_mmio_match); #ifdef CONFIG_ACPI static const struct acpi_device_id virtio_mmio_acpi_match[] = { - { "LINA0005", }, + { "LNRO0005", }, { } }; MODULE_DEVICE_TABLE(acpi, virtio_mmio_acpi_match); -- 1.7.9.5

10 years, 11 months

← Newer
1
...
56
57
58
59
60
61
62
...
82
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Linaro-acpi