Linaro-acpi December 2013

linaro-acpi@lists.linaro.org

19 participants
38 discussions

[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, 5 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, 5 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, 5 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, 5 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, 5 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, 5 months

[RFC part1 PATCH 0/7] Make ACPI core running on ARM64

by Hanjun Guo

This is the first part of making ACPI core running on ARM. PCI is optional on ARM64 but ACPI is dependent on PCI now, so in the first patch we try to make ACPI can be running without PCI. _PDC is requred for ACPI processor_core.c, but its related code is a little bit x86/ia64 dependent, so I rework _PDC related staff to make it more arch independent, and then introduce the skeleton of _PDC related for ARM64, it should be fully implemented after ACPI spec is ready for processor idle control. After that, arm-core.c is introduced so we can get ACPI table from UEFI, then we can parsed for SMP initialisation, GIC initialisation and for ACPI drivers. This patch set is based on: git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git origin/linux-next branch and plus Al Stone's v2 reduced hardware profile patch. Hanjun Guo (7): ACPI: Make ACPI core running without PCI on ARM64 ARM64 : Add dummy asm/cpu.h ACPI / processor_core: Rework _PDC related stuff to make it more arch-independent ARM64 / ACPI: Introduce the skeleton of _PDC related for ARM64 ARM64 / ACPI: Introduce arm_core.c and its related head file ARM64 / ACPI: Introduce lowlevel suspend function ARM64 / ACPI: Enable ARM64 in Kconfig arch/arm64/Kconfig | 2 + arch/arm64/include/asm/acpi.h | 93 +++++++++++++++ arch/arm64/include/asm/cpu.h | 25 ++++ arch/arm64/include/asm/processor.h | 11 ++ arch/arm64/kernel/process.c | 5 + arch/arm64/kernel/setup.c | 8 ++ drivers/acpi/Kconfig | 12 +- drivers/acpi/Makefile | 4 +- drivers/acpi/internal.h | 5 + drivers/acpi/osl.c | 16 +++ drivers/acpi/plat/Makefile | 1 + drivers/acpi/plat/arm-core.c | 226 ++++++++++++++++++++++++++++++++++++ drivers/acpi/processor_core.c | 27 ++--- drivers/acpi/reboot.c | 47 +++++--- drivers/pnp/pnpacpi/rsparser.c | 2 + 15 files changed, 452 insertions(+), 32 deletions(-) create mode 100644 arch/arm64/include/asm/acpi.h create mode 100644 arch/arm64/include/asm/cpu.h create mode 100644 drivers/acpi/plat/Makefile create mode 100644 drivers/acpi/plat/arm-core.c -- 1.7.9.5

10 years, 5 months

[PATCH] foundation v8:Fix PNPID for serial

by naresh.bhat＠linaro.org

From: Naresh Bhat <naresh.bhat(a)linaro.org> Use the official PNPID as LNRO for serial devices. Signed-off-by: Naresh Bhat <naresh.bhat(a)linaro.org> --- platforms/foundation-v8.acpi/dsdt.asl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/platforms/foundation-v8.acpi/dsdt.asl b/platforms/foundation-v8.acpi/dsdt.asl index 777ae48..0d2ccd5 100644 --- a/platforms/foundation-v8.acpi/dsdt.asl +++ b/platforms/foundation-v8.acpi/dsdt.asl @@ -469,7 +469,7 @@ DefinitionBlock ( } Device (SER0) { - Name (_HID, "LINA000A") + Name (_HID, "LNRO000A") Name (_ADR, 0x1c090000) Name (_UID, 0) @@ -483,7 +483,7 @@ DefinitionBlock ( } Device (SER1) { - Name (_HID, "LINA000A") + Name (_HID, "LNRO000A") Name (_ADR, 0x1c0a0000) Name (_UID, 1) @@ -497,7 +497,7 @@ DefinitionBlock ( } Device (SER2) { - Name (_HID, "LINA000A") + Name (_HID, "LNRO000A") Name (_ADR, 0x1c0b0000) Name (_UID, 2) @@ -511,7 +511,7 @@ DefinitionBlock ( } Device (SER3) { - Name (_HID, "LINA000A") + Name (_HID, "LNRO000A") Name (_ADR, 0x1c0c0000) Name (_UID, 3) -- 1.7.9.5

10 years, 5 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Linaro-acpi December 2013