From: fu.wei@linaro.org (fu.wei at linaro.org)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v15 05/13] clocksource/drivers/arm_arch_timer: fix a bug in arch_timer_register about arch_timer_uses_ppi
Date: Tue, 15 Nov 2016 21:13:27 +0800 [thread overview]
Message-ID: <1479215615-26950-6-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 fix a potential bug about arch_timer_uses_ppi in
arch_timer_register.
On ARM64, we don't use ARCH_TIMER_PHYS_SECURE_PPI in Linux, so we will
just igorne it in init code. If arch_timer_uses_ppi is
ARCH_TIMER_PHYS_NONSECURE_PPI, the orignal code of
arch_timer_uses_ppi may go wrong.
Signed-off-by: Fu Wei <fu.wei@linaro.org>
---
drivers/clocksource/arm_arch_timer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index dd1040d..6de164f 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -699,7 +699,7 @@ static int __init arch_timer_register(void)
case ARCH_TIMER_PHYS_NONSECURE_PPI:
err = request_percpu_irq(ppi, arch_timer_handler_phys,
"arch_timer", arch_timer_evt);
- if (!err && arch_timer_ppi[ARCH_TIMER_PHYS_NONSECURE_PPI]) {
+ if (!err && arch_timer_has_nonsecure_ppi()) {
ppi = arch_timer_ppi[ARCH_TIMER_PHYS_NONSECURE_PPI];
err = request_percpu_irq(ppi, arch_timer_handler_phys,
"arch_timer", arch_timer_evt);
--
2.7.4
next prev parent reply other threads:[~2016-11-15 13:13 UTC|newest]
Thread overview: 16+ 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 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 at linaro.org
2016-11-15 19:23 ` kbuild test robot
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 at linaro.org
2016-11-15 13:13 ` [PATCH v15 03/13] clocksource/drivers/arm_arch_timer: Improve printk relevant code 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 at linaro.org
2016-11-15 13:13 ` fu.wei at linaro.org [this message]
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 at linaro.org
2016-11-15 13:13 ` [PATCH v15 07/13] clocksource/drivers/arm_arch_timer: Introduce some new structs " 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 at linaro.org
2016-11-15 13:13 ` [PATCH v15 09/13] acpi/arm64: Add GTDT table parse driver fu.wei at linaro.org
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 11/13] acpi/arm64: Add memory-mapped timer support in GTDT driver fu.wei at linaro.org
2016-11-15 13:13 ` [PATCH v15 12/13] clocksource/drivers/arm_arch_timer: Add GTDT support for memory-mapped timer 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 at linaro.org
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-6-git-send-email-fu.wei@linaro.org \
--to=fu.wei@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).