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 v21 03/13] clocksource: arm_arch_timer: remove arch_timer_detect_rate Date: Tue, 7 Feb 2017 02:50:05 +0800 [thread overview] Message-ID: <20170206185015.12296-4-fu.wei@linaro.org> (raw) In-Reply-To: <20170206185015.12296-1-fu.wei@linaro.org> From: Fu Wei <fu.wei@linaro.org> The original counter frequency detection call(arch_timer_detect_rate) include getting the frequency from the per-cpu arch-timer and the memory-mapped (MMIO) timer interfaces. But they will be needed only when the system initializes the relevant timer. This patch remove arch_timer_detect_rate founction, and use the arch_timer_get_sysreg_freq and arch_timer_get_mmio_freq directly. Signed-off-by: Fu Wei <fu.wei@linaro.org> --- drivers/clocksource/arm_arch_timer.c | 38 +++++++++++++++--------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index aa14305..63fb441 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -571,25 +571,6 @@ static u32 arch_timer_get_mmio_freq(void __iomem *cntbase) return readl_relaxed(cntbase + CNTFRQ); } -static void arch_timer_detect_rate(void __iomem *cntbase) -{ - /* Who has more than one independent system counter? */ - if (arch_timer_rate) - return; - - /* - * Try to determine the frequency from the MMIO timer or the sysreg. - */ - if (cntbase) - arch_timer_rate = arch_timer_get_mmio_freq(cntbase); - else - arch_timer_rate = arch_timer_get_sysreg_freq(); - - /* Check the timer frequency. */ - if (arch_timer_rate == 0) - pr_warn("frequency not available\n"); -} - static void arch_timer_banner(unsigned type) { pr_info("%s%s%s timer(s) running at %lu.%02luMHz (%s%s%s).\n", @@ -970,7 +951,11 @@ static int __init arch_timer_of_init(struct device_node *np) */ if (!arch_timer_rate && of_property_read_u32(np, "clock-frequency", &arch_timer_rate)) - arch_timer_detect_rate(NULL); + arch_timer_rate = arch_timer_get_sysreg_freq(); + if (!arch_timer_rate) { + pr_err(FW_BUG "frequency not available.\n"); + return -EINVAL; + } arch_timer_c3stop = !of_property_read_bool(np, "always-on"); @@ -1087,7 +1072,12 @@ static int __init arch_timer_mem_init(struct device_node *np) */ if (!arch_timer_rate && of_property_read_u32(np, "clock-frequency", &arch_timer_rate)) - arch_timer_detect_rate(base); + arch_timer_rate = arch_timer_get_mmio_freq(base); + if (!arch_timer_rate) { + pr_err(FW_BUG "frequency not available for MMIO timer.\n"); + ret = -EINVAL; + goto out; + } ret = arch_timer_mem_register(base, irq); if (ret) @@ -1150,7 +1140,11 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table) gtdt->non_secure_el2_flags); /* Get the frequency from the sysreg CNTFRQ */ - arch_timer_detect_rate(NULL); + arch_timer_rate = arch_timer_get_sysreg_freq(); + if (!arch_timer_rate) { + pr_err(FW_BUG "frequency not available.\n"); + return -EINVAL; + } arch_timer_uses_ppi = arch_timer_select_ppi(); if (!arch_timer_ppi[arch_timer_uses_ppi]) { -- 2.9.3
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 v21 03/13] clocksource: arm_arch_timer: remove arch_timer_detect_rate Date: Tue, 7 Feb 2017 02:50:05 +0800 [thread overview] Message-ID: <20170206185015.12296-4-fu.wei@linaro.org> (raw) In-Reply-To: <20170206185015.12296-1-fu.wei@linaro.org> From: Fu Wei <fu.wei@linaro.org> The original counter frequency detection call(arch_timer_detect_rate) include getting the frequency from the per-cpu arch-timer and the memory-mapped (MMIO) timer interfaces. But they will be needed only when the system initializes the relevant timer. This patch remove arch_timer_detect_rate founction, and use the arch_timer_get_sysreg_freq and arch_timer_get_mmio_freq directly. Signed-off-by: Fu Wei <fu.wei@linaro.org> --- drivers/clocksource/arm_arch_timer.c | 38 +++++++++++++++--------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index aa14305..63fb441 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -571,25 +571,6 @@ static u32 arch_timer_get_mmio_freq(void __iomem *cntbase) return readl_relaxed(cntbase + CNTFRQ); } -static void arch_timer_detect_rate(void __iomem *cntbase) -{ - /* Who has more than one independent system counter? */ - if (arch_timer_rate) - return; - - /* - * Try to determine the frequency from the MMIO timer or the sysreg. - */ - if (cntbase) - arch_timer_rate = arch_timer_get_mmio_freq(cntbase); - else - arch_timer_rate = arch_timer_get_sysreg_freq(); - - /* Check the timer frequency. */ - if (arch_timer_rate == 0) - pr_warn("frequency not available\n"); -} - static void arch_timer_banner(unsigned type) { pr_info("%s%s%s timer(s) running at %lu.%02luMHz (%s%s%s).\n", @@ -970,7 +951,11 @@ static int __init arch_timer_of_init(struct device_node *np) */ if (!arch_timer_rate && of_property_read_u32(np, "clock-frequency", &arch_timer_rate)) - arch_timer_detect_rate(NULL); + arch_timer_rate = arch_timer_get_sysreg_freq(); + if (!arch_timer_rate) { + pr_err(FW_BUG "frequency not available.\n"); + return -EINVAL; + } arch_timer_c3stop = !of_property_read_bool(np, "always-on"); @@ -1087,7 +1072,12 @@ static int __init arch_timer_mem_init(struct device_node *np) */ if (!arch_timer_rate && of_property_read_u32(np, "clock-frequency", &arch_timer_rate)) - arch_timer_detect_rate(base); + arch_timer_rate = arch_timer_get_mmio_freq(base); + if (!arch_timer_rate) { + pr_err(FW_BUG "frequency not available for MMIO timer.\n"); + ret = -EINVAL; + goto out; + } ret = arch_timer_mem_register(base, irq); if (ret) @@ -1150,7 +1140,11 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table) gtdt->non_secure_el2_flags); /* Get the frequency from the sysreg CNTFRQ */ - arch_timer_detect_rate(NULL); + arch_timer_rate = arch_timer_get_sysreg_freq(); + if (!arch_timer_rate) { + pr_err(FW_BUG "frequency not available.\n"); + return -EINVAL; + } arch_timer_uses_ppi = arch_timer_select_ppi(); if (!arch_timer_ppi[arch_timer_uses_ppi]) { -- 2.9.3
next prev parent reply other threads:[~2017-02-06 18:50 UTC|newest] Thread overview: 98+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-02-06 18:50 [PATCH v21 00/13] acpi, clocksource: add GTDT driver and GTDT support in arm_arch_timer fu.wei 2017-02-06 18:50 ` fu.wei at linaro.org 2017-02-06 18:50 ` [PATCH v21 01/13] clocksource: arm_arch_timer: introduce two functions to get the frequency from mmio and sysreg fu.wei 2017-02-06 18:50 ` fu.wei at linaro.org 2017-03-17 18:05 ` Mark Rutland 2017-03-17 18:05 ` Mark Rutland 2017-03-17 18:05 ` Mark Rutland 2017-03-20 7:36 ` Fu Wei 2017-03-20 7:36 ` Fu Wei 2017-03-20 7:36 ` Fu Wei 2017-03-20 9:43 ` Fu Wei 2017-03-20 9:43 ` Fu Wei 2017-03-20 9:43 ` Fu Wei 2017-03-20 10:41 ` Mark Rutland 2017-03-20 10:41 ` Mark Rutland 2017-03-20 10:41 ` Mark Rutland 2017-03-20 11:09 ` Fu Wei 2017-03-20 11:09 ` Fu Wei 2017-03-20 11:09 ` Fu Wei 2017-02-06 18:50 ` fu.wei [this message] 2017-02-06 18:50 ` [PATCH v21 03/13] clocksource: arm_arch_timer: remove arch_timer_detect_rate fu.wei at linaro.org 2017-03-17 18:07 ` Mark Rutland 2017-03-17 18:07 ` Mark Rutland 2017-03-17 18:07 ` Mark Rutland 2017-03-20 6:59 ` Fu Wei 2017-03-20 6:59 ` Fu Wei 2017-03-20 6:59 ` Fu Wei 2017-02-06 18:50 ` [PATCH v21 04/13] clocksource: arm_arch_timer: split arch_timer_rate for different types of timer fu.wei 2017-02-06 18:50 ` fu.wei at linaro.org 2017-03-17 19:05 ` Mark Rutland 2017-03-17 19:05 ` Mark Rutland 2017-03-17 19:05 ` Mark Rutland 2017-03-20 13:35 ` Fu Wei 2017-03-20 13:35 ` Fu Wei 2017-03-20 13:35 ` Fu Wei 2017-02-06 18:50 ` [PATCH v21 05/13] clocksource: arm_arch_timer: refactor arch_timer_needs_probing fu.wei 2017-02-06 18:50 ` fu.wei at linaro.org 2017-02-06 18:50 ` [PATCH v21 06/13] clocksource: arm_arch_timer: move arch_timer_needs_of_probing into DT init call fu.wei 2017-02-06 18:50 ` fu.wei at linaro.org 2017-02-06 18:50 ` [PATCH v21 07/13] clocksource: arm_arch_timer: introduce some new structs to prepare for GTDT fu.wei 2017-02-06 18:50 ` fu.wei at linaro.org 2017-02-06 18:50 ` [PATCH v21 08/13] clocksource: arm_arch_timer: refactor MMIO timer probing fu.wei 2017-02-06 18:50 ` fu.wei at linaro.org 2017-02-06 18:50 ` [PATCH v21 09/13] acpi/arm64: Add GTDT table parse driver fu.wei 2017-02-06 18:50 ` fu.wei at linaro.org 2017-02-06 18:50 ` [PATCH v21 10/13] clocksource: arm_arch_timer: simplify ACPI support code fu.wei 2017-02-06 18:50 ` fu.wei at linaro.org 2017-02-06 18:50 ` [PATCH v21 11/13] acpi/arm64: Add memory-mapped timer support in GTDT driver fu.wei 2017-02-06 18:50 ` fu.wei at linaro.org 2017-02-06 18:50 ` fu.wei 2017-03-17 19:40 ` Mark Rutland 2017-03-17 19:40 ` Mark Rutland 2017-03-17 19:40 ` Mark Rutland 2017-03-20 13:38 ` Fu Wei 2017-03-20 13:38 ` Fu Wei 2017-03-20 13:38 ` Fu Wei 2017-02-06 18:50 ` [PATCH v21 12/13] clocksource: arm_arch_timer: add GTDT support for memory-mapped timer fu.wei 2017-02-06 18:50 ` fu.wei at linaro.org 2017-02-06 18:50 ` [PATCH v21 13/13] acpi/arm64: Add SBSA Generic Watchdog support in GTDT driver fu.wei 2017-02-06 18:50 ` fu.wei at linaro.org 2017-02-06 18:50 ` fu.wei 2017-03-17 20:01 ` Mark Rutland 2017-03-17 20:01 ` Mark Rutland 2017-03-17 20:01 ` Mark Rutland 2017-03-17 20:01 ` Mark Rutland 2017-03-20 17:57 ` Fu Wei 2017-03-20 17:57 ` Fu Wei 2017-03-20 17:57 ` Fu Wei 2017-03-20 18:09 ` Mark Rutland 2017-03-20 18:09 ` Mark Rutland 2017-03-20 18:09 ` Mark Rutland 2017-03-20 18:50 ` [Linaro-acpi] " Lurndal, Scott 2017-03-20 18:50 ` Lurndal, Scott 2017-03-20 18:50 ` Lurndal, Scott 2017-03-21 3:48 ` Fu Wei 2017-03-21 3:48 ` Fu Wei 2017-03-21 3:48 ` Fu Wei 2017-03-21 12:48 ` Lurndal, Scott 2017-03-21 12:48 ` Lurndal, Scott 2017-03-21 12:48 ` Lurndal, Scott 2017-03-21 5:12 ` Fu Wei 2017-03-21 5:12 ` Fu Wei 2017-03-21 5:12 ` Fu Wei [not found] ` <20170206185015.12296-1-fu.wei-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2017-02-06 18:50 ` [PATCH v21 02/13] clocksource: arm_arch_timer: separate out device-tree code from arch_timer_detect_rate fu.wei-QSEj5FYQhm4dnm+yROfE0A 2017-02-06 18:50 ` fu.wei at linaro.org 2017-02-06 18:50 ` fu.wei 2017-02-20 16:20 ` [PATCH v21 00/13] acpi, clocksource: add GTDT driver and GTDT support in arm_arch_timer Fu Wei 2017-02-20 16:20 ` Fu Wei 2017-02-20 16:20 ` Fu Wei [not found] ` <CADyBb7t_zrLetPQQ8=k8oN6iMHhuMHO8O3XTZqGYvTT9p0evKw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2017-03-09 22:47 ` Fu Wei 2017-03-09 22:47 ` Fu Wei 2017-03-09 22:47 ` Fu Wei 2017-03-17 20:03 ` Mark Rutland 2017-03-17 20:03 ` Mark Rutland 2017-03-17 20:03 ` Mark Rutland 2017-03-20 5:09 ` Fu Wei 2017-03-20 5:09 ` Fu Wei 2017-03-20 5:09 ` 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=20170206185015.12296-4-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.