From: Mark Rutland <mark.rutland@arm.com> To: fu.wei@linaro.org Cc: rjw@rjwysocki.net, lenb@kernel.org, daniel.lezcano@linaro.org, tglx@linutronix.de, marc.zyngier@arm.com, lorenzo.pieralisi@arm.com, sudeep.holla@arm.com, hanjun.guo@linaro.org, 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 Subject: Re: [PATCH v19 05/15] clocksource/drivers/arm_arch_timer: rework PPI determination Date: Mon, 16 Jan 2017 17:29:28 +0000 [thread overview] Message-ID: <20170116172927.GI5908@leverpostej> (raw) In-Reply-To: <20161221064603.11830-6-fu.wei@linaro.org> On Wed, Dec 21, 2016 at 02:45:53PM +0800, fu.wei@linaro.org wrote: [...] > - if (is_hyp_mode_available() || !arch_timer_ppi[ARCH_TIMER_VIRT_PPI]) { > - bool has_ppi; > + if (is_hyp_mode_available() && is_kernel_in_hyp_mode()) > + return ARCH_TIMER_HYP_PPI; > > - if (is_kernel_in_hyp_mode()) { > - arch_timer_uses_ppi = ARCH_TIMER_HYP_PPI; > - has_ppi = !!arch_timer_ppi[ARCH_TIMER_HYP_PPI]; > - } else { > - arch_timer_uses_ppi = ARCH_TIMER_PHYS_SECURE_PPI; > - has_ppi = (!!arch_timer_ppi[ARCH_TIMER_PHYS_SECURE_PPI] || > - !!arch_timer_ppi[ARCH_TIMER_PHYS_NONSECURE_PPI]); > - } > + if (arch_timer_ppi[ARCH_TIMER_VIRT_PPI]) > + return ARCH_TIMER_VIRT_PPI; > > - if (!has_ppi) { > - pr_warn("No interrupt available, giving up\n"); > - return -EINVAL; > - } > - } > + if (IS_ENABLED(CONFIG_ARM64)) > + return ARCH_TIMER_PHYS_NONSECURE_PPI; > + > + return ARCH_TIMER_PHYS_SECURE_PPI; For a 32-bit platform booted at hyp (with a virt PPI available), the new logic will select ARCH_TIMER_VIRT_PPI. I beleive that will break KVM. I think the logic should be: if (is_kernel_in_hyp_mode()) return ARCH_TIMER_HYP_PPI; if (!is_hyp_mode_available() && arch_timer_ppi[ARCH_TIMER_VIRT_PPI]) return ARCH_TIMER_VIRT_PPI; if (IS_ENABLED(CONFIG_ARM64)) return ARCH_TIMER_PHYS_NONSECURE_PPI; return ARCH_TIMER_PHYS_SECURE_PPI; Please use that instead (keeping the comment you retained). > +static int __init arch_timer_init(void) > +{ > + int ret; > > ret = arch_timer_register(); > if (ret) > @@ -904,6 +906,13 @@ static int __init arch_timer_of_init(struct device_node *np) > if (IS_ENABLED(CONFIG_ARM) && > of_property_read_bool(np, "arm,cpu-registers-not-fw-configured")) > arch_timer_uses_ppi = ARCH_TIMER_PHYS_SECURE_PPI; > + else > + arch_timer_uses_ppi = arch_timer_select_ppi(); > + > + if (!arch_timer_ppi[arch_timer_uses_ppi]) { > + pr_err("No interrupt available, giving up\n"); > + return -EINVAL; > + } > > /* On some systems, the counter stops ticking when in suspend. */ > arch_counter_suspend_stop = of_property_read_bool(np, > @@ -1049,6 +1058,12 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table) > /* Get the frequency from CNTFRQ */ > arch_timer_detect_rate(NULL, NULL); > > + arch_timer_uses_ppi = arch_timer_select_ppi(); > + if (!arch_timer_ppi[arch_timer_uses_ppi]) { > + pr_err("No interrupt available, giving up\n"); > + return -EINVAL; > + } I see that we have to duplicate this so we can special-case the DT-specific behaviour, so that's fine by me. If you can fix the arch_timer_select_ppi() logic as above, this should be fine. Thanks, Mark.
WARNING: multiple messages have this Message-ID (diff)
From: mark.rutland@arm.com (Mark Rutland) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v19 05/15] clocksource/drivers/arm_arch_timer: rework PPI determination Date: Mon, 16 Jan 2017 17:29:28 +0000 [thread overview] Message-ID: <20170116172927.GI5908@leverpostej> (raw) In-Reply-To: <20161221064603.11830-6-fu.wei@linaro.org> On Wed, Dec 21, 2016 at 02:45:53PM +0800, fu.wei at linaro.org wrote: [...] > - if (is_hyp_mode_available() || !arch_timer_ppi[ARCH_TIMER_VIRT_PPI]) { > - bool has_ppi; > + if (is_hyp_mode_available() && is_kernel_in_hyp_mode()) > + return ARCH_TIMER_HYP_PPI; > > - if (is_kernel_in_hyp_mode()) { > - arch_timer_uses_ppi = ARCH_TIMER_HYP_PPI; > - has_ppi = !!arch_timer_ppi[ARCH_TIMER_HYP_PPI]; > - } else { > - arch_timer_uses_ppi = ARCH_TIMER_PHYS_SECURE_PPI; > - has_ppi = (!!arch_timer_ppi[ARCH_TIMER_PHYS_SECURE_PPI] || > - !!arch_timer_ppi[ARCH_TIMER_PHYS_NONSECURE_PPI]); > - } > + if (arch_timer_ppi[ARCH_TIMER_VIRT_PPI]) > + return ARCH_TIMER_VIRT_PPI; > > - if (!has_ppi) { > - pr_warn("No interrupt available, giving up\n"); > - return -EINVAL; > - } > - } > + if (IS_ENABLED(CONFIG_ARM64)) > + return ARCH_TIMER_PHYS_NONSECURE_PPI; > + > + return ARCH_TIMER_PHYS_SECURE_PPI; For a 32-bit platform booted at hyp (with a virt PPI available), the new logic will select ARCH_TIMER_VIRT_PPI. I beleive that will break KVM. I think the logic should be: if (is_kernel_in_hyp_mode()) return ARCH_TIMER_HYP_PPI; if (!is_hyp_mode_available() && arch_timer_ppi[ARCH_TIMER_VIRT_PPI]) return ARCH_TIMER_VIRT_PPI; if (IS_ENABLED(CONFIG_ARM64)) return ARCH_TIMER_PHYS_NONSECURE_PPI; return ARCH_TIMER_PHYS_SECURE_PPI; Please use that instead (keeping the comment you retained). > +static int __init arch_timer_init(void) > +{ > + int ret; > > ret = arch_timer_register(); > if (ret) > @@ -904,6 +906,13 @@ static int __init arch_timer_of_init(struct device_node *np) > if (IS_ENABLED(CONFIG_ARM) && > of_property_read_bool(np, "arm,cpu-registers-not-fw-configured")) > arch_timer_uses_ppi = ARCH_TIMER_PHYS_SECURE_PPI; > + else > + arch_timer_uses_ppi = arch_timer_select_ppi(); > + > + if (!arch_timer_ppi[arch_timer_uses_ppi]) { > + pr_err("No interrupt available, giving up\n"); > + return -EINVAL; > + } > > /* On some systems, the counter stops ticking when in suspend. */ > arch_counter_suspend_stop = of_property_read_bool(np, > @@ -1049,6 +1058,12 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table) > /* Get the frequency from CNTFRQ */ > arch_timer_detect_rate(NULL, NULL); > > + arch_timer_uses_ppi = arch_timer_select_ppi(); > + if (!arch_timer_ppi[arch_timer_uses_ppi]) { > + pr_err("No interrupt available, giving up\n"); > + return -EINVAL; > + } I see that we have to duplicate this so we can special-case the DT-specific behaviour, so that's fine by me. If you can fix the arch_timer_select_ppi() logic as above, this should be fine. Thanks, Mark.
next prev parent reply other threads:[~2017-01-16 17:29 UTC|newest] Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-12-21 6:45 [PATCH v19 00/15] acpi, clocksource: add GTDT driver and GTDT support in arm_arch_timer fu.wei 2016-12-21 6:45 ` fu.wei at linaro.org 2016-12-21 6:45 ` [PATCH v19 01/15] clocksource/drivers/arm_arch_timer: Move enums and defines to header file fu.wei 2016-12-21 6:45 ` fu.wei at linaro.org 2016-12-21 6:45 ` [PATCH v19 02/15] clocksource/drivers/arm_arch_timer: Add a new enum for spi type fu.wei 2016-12-21 6:45 ` fu.wei at linaro.org 2016-12-21 6:45 ` [PATCH v19 04/15] clocksource/drivers/arm_arch_timer: rename some enums and defines fu.wei 2016-12-21 6:45 ` fu.wei at linaro.org 2016-12-21 6:45 ` [PATCH v19 05/15] clocksource/drivers/arm_arch_timer: rework PPI determination fu.wei 2016-12-21 6:45 ` fu.wei at linaro.org 2017-01-16 17:29 ` Mark Rutland [this message] 2017-01-16 17:29 ` Mark Rutland 2017-01-17 23:49 ` Fu Wei 2017-01-17 23:49 ` Fu Wei 2017-01-17 23:49 ` Fu Wei 2016-12-21 6:45 ` [PATCH v19 09/15] clocksource/drivers/arm_arch_timer: Introduce some new structs to prepare for GTDT fu.wei 2016-12-21 6:45 ` fu.wei at linaro.org 2016-12-21 6:45 ` [PATCH v19 10/15] clocksource/drivers/arm_arch_timer: Refactor the timer init code " fu.wei 2016-12-21 6:45 ` fu.wei at linaro.org [not found] ` <20161221064603.11830-11-fu.wei-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2017-01-16 18:30 ` Mark Rutland 2017-01-16 18:30 ` Mark Rutland 2017-01-16 18:30 ` Mark Rutland 2017-01-17 10:30 ` Fu Wei 2017-01-17 10:30 ` Fu Wei 2017-01-17 10:30 ` Fu Wei [not found] ` <CADyBb7tFaSshUmZsJbNO2tnbqAKEii39NQVfcx5CqDiDsK5OJA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2017-01-17 10:39 ` Fu Wei 2017-01-17 10:39 ` Fu Wei 2017-01-17 10:39 ` Fu Wei 2017-01-17 12:18 ` Timur Tabi 2017-01-17 12:18 ` Timur Tabi 2017-01-17 12:18 ` Timur Tabi 2017-01-17 12:29 ` Mark Rutland 2017-01-17 12:29 ` Mark Rutland 2017-01-17 12:29 ` Mark Rutland 2017-01-17 13:22 ` Fu Wei 2017-01-17 13:22 ` Fu Wei 2017-01-17 13:22 ` Fu Wei 2016-12-21 6:45 ` [PATCH v19 11/15] acpi/arm64: Add GTDT table parse driver fu.wei 2016-12-21 6:45 ` fu.wei at linaro.org 2016-12-21 6:46 ` [PATCH v19 12/15] clocksource/drivers/arm_arch_timer: Simplify ACPI support code fu.wei 2016-12-21 6:46 ` fu.wei at linaro.org 2016-12-21 6:46 ` [PATCH v19 13/15] acpi/arm64: Add memory-mapped timer support in GTDT driver fu.wei 2016-12-21 6:46 ` fu.wei at linaro.org 2016-12-21 6:46 ` fu.wei 2016-12-21 6:46 ` [PATCH v19 14/15] clocksource/drivers/arm_arch_timer: Add GTDT support for memory-mapped timer fu.wei 2016-12-21 6:46 ` fu.wei at linaro.org 2016-12-21 6:46 ` [PATCH v19 15/15] acpi/arm64: Add SBSA Generic Watchdog support in GTDT driver fu.wei 2016-12-21 6:46 ` fu.wei at linaro.org 2016-12-21 6:46 ` fu.wei [not found] ` <20161221064603.11830-1-fu.wei-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2016-12-21 6:45 ` [PATCH v19 03/15] clocksource/drivers/arm_arch_timer: Improve printk relevant code fu.wei-QSEj5FYQhm4dnm+yROfE0A 2016-12-21 6:45 ` fu.wei at linaro.org 2016-12-21 6:45 ` fu.wei 2016-12-21 6:45 ` [PATCH v19 06/15] clocksource/drivers/arm_arch_timer: Rework counter frequency detection fu.wei-QSEj5FYQhm4dnm+yROfE0A 2016-12-21 6:45 ` fu.wei at linaro.org 2016-12-21 6:45 ` fu.wei 2017-01-16 17:50 ` Mark Rutland 2017-01-16 17:50 ` Mark Rutland 2017-01-18 4:27 ` Fu Wei 2017-01-18 4:27 ` Fu Wei 2017-01-18 4:27 ` Fu Wei 2016-12-21 6:45 ` [PATCH v19 07/15] clocksource/drivers/arm_arch_timer: Refactor arch_timer_needs_probing fu.wei-QSEj5FYQhm4dnm+yROfE0A 2016-12-21 6:45 ` fu.wei at linaro.org 2016-12-21 6:45 ` fu.wei 2016-12-21 6:45 ` [PATCH v19 08/15] clocksource/drivers/arm_arch_timer: move arch_timer_needs_of_probing into DT init call fu.wei-QSEj5FYQhm4dnm+yROfE0A 2016-12-21 6:45 ` fu.wei at linaro.org 2016-12-21 6:45 ` fu.wei 2017-01-16 6:26 ` [PATCH v19 00/15] acpi, clocksource: add GTDT driver and GTDT support in arm_arch_timer Fu Wei 2017-01-16 6:26 ` Fu Wei 2017-01-16 6:26 ` Fu Wei 2017-01-16 12:01 ` Mark Rutland 2017-01-16 12:01 ` Mark Rutland 2017-01-16 12:01 ` Mark Rutland 2017-01-16 12:04 ` Fu Wei 2017-01-16 12:04 ` Fu Wei 2017-01-16 12:04 ` Fu Wei 2017-01-16 17:00 ` Mark Rutland 2017-01-16 17:00 ` Mark Rutland 2017-01-16 17:00 ` Mark Rutland 2017-01-17 9:14 ` Fu Wei 2017-01-17 9:14 ` Fu Wei 2017-01-17 9:14 ` 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=20170116172927.GI5908@leverpostej \ --to=mark.rutland@arm.com \ --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=fu.wei@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=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.