From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hanjun Guo Subject: Re: [PATCH v20 16/17] clocksource/drivers/arm_arch_timer: Add GTDT support for memory-mapped timer Date: Thu, 19 Jan 2017 17:16:33 +0800 Message-ID: References: <20170118132541.8989-1-fu.wei@linaro.org> <20170118132541.8989-17-fu.wei@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20170118132541.8989-17-fu.wei-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> Sender: linux-watchdog-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: fu.wei-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, rjw-LthD3rsA81gm4RdzfppkhA@public.gmane.org, lenb-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org, marc.zyngier-5wv7dgnIgG8@public.gmane.org, mark.rutland-5wv7dgnIgG8@public.gmane.org, lorenzo.pieralisi-5wv7dgnIgG8@public.gmane.org, sudeep.holla-5wv7dgnIgG8@public.gmane.org Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linaro-acpi-cunTk1MwBs8s++Sfvej+rw@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-acpi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, rruigrok-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, harba-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, cov-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, timur-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, graeme.gregory-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, al.stone-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, jcm-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, wei-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, arnd-r2nGTMty4D4@public.gmane.org, catalin.marinas-5wv7dgnIgG8@public.gmane.org, will.deacon-5wv7dgnIgG8@public.gmane.org, Suravee.Suthikulpanit-5C7GfCeVMHo@public.gmane.org, leo.duran-5C7GfCeVMHo@public.gmane.org, wim-IQzOog9fTRqzQB+pC5nmwQ@public.gmane.org, linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org, linux-watchdog-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, tn-nYOzD4b6Jr9Wk0Htik3J/w@public.gmane.org, christoffer.dall-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, julien.grall-5wv7dgnIgG8@public.gmane.org List-Id: linux-acpi@vger.kernel.org On 2017/1/18 21:25, fu.wei-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org wrote: > From: Fu Wei > > 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 > --- > 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 79dc004..7ca2da7 100644 > --- a/drivers/clocksource/arm_arch_timer.c > +++ b/drivers/clocksource/arm_arch_timer.c > @@ -1077,10 +1077,36 @@ 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; > + if (!platform_timer_count) return 0; Did I miss something? Thanks Hanjun > + 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); > + if (!ret) > + break; > + timer_mem++; > + } > + > +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"); > @@ -1089,7 +1115,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; > @@ -1122,6 +1148,9 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table) > if (ret) > return ret; > > + if (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); > -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751636AbdASJRH (ORCPT ); Thu, 19 Jan 2017 04:17:07 -0500 Received: from mail-pf0-f180.google.com ([209.85.192.180]:33429 "EHLO mail-pf0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751546AbdASJQn (ORCPT ); Thu, 19 Jan 2017 04:16:43 -0500 Subject: Re: [PATCH v20 16/17] clocksource/drivers/arm_arch_timer: Add GTDT support for memory-mapped timer To: fu.wei@linaro.org, rjw@rjwysocki.net, lenb@kernel.org, daniel.lezcano@linaro.org, tglx@linutronix.de, marc.zyngier@arm.com, mark.rutland@arm.com, lorenzo.pieralisi@arm.com, sudeep.holla@arm.com References: <20170118132541.8989-1-fu.wei@linaro.org> <20170118132541.8989-17-fu.wei@linaro.org> Cc: linux-arm-kernel@lists.infradead.org, linaro-acpi@lists.linaro.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, rruigrok@codeaurora.org, harba@codeaurora.org, cov@codeaurora.org, timur@codeaurora.org, graeme.gregory@linaro.org, al.stone@linaro.org, jcm@redhat.com, wei@redhat.com, arnd@arndb.de, catalin.marinas@arm.com, will.deacon@arm.com, Suravee.Suthikulpanit@amd.com, leo.duran@amd.com, wim@iguana.be, linux@roeck-us.net, linux-watchdog@vger.kernel.org, tn@semihalf.com, christoffer.dall@linaro.org, julien.grall@arm.com From: Hanjun Guo Message-ID: Date: Thu, 19 Jan 2017 17:16:33 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <20170118132541.8989-17-fu.wei@linaro.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2017/1/18 21:25, fu.wei@linaro.org wrote: > From: Fu Wei > > 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 > --- > 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 79dc004..7ca2da7 100644 > --- a/drivers/clocksource/arm_arch_timer.c > +++ b/drivers/clocksource/arm_arch_timer.c > @@ -1077,10 +1077,36 @@ 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; > + if (!platform_timer_count) return 0; Did I miss something? Thanks Hanjun > + 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); > + if (!ret) > + break; > + timer_mem++; > + } > + > +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"); > @@ -1089,7 +1115,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; > @@ -1122,6 +1148,9 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table) > if (ret) > return ret; > > + if (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); > From mboxrd@z Thu Jan 1 00:00:00 1970 From: hanjun.guo@linaro.org (Hanjun Guo) Date: Thu, 19 Jan 2017 17:16:33 +0800 Subject: [PATCH v20 16/17] clocksource/drivers/arm_arch_timer: Add GTDT support for memory-mapped timer In-Reply-To: <20170118132541.8989-17-fu.wei@linaro.org> References: <20170118132541.8989-1-fu.wei@linaro.org> <20170118132541.8989-17-fu.wei@linaro.org> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 2017/1/18 21:25, fu.wei at linaro.org wrote: > From: Fu Wei > > 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 > --- > 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 79dc004..7ca2da7 100644 > --- a/drivers/clocksource/arm_arch_timer.c > +++ b/drivers/clocksource/arm_arch_timer.c > @@ -1077,10 +1077,36 @@ 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; > + if (!platform_timer_count) return 0; Did I miss something? Thanks Hanjun > + 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); > + if (!ret) > + break; > + timer_mem++; > + } > + > +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"); > @@ -1089,7 +1115,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; > @@ -1122,6 +1148,9 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table) > if (ret) > return ret; > > + if (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); >