From: fu.wei@linaro.org To: 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, hanjun.guo@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, Fu Wei <fu.wei@linaro.org> Subject: [PATCH v15 10/13] clocksource/drivers/arm_arch_timer: Simplify ACPI support code. Date: Tue, 15 Nov 2016 21:13:32 +0800 [thread overview] Message-ID: <1479215615-26950-11-git-send-email-fu.wei@linaro.org> (raw) In-Reply-To: <1479215615-26950-1-git-send-email-fu.wei@linaro.org> From: Fu Wei <fu.wei@linaro.org> The patch update arm_arch_timer driver to use the function provided by the new GTDT driver of ACPI. By this way, arm_arch_timer.c can be simplified, and separate all the ACPI GTDT knowledge from this timer driver. Signed-off-by: Fu Wei <fu.wei@linaro.org> Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org> --- drivers/clocksource/arm_arch_timer.c | 55 +++++++++++++----------------------- 1 file changed, 19 insertions(+), 36 deletions(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index a44e44d..653374c 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -1052,66 +1052,49 @@ static int __init arch_timer_mem_of_init(struct device_node *np) CLOCKSOURCE_OF_DECLARE(armv7_arch_timer_mem, "arm,armv7-timer-mem", arch_timer_mem_of_init); -#ifdef CONFIG_ACPI -static int __init map_generic_timer_interrupt(u32 interrupt, u32 flags) -{ - int trigger, polarity; - - if (!interrupt) - return 0; - - trigger = (flags & ACPI_GTDT_INTERRUPT_MODE) ? ACPI_EDGE_SENSITIVE - : ACPI_LEVEL_SENSITIVE; - - polarity = (flags & ACPI_GTDT_INTERRUPT_POLARITY) ? ACPI_ACTIVE_LOW - : ACPI_ACTIVE_HIGH; - - return acpi_register_gsi(NULL, interrupt, trigger, polarity); -} - +#ifdef CONFIG_ACPI_GTDT /* Initialize per-processor generic timer */ static int __init arch_timer_acpi_init(struct acpi_table_header *table) { int ret; - struct acpi_table_gtdt *gtdt; if (arch_timers_present & ARCH_TIMER_TYPE_CP15) { pr_warn("already initialized, skipping\n"); return -EINVAL; } - gtdt = container_of(table, struct acpi_table_gtdt, header); - arch_timers_present |= ARCH_TIMER_TYPE_CP15; - arch_timer_ppi[ARCH_TIMER_PHYS_SECURE_PPI] = - map_generic_timer_interrupt(gtdt->secure_el1_interrupt, - gtdt->secure_el1_flags); + ret = acpi_gtdt_init(table); + if (ret) { + pr_err("Failed to init GTDT table.\n"); + return ret; + } arch_timer_ppi[ARCH_TIMER_PHYS_NONSECURE_PPI] = - map_generic_timer_interrupt(gtdt->non_secure_el1_interrupt, - gtdt->non_secure_el1_flags); + acpi_gtdt_map_ppi(ARCH_TIMER_PHYS_NONSECURE_PPI); arch_timer_ppi[ARCH_TIMER_VIRT_PPI] = - map_generic_timer_interrupt(gtdt->virtual_timer_interrupt, - gtdt->virtual_timer_flags); + acpi_gtdt_map_ppi(ARCH_TIMER_VIRT_PPI); arch_timer_ppi[ARCH_TIMER_HYP_PPI] = - map_generic_timer_interrupt(gtdt->non_secure_el2_interrupt, - gtdt->non_secure_el2_flags); - - /* Get the frequency from CNTFRQ */ - arch_timer_detect_rate(NULL, NULL); + acpi_gtdt_map_ppi(ARCH_TIMER_HYP_PPI); ret = arch_timer_uses_ppi_init(); if (ret) - return ret; + goto error; /* Always-on capability */ - arch_timer_c3stop = !(gtdt->non_secure_el1_flags & ACPI_GTDT_ALWAYS_ON); + arch_timer_c3stop = acpi_gtdt_c3stop(arch_timer_uses_ppi); - arch_timer_init(); - return 0; + /* Get the frequency from CNTFRQ */ + arch_timer_detect_rate(NULL, NULL); + + ret = arch_timer_init(); + +error: + acpi_gtdt_release(); + return ret; } CLOCKSOURCE_ACPI_DECLARE(arch_timer, ACPI_SIG_GTDT, arch_timer_acpi_init); #endif -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: fu.wei@linaro.org (fu.wei at linaro.org) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v15 10/13] clocksource/drivers/arm_arch_timer: Simplify ACPI support code. Date: Tue, 15 Nov 2016 21:13:32 +0800 [thread overview] Message-ID: <1479215615-26950-11-git-send-email-fu.wei@linaro.org> (raw) In-Reply-To: <1479215615-26950-1-git-send-email-fu.wei@linaro.org> From: Fu Wei <fu.wei@linaro.org> The patch update arm_arch_timer driver to use the function provided by the new GTDT driver of ACPI. By this way, arm_arch_timer.c can be simplified, and separate all the ACPI GTDT knowledge from this timer driver. Signed-off-by: Fu Wei <fu.wei@linaro.org> Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org> --- drivers/clocksource/arm_arch_timer.c | 55 +++++++++++++----------------------- 1 file changed, 19 insertions(+), 36 deletions(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index a44e44d..653374c 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -1052,66 +1052,49 @@ static int __init arch_timer_mem_of_init(struct device_node *np) CLOCKSOURCE_OF_DECLARE(armv7_arch_timer_mem, "arm,armv7-timer-mem", arch_timer_mem_of_init); -#ifdef CONFIG_ACPI -static int __init map_generic_timer_interrupt(u32 interrupt, u32 flags) -{ - int trigger, polarity; - - if (!interrupt) - return 0; - - trigger = (flags & ACPI_GTDT_INTERRUPT_MODE) ? ACPI_EDGE_SENSITIVE - : ACPI_LEVEL_SENSITIVE; - - polarity = (flags & ACPI_GTDT_INTERRUPT_POLARITY) ? ACPI_ACTIVE_LOW - : ACPI_ACTIVE_HIGH; - - return acpi_register_gsi(NULL, interrupt, trigger, polarity); -} - +#ifdef CONFIG_ACPI_GTDT /* Initialize per-processor generic timer */ static int __init arch_timer_acpi_init(struct acpi_table_header *table) { int ret; - struct acpi_table_gtdt *gtdt; if (arch_timers_present & ARCH_TIMER_TYPE_CP15) { pr_warn("already initialized, skipping\n"); return -EINVAL; } - gtdt = container_of(table, struct acpi_table_gtdt, header); - arch_timers_present |= ARCH_TIMER_TYPE_CP15; - arch_timer_ppi[ARCH_TIMER_PHYS_SECURE_PPI] = - map_generic_timer_interrupt(gtdt->secure_el1_interrupt, - gtdt->secure_el1_flags); + ret = acpi_gtdt_init(table); + if (ret) { + pr_err("Failed to init GTDT table.\n"); + return ret; + } arch_timer_ppi[ARCH_TIMER_PHYS_NONSECURE_PPI] = - map_generic_timer_interrupt(gtdt->non_secure_el1_interrupt, - gtdt->non_secure_el1_flags); + acpi_gtdt_map_ppi(ARCH_TIMER_PHYS_NONSECURE_PPI); arch_timer_ppi[ARCH_TIMER_VIRT_PPI] = - map_generic_timer_interrupt(gtdt->virtual_timer_interrupt, - gtdt->virtual_timer_flags); + acpi_gtdt_map_ppi(ARCH_TIMER_VIRT_PPI); arch_timer_ppi[ARCH_TIMER_HYP_PPI] = - map_generic_timer_interrupt(gtdt->non_secure_el2_interrupt, - gtdt->non_secure_el2_flags); - - /* Get the frequency from CNTFRQ */ - arch_timer_detect_rate(NULL, NULL); + acpi_gtdt_map_ppi(ARCH_TIMER_HYP_PPI); ret = arch_timer_uses_ppi_init(); if (ret) - return ret; + goto error; /* Always-on capability */ - arch_timer_c3stop = !(gtdt->non_secure_el1_flags & ACPI_GTDT_ALWAYS_ON); + arch_timer_c3stop = acpi_gtdt_c3stop(arch_timer_uses_ppi); - arch_timer_init(); - return 0; + /* Get the frequency from CNTFRQ */ + arch_timer_detect_rate(NULL, NULL); + + ret = arch_timer_init(); + +error: + acpi_gtdt_release(); + return ret; } CLOCKSOURCE_ACPI_DECLARE(arch_timer, ACPI_SIG_GTDT, arch_timer_acpi_init); #endif -- 2.7.4
next prev parent reply other threads:[~2016-11-15 13:13 UTC|newest] Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-11-15 13:13 [PATCH v15 00/13] acpi, clocksource: add GTDT driver and GTDT support in arm_arch_timer fu.wei 2016-11-15 13:13 ` fu.wei at linaro.org 2016-11-15 13:13 ` [PATCH v15 01/13] clocksource/drivers/arm_arch_timer: Move enums and defines to header file fu.wei 2016-11-15 13:13 ` fu.wei at linaro.org 2016-11-15 19:23 ` kbuild test robot 2016-11-15 19:23 ` kbuild test robot 2016-11-15 19:23 ` kbuild test robot [not found] ` <201611160359.fuY2etTU%fengguang.wu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> 2016-11-16 2:15 ` Fu Wei 2016-11-16 2:15 ` Fu Wei 2016-11-16 2:15 ` Fu Wei 2016-11-15 13:13 ` [PATCH v15 02/13] clocksource/drivers/arm_arch_timer: Add a new enum for spi type fu.wei 2016-11-15 13:13 ` fu.wei at linaro.org 2016-11-15 13:13 ` [PATCH v15 03/13] clocksource/drivers/arm_arch_timer: Improve printk relevant code fu.wei 2016-11-15 13:13 ` fu.wei at linaro.org 2016-11-15 13:13 ` [PATCH v15 04/13] clocksource/drivers/arm_arch_timer: rename some enums and defines, and some cleanups fu.wei 2016-11-15 13:13 ` fu.wei at linaro.org [not found] ` <1479215615-26950-1-git-send-email-fu.wei-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2016-11-15 13:13 ` [PATCH v15 05/13] clocksource/drivers/arm_arch_timer: fix a bug in arch_timer_register about arch_timer_uses_ppi fu.wei-QSEj5FYQhm4dnm+yROfE0A 2016-11-15 13:13 ` fu.wei at linaro.org 2016-11-15 13:13 ` fu.wei 2016-11-15 13:13 ` [PATCH v15 11/13] acpi/arm64: Add memory-mapped timer support in GTDT driver fu.wei-QSEj5FYQhm4dnm+yROfE0A 2016-11-15 13:13 ` fu.wei at linaro.org 2016-11-15 13:13 ` fu.wei 2016-11-15 13:13 ` fu.wei 2016-11-15 13:13 ` [PATCH v15 12/13] clocksource/drivers/arm_arch_timer: Add GTDT support for memory-mapped timer fu.wei-QSEj5FYQhm4dnm+yROfE0A 2016-11-15 13:13 ` fu.wei at linaro.org 2016-11-15 13:13 ` fu.wei 2016-11-15 13:13 ` [PATCH v15 06/13] clocksource/drivers/arm_arch_timer: separate out arch_timer_uses_ppi init code to prepare for GTDT fu.wei 2016-11-15 13:13 ` fu.wei at linaro.org 2016-11-15 13:13 ` [PATCH v15 07/13] clocksource/drivers/arm_arch_timer: Introduce some new structs " fu.wei 2016-11-15 13:13 ` fu.wei at linaro.org 2016-11-15 13:13 ` [PATCH v15 08/13] clocksource/drivers/arm_arch_timer: Refactor the timer init code " fu.wei 2016-11-15 13:13 ` fu.wei at linaro.org 2016-11-15 13:13 ` [PATCH v15 09/13] acpi/arm64: Add GTDT table parse driver fu.wei 2016-11-15 13:13 ` fu.wei at linaro.org 2016-11-15 13:13 ` fu.wei [this message] 2016-11-15 13:13 ` [PATCH v15 10/13] clocksource/drivers/arm_arch_timer: Simplify ACPI support code fu.wei at linaro.org 2016-11-15 13:13 ` [PATCH v15 13/13] acpi/arm64: Add SBSA Generic Watchdog support in GTDT driver fu.wei 2016-11-15 13:13 ` fu.wei at linaro.org 2016-11-15 13:13 ` fu.wei
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1479215615-26950-11-git-send-email-fu.wei@linaro.org \ --to=fu.wei@linaro.org \ --cc=Suravee.Suthikulpanit@amd.com \ --cc=al.stone@linaro.org \ --cc=arnd@arndb.de \ --cc=catalin.marinas@arm.com \ --cc=christoffer.dall@linaro.org \ --cc=cov@codeaurora.org \ --cc=daniel.lezcano@linaro.org \ --cc=graeme.gregory@linaro.org \ --cc=hanjun.guo@linaro.org \ --cc=harba@codeaurora.org \ --cc=jcm@redhat.com \ --cc=julien.grall@arm.com \ --cc=lenb@kernel.org \ --cc=leo.duran@amd.com \ --cc=linaro-acpi@lists.linaro.org \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-watchdog@vger.kernel.org \ --cc=linux@roeck-us.net \ --cc=lorenzo.pieralisi@arm.com \ --cc=marc.zyngier@arm.com \ --cc=mark.rutland@arm.com \ --cc=rjw@rjwysocki.net \ --cc=rruigrok@codeaurora.org \ --cc=sudeep.holla@arm.com \ --cc=tglx@linutronix.de \ --cc=timur@codeaurora.org \ --cc=tn@semihalf.com \ --cc=wei@redhat.com \ --cc=will.deacon@arm.com \ --cc=wim@iguana.be \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.