From: Alexandru Elisei <alexandru.elisei@arm.com>
To: Marc Zyngier <maz@kernel.org>,
linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org,
kvmarm@lists.cs.columbia.edu
Cc: James Morse <james.morse@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Eric Auger <eric.auger@redhat.com>,
Hector Martin <marcan@marcan.st>,
Mark Rutland <mark.rutland@arm.com>,
Zenghui Yu <yuzenghui@huawei.com>,
kernel-team@android.com
Subject: Re: [PATCH v4 7/9] KVM: arm64: timer: Refactor IRQ configuration
Date: Mon, 21 Jun 2021 17:19:38 +0100 [thread overview]
Message-ID: <92a66e4a-a9bf-1568-5af8-7b2ecbb77661@arm.com> (raw)
In-Reply-To: <20210601104005.81332-8-maz@kernel.org>
Hi Marc,
On 6/1/21 11:40 AM, Marc Zyngier wrote:
> As we are about to add some more things to the timer IRQ
> configuration, move this code out of the main timer init code
> into its own set of functions.
>
> No functional changes.
That looks to be the case for me:
Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com>
Thanks,
Alex
>
> Signed-off-by: Marc Zyngier <maz@kernel.org>
> ---
> arch/arm64/kvm/arch_timer.c | 57 +++++++++++++++++++++----------------
> 1 file changed, 33 insertions(+), 24 deletions(-)
>
> diff --git a/arch/arm64/kvm/arch_timer.c b/arch/arm64/kvm/arch_timer.c
> index e2288b6bf435..3cd170388d88 100644
> --- a/arch/arm64/kvm/arch_timer.c
> +++ b/arch/arm64/kvm/arch_timer.c
> @@ -973,6 +973,35 @@ static int kvm_timer_dying_cpu(unsigned int cpu)
> return 0;
> }
>
> +static void kvm_irq_fixup_flags(unsigned int virq, u32 *flags)
> +{
> + *flags = irq_get_trigger_type(virq);
> + if (*flags != IRQF_TRIGGER_HIGH && *flags != IRQF_TRIGGER_LOW) {
> + kvm_err("Invalid trigger for timer IRQ%d, assuming level low\n",
> + virq);
> + *flags = IRQF_TRIGGER_LOW;
> + }
> +}
> +
> +static int kvm_irq_init(struct arch_timer_kvm_info *info)
> +{
> + if (info->virtual_irq <= 0) {
> + kvm_err("kvm_arch_timer: invalid virtual timer IRQ: %d\n",
> + info->virtual_irq);
> + return -ENODEV;
> + }
> +
> + host_vtimer_irq = info->virtual_irq;
> + kvm_irq_fixup_flags(host_vtimer_irq, &host_vtimer_irq_flags);
> +
> + if (info->physical_irq > 0) {
> + host_ptimer_irq = info->physical_irq;
> + kvm_irq_fixup_flags(host_ptimer_irq, &host_ptimer_irq_flags);
> + }
> +
> + return 0;
> +}
> +
> int kvm_timer_hyp_init(bool has_gic)
> {
> struct arch_timer_kvm_info *info;
> @@ -986,22 +1015,11 @@ int kvm_timer_hyp_init(bool has_gic)
> return -ENODEV;
> }
>
> - /* First, do the virtual EL1 timer irq */
> -
> - if (info->virtual_irq <= 0) {
> - kvm_err("kvm_arch_timer: invalid virtual timer IRQ: %d\n",
> - info->virtual_irq);
> - return -ENODEV;
> - }
> - host_vtimer_irq = info->virtual_irq;
> + err = kvm_irq_init(info);
> + if (err)
> + return err;
>
> - host_vtimer_irq_flags = irq_get_trigger_type(host_vtimer_irq);
> - if (host_vtimer_irq_flags != IRQF_TRIGGER_HIGH &&
> - host_vtimer_irq_flags != IRQF_TRIGGER_LOW) {
> - kvm_err("Invalid trigger for vtimer IRQ%d, assuming level low\n",
> - host_vtimer_irq);
> - host_vtimer_irq_flags = IRQF_TRIGGER_LOW;
> - }
> + /* First, do the virtual EL1 timer irq */
>
> err = request_percpu_irq(host_vtimer_irq, kvm_arch_timer_handler,
> "kvm guest vtimer", kvm_get_running_vcpus());
> @@ -1027,15 +1045,6 @@ int kvm_timer_hyp_init(bool has_gic)
> /* Now let's do the physical EL1 timer irq */
>
> if (info->physical_irq > 0) {
> - host_ptimer_irq = info->physical_irq;
> - host_ptimer_irq_flags = irq_get_trigger_type(host_ptimer_irq);
> - if (host_ptimer_irq_flags != IRQF_TRIGGER_HIGH &&
> - host_ptimer_irq_flags != IRQF_TRIGGER_LOW) {
> - kvm_err("Invalid trigger for ptimer IRQ%d, assuming level low\n",
> - host_ptimer_irq);
> - host_ptimer_irq_flags = IRQF_TRIGGER_LOW;
> - }
> -
> err = request_percpu_irq(host_ptimer_irq, kvm_arch_timer_handler,
> "kvm guest ptimer", kvm_get_running_vcpus());
> if (err) {
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-06-21 16:20 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-01 10:39 [PATCH v4 0/9] KVM: arm64: Initial host support for the Apple M1 Marc Zyngier
2021-06-01 10:39 ` [PATCH v4 1/9] irqchip/gic: Split vGIC probing information from the GIC code Marc Zyngier
2021-06-01 10:39 ` [PATCH v4 2/9] KVM: arm64: Handle physical FIQ as an IRQ while running a guest Marc Zyngier
2021-06-01 10:39 ` [PATCH v4 3/9] KVM: arm64: vgic: Be tolerant to the lack of maintenance interrupt masking Marc Zyngier
2021-06-11 16:38 ` Alexandru Elisei
2021-06-11 16:59 ` Alexandru Elisei
2021-06-01 10:40 ` [PATCH v4 4/9] KVM: arm64: vgic: Let an interrupt controller advertise lack of HW deactivation Marc Zyngier
2021-06-15 14:26 ` Alexandru Elisei
2021-06-22 16:19 ` Marc Zyngier
2021-06-01 10:40 ` [PATCH v4 5/9] KVM: arm64: vgic: move irq->get_input_level into an ops structure Marc Zyngier
2021-06-15 14:45 ` Alexandru Elisei
2021-06-22 15:55 ` Marc Zyngier
2021-06-01 10:40 ` [PATCH v4 6/9] KVM: arm64: vgic: Implement SW-driven deactivation Marc Zyngier
2021-06-17 14:58 ` Alexandru Elisei
2021-06-22 16:12 ` Marc Zyngier
2021-06-23 14:15 ` Alexandru Elisei
2021-06-01 10:40 ` [PATCH v4 7/9] KVM: arm64: timer: Refactor IRQ configuration Marc Zyngier
2021-06-21 16:19 ` Alexandru Elisei [this message]
2021-06-01 10:40 ` [PATCH v4 8/9] KVM: arm64: timer: Add support for SW-based deactivation Marc Zyngier
2021-06-01 10:40 ` [PATCH v4 9/9] irqchip/apple-aic: Advertise some level of vGICv3 compatibility Marc Zyngier
2021-06-22 15:39 ` [PATCH v4 0/9] KVM: arm64: Initial host support for the Apple M1 Alexandru Elisei
2021-06-22 15:51 ` Marc Zyngier
2021-06-22 16:03 ` Alexandru Elisei
2021-06-22 16:26 ` Marc Zyngier
2021-06-23 16:18 ` Alexandru Elisei
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=92a66e4a-a9bf-1568-5af8-7b2ecbb77661@arm.com \
--to=alexandru.elisei@arm.com \
--cc=eric.auger@redhat.com \
--cc=james.morse@arm.com \
--cc=kernel-team@android.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=marcan@marcan.st \
--cc=mark.rutland@arm.com \
--cc=maz@kernel.org \
--cc=suzuki.poulose@arm.com \
--cc=yuzenghui@huawei.com \
/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).