lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 7 Feb 2017 02:50:14 +0800 From: fu.wei@...aro.org To: rjw@...ysocki.net, lenb@...nel.org, daniel.lezcano@...aro.org, tglx@...utronix.de, marc.zyngier@....com, mark.rutland@....com, lorenzo.pieralisi@....com, sudeep.holla@....com, hanjun.guo@...aro.org Cc: linux-arm-kernel@...ts.infradead.org, linaro-acpi@...ts.linaro.org, linux-kernel@...r.kernel.org, linux-acpi@...r.kernel.org, rruigrok@...eaurora.org, harba@...eaurora.org, cov@...eaurora.org, timur@...eaurora.org, graeme.gregory@...aro.org, al.stone@...aro.org, jcm@...hat.com, wei@...hat.com, arnd@...db.de, catalin.marinas@....com, will.deacon@....com, Suravee.Suthikulpanit@....com, leo.duran@....com, wim@...ana.be, linux@...ck-us.net, linux-watchdog@...r.kernel.org, tn@...ihalf.com, christoffer.dall@...aro.org, julien.grall@....com, Fu Wei <fu.wei@...aro.org> Subject: [PATCH v21 12/13] clocksource: arm_arch_timer: add GTDT support for memory-mapped timer From: Fu Wei <fu.wei@...aro.org> The patch add memory-mapped timer register support by using the information provided by the new GTDT driver of ACPI. Signed-off-by: Fu Wei <fu.wei@...aro.org> Reviewed-by: Hanjun Guo <hanjun.guo@...aro.org> --- drivers/clocksource/arm_arch_timer.c | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 35e0b66..44c55ec 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -1159,10 +1159,35 @@ CLOCKSOURCE_OF_DECLARE(armv7_arch_timer_mem, "arm,armv7-timer-mem", arch_timer_mem_of_init); #ifdef CONFIG_ACPI_GTDT -/* Initialize per-processor generic timer */ +static int __init arch_timer_mem_acpi_init(int platform_timer_count) +{ + struct arch_timer_mem *timer_mem; + int timer_count, i, ret; + + timer_mem = kcalloc(platform_timer_count, sizeof(*timer_mem), + GFP_KERNEL); + if (!timer_mem) + return -ENOMEM; + + ret = acpi_arch_timer_mem_init(timer_mem, &timer_count); + if (ret || !timer_count) + goto error; + + for (i = 0; i < timer_count; i++) { + ret = arch_timer_mem_init(timer_mem + i); + if (!ret) + break; + } + +error: + kfree(timer_mem); + return ret; +} + +/* Initialize per-processor generic timer and memory-mapped timer(if present) */ static int __init arch_timer_acpi_init(struct acpi_table_header *table) { - int ret; + int ret, platform_timer_count; if (arch_timers_present & ARCH_TIMER_TYPE_CP15) { pr_warn("already initialized, skipping\n"); @@ -1171,7 +1196,7 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table) arch_timers_present |= ARCH_TIMER_TYPE_CP15; - ret = acpi_gtdt_init(table, NULL); + ret = acpi_gtdt_init(table, &platform_timer_count); if (ret) { pr_err("Failed to init GTDT table.\n"); return ret; @@ -1208,6 +1233,10 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table) if (ret) return ret; + if (platform_timer_count && + arch_timer_mem_acpi_init(platform_timer_count)) + pr_err("Failed to initialize memory-mapped timer.\n"); + return arch_timer_common_init(); } CLOCKSOURCE_ACPI_DECLARE(arch_timer, ACPI_SIG_GTDT, arch_timer_acpi_init); -- 2.9.3
Powered by blists - more mailing lists