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 v24 02/11] clocksource: arm_arch_timer: refactor arch_timer_needs_probing Date: Sat, 15 Apr 2017 02:40:05 +0800 [thread overview] Message-ID: <20170414184014.8524-3-fu.wei@linaro.org> (raw) In-Reply-To: <20170414184014.8524-1-fu.wei@linaro.org> From: Fu Wei <fu.wei@linaro.org> When booting with DT, it's possible for timer nodes to be probed in any order. Some common initialisation needs to occur after all nodes have been probed, and arch_timer_common_init() has code to detect when this has happened. This logic is DT-specific, and it would be best to factor it out of the common code that will be shared with ACPI. This patch folds this into the existing arch_timer_needs_probing(), which is renamed to arch_timer_needs_of_probing(), and no longer takes any arguments. This is only called when using DT, and not when using ACPI, which will have a deterministic probe order. Signed-off-by: Fu Wei <fu.wei@linaro.org> Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org> [Mark: reword commit message] Signed-off-by: Mark Rutland <mark.rutland@arm.com> --- drivers/clocksource/arm_arch_timer.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 0138b0c..03d71d6 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -1076,15 +1076,28 @@ static const struct of_device_id arch_timer_mem_of_match[] __initconst = { {}, }; -static bool __init -arch_timer_needs_probing(int type, const struct of_device_id *matches) +static bool __init arch_timer_needs_of_probing(void) { struct device_node *dn; bool needs_probing = false; + unsigned int mask = ARCH_TIMER_TYPE_CP15 | ARCH_TIMER_TYPE_MEM; - dn = of_find_matching_node(NULL, matches); - if (dn && of_device_is_available(dn) && !(arch_timers_present & type)) + /* We have two timers, and both device-tree nodes are probed. */ + if ((arch_timers_present & mask) == mask) + return false; + + /* + * Only one type of timer is probed, + * check if we have another type of timer node in device-tree. + */ + if (arch_timers_present & ARCH_TIMER_TYPE_CP15) + dn = of_find_matching_node(NULL, arch_timer_mem_of_match); + else + dn = of_find_matching_node(NULL, arch_timer_of_match); + + if (dn && of_device_is_available(dn)) needs_probing = true; + of_node_put(dn); return needs_probing; @@ -1092,17 +1105,8 @@ arch_timer_needs_probing(int type, const struct of_device_id *matches) static int __init arch_timer_common_init(void) { - unsigned mask = ARCH_TIMER_TYPE_CP15 | ARCH_TIMER_TYPE_MEM; - - /* Wait until both nodes are probed if we have two timers */ - if ((arch_timers_present & mask) != mask) { - if (arch_timer_needs_probing(ARCH_TIMER_TYPE_MEM, - arch_timer_mem_of_match)) - return 0; - if (arch_timer_needs_probing(ARCH_TIMER_TYPE_CP15, - arch_timer_of_match)) - return 0; - } + if (acpi_disabled && arch_timer_needs_of_probing()) + return 0; arch_timer_banner(arch_timers_present); arch_counter_register(arch_timers_present); -- 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 v24 02/11] clocksource: arm_arch_timer: refactor arch_timer_needs_probing Date: Sat, 15 Apr 2017 02:40:05 +0800 [thread overview] Message-ID: <20170414184014.8524-3-fu.wei@linaro.org> (raw) In-Reply-To: <20170414184014.8524-1-fu.wei@linaro.org> From: Fu Wei <fu.wei@linaro.org> When booting with DT, it's possible for timer nodes to be probed in any order. Some common initialisation needs to occur after all nodes have been probed, and arch_timer_common_init() has code to detect when this has happened. This logic is DT-specific, and it would be best to factor it out of the common code that will be shared with ACPI. This patch folds this into the existing arch_timer_needs_probing(), which is renamed to arch_timer_needs_of_probing(), and no longer takes any arguments. This is only called when using DT, and not when using ACPI, which will have a deterministic probe order. Signed-off-by: Fu Wei <fu.wei@linaro.org> Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org> [Mark: reword commit message] Signed-off-by: Mark Rutland <mark.rutland@arm.com> --- drivers/clocksource/arm_arch_timer.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 0138b0c..03d71d6 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -1076,15 +1076,28 @@ static const struct of_device_id arch_timer_mem_of_match[] __initconst = { {}, }; -static bool __init -arch_timer_needs_probing(int type, const struct of_device_id *matches) +static bool __init arch_timer_needs_of_probing(void) { struct device_node *dn; bool needs_probing = false; + unsigned int mask = ARCH_TIMER_TYPE_CP15 | ARCH_TIMER_TYPE_MEM; - dn = of_find_matching_node(NULL, matches); - if (dn && of_device_is_available(dn) && !(arch_timers_present & type)) + /* We have two timers, and both device-tree nodes are probed. */ + if ((arch_timers_present & mask) == mask) + return false; + + /* + * Only one type of timer is probed, + * check if we have another type of timer node in device-tree. + */ + if (arch_timers_present & ARCH_TIMER_TYPE_CP15) + dn = of_find_matching_node(NULL, arch_timer_mem_of_match); + else + dn = of_find_matching_node(NULL, arch_timer_of_match); + + if (dn && of_device_is_available(dn)) needs_probing = true; + of_node_put(dn); return needs_probing; @@ -1092,17 +1105,8 @@ arch_timer_needs_probing(int type, const struct of_device_id *matches) static int __init arch_timer_common_init(void) { - unsigned mask = ARCH_TIMER_TYPE_CP15 | ARCH_TIMER_TYPE_MEM; - - /* Wait until both nodes are probed if we have two timers */ - if ((arch_timers_present & mask) != mask) { - if (arch_timer_needs_probing(ARCH_TIMER_TYPE_MEM, - arch_timer_mem_of_match)) - return 0; - if (arch_timer_needs_probing(ARCH_TIMER_TYPE_CP15, - arch_timer_of_match)) - return 0; - } + if (acpi_disabled && arch_timer_needs_of_probing()) + return 0; arch_timer_banner(arch_timers_present); arch_counter_register(arch_timers_present); -- 2.9.3
next prev parent reply other threads:[~2017-04-14 18:41 UTC|newest] Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-04-14 18:40 [PATCH v24 00/11] acpi, clocksource: add GTDT driver and GTDT support in arm_arch_timer fu.wei 2017-04-14 18:40 ` fu.wei at linaro.org 2017-04-14 18:40 ` [PATCH v24 01/11] clocksource: arm_arch_timer: split dt-only rate handling fu.wei 2017-04-14 18:40 ` fu.wei at linaro.org 2017-04-14 18:40 ` fu.wei [this message] 2017-04-14 18:40 ` [PATCH v24 02/11] clocksource: arm_arch_timer: refactor arch_timer_needs_probing fu.wei at linaro.org 2017-04-14 18:40 ` [PATCH v24 03/11] clocksource: arm_arch_timer: move arch_timer_needs_of_probing into DT init call fu.wei 2017-04-14 18:40 ` fu.wei at linaro.org 2017-04-14 18:40 ` [PATCH v24 04/11] clocksource: arm_arch_timer: add structs to describe MMIO timer fu.wei 2017-04-14 18:40 ` fu.wei at linaro.org [not found] ` <20170414184014.8524-1-fu.wei-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2017-04-14 18:40 ` [PATCH v24 05/11] clocksource: arm_arch_timer: split MMIO timer probing fu.wei-QSEj5FYQhm4dnm+yROfE0A 2017-04-14 18:40 ` fu.wei at linaro.org 2017-04-14 18:40 ` fu.wei 2017-04-14 18:40 ` [PATCH v24 06/11] acpi/arm64: Add GTDT table parse driver fu.wei-QSEj5FYQhm4dnm+yROfE0A 2017-04-14 18:40 ` fu.wei at linaro.org 2017-04-14 18:40 ` fu.wei 2017-04-14 18:40 ` [PATCH v24 07/11] clocksource: arm_arch_timer: simplify ACPI support code fu.wei 2017-04-14 18:40 ` fu.wei at linaro.org 2017-04-14 18:40 ` [PATCH v24 08/11] acpi: Introduce acpi_unregister_irq function fu.wei 2017-04-14 18:40 ` fu.wei at linaro.org 2017-04-18 15:58 ` Mark Rutland 2017-04-18 15:58 ` Mark Rutland 2017-04-19 15:09 ` Mark Rutland 2017-04-19 15:09 ` Mark Rutland 2017-04-14 18:40 ` [PATCH v24 09/11] acpi/arm64: Add memory-mapped timer support in GTDT driver fu.wei 2017-04-14 18:40 ` fu.wei at linaro.org 2017-04-18 17:21 ` Lorenzo Pieralisi 2017-04-18 17:21 ` Lorenzo Pieralisi 2017-04-19 15:07 ` Mark Rutland 2017-04-19 15:07 ` Mark Rutland 2017-04-19 15:45 ` Mark Rutland 2017-04-19 15:45 ` Mark Rutland 2017-04-19 15:45 ` Mark Rutland 2017-04-19 15:56 ` Lorenzo Pieralisi 2017-04-19 15:56 ` Lorenzo Pieralisi 2017-04-19 15:56 ` Lorenzo Pieralisi 2017-04-14 18:40 ` [PATCH v24 10/11] clocksource: arm_arch_timer: add GTDT support for memory-mapped timer fu.wei 2017-04-14 18:40 ` fu.wei at linaro.org 2017-04-14 18:40 ` [PATCH v24 11/11] acpi/arm64: Add SBSA Generic Watchdog support in GTDT driver fu.wei 2017-04-14 18:40 ` fu.wei at linaro.org 2017-04-14 18:40 ` 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=20170414184014.8524-3-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.