linux-acpi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: fu.wei@linaro.org
To: rjw@rjwysocki.net, lenb@kernel.org, daniel.lezcano@linaro.org,
	tglx@linutronix.de, christoffer.dall@linaro.org,
	marc.zyngier@arm.com, gleb@kernel.org, pbonzini@redhat.com,
	hanjun.guo@linaro.org, wei@redhat.com,
	a.spyridakis@virtualopensystems.com
Cc: linaro-acpi@lists.linaro.org, linux-kernel@vger.kernel.org,
	linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org,
	al.stone@linaro.org, graeme.gregory@linaro.org,
	davem@davemloft.net, jeffrey.t.kirsher@intel.com,
	richardcochran@gmail.com, arnd@arndb.de, wim@iguana.be,
	jcm@redhat.com, leo.duran@amd.com, mark.rutland@arm.com,
	catalin.marinas@arm.com, will.deacon@arm.com,
	Suravee.Suthikulpanit@amd.com, robherring2@gmail.com,
	Fu Wei <fu.wei@linaro.org>
Subject: [PATCH v3 6/6] kvm: arm64: Add ACPI support for virt arch timer
Date: Tue,  2 Feb 2016 04:26:58 +0800	[thread overview]
Message-ID: <1454358418-5157-7-git-send-email-fu.wei@linaro.org> (raw)
In-Reply-To: <1454358418-5157-1-git-send-email-fu.wei@linaro.org>

From: Fu Wei <fu.wei@linaro.org>

This patch adds ACPI/GTDT support for virt arch timer
using the API in GTDT driver.

Signed-off-by: Fu Wei <fu.wei@linaro.org>
---
 virt/kvm/arm/arch_timer.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
index 0a279d3..4077347 100644
--- a/virt/kvm/arm/arch_timer.c
+++ b/virt/kvm/arm/arch_timer.c
@@ -385,6 +385,9 @@ static int kvm_timer_get_ppi(unsigned int *ppi)
 {
 	struct device_node *np;
 	int ret = -EINVAL;
+#ifdef CONFIG_ACPI_GTDT
+	struct arch_timer_data data;
+#endif
 
 	np = of_find_matching_node(NULL, arch_timer_of_match);
 	if (!np) {
@@ -397,6 +400,11 @@ static int kvm_timer_get_ppi(unsigned int *ppi)
 	of_node_put(np);
 
 skip_of:
+#ifdef CONFIG_ACPI_GTDT
+	if (!*ppi && !gtdt_arch_timer_data_init(NULL, &data))
+		*ppi = data.virt_ppi;
+#endif
+
 	if (*ppi)
 		return 0;
 
-- 
2.5.0

  parent reply	other threads:[~2016-02-01 20:26 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-01 20:26 [PATCH v3 0/6] acpi, clocksource, kvm: add GTDT and ARM memory-mapped timer support fu.wei
2016-02-01 20:26 ` [PATCH v3 1/6] ACPI: add GTDT table parse driver into ACPI driver fu.wei
2016-02-01 20:26 ` [PATCH v3 2/6] clocksource: simplify ACPI code in arm_arch_timer.c fu.wei
2016-02-01 20:26 ` [PATCH v3 3/6] clocksource: add memory-mapped timer support " fu.wei
2016-02-01 20:26 ` [PATCH v3 4/6] clocksource: move some enums to arm_arch_timer.h fu.wei
2016-02-01 20:26 ` [PATCH v3 5/6] kvm: arm64: wrapping DT support for virt arch timer fu.wei
2016-02-01 20:26 ` fu.wei [this message]
2016-02-07 13:30   ` [PATCH v3 6/6] kvm: arm64: Add ACPI " kbuild test robot
2016-02-08 17:10   ` Marc Zyngier
2016-02-21 16:35     ` 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=1454358418-5157-7-git-send-email-fu.wei@linaro.org \
    --to=fu.wei@linaro.org \
    --cc=Suravee.Suthikulpanit@amd.com \
    --cc=a.spyridakis@virtualopensystems.com \
    --cc=al.stone@linaro.org \
    --cc=arnd@arndb.de \
    --cc=catalin.marinas@arm.com \
    --cc=christoffer.dall@linaro.org \
    --cc=daniel.lezcano@linaro.org \
    --cc=davem@davemloft.net \
    --cc=gleb@kernel.org \
    --cc=graeme.gregory@linaro.org \
    --cc=hanjun.guo@linaro.org \
    --cc=jcm@redhat.com \
    --cc=jeffrey.t.kirsher@intel.com \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.cs.columbia.edu \
    --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=marc.zyngier@arm.com \
    --cc=mark.rutland@arm.com \
    --cc=pbonzini@redhat.com \
    --cc=richardcochran@gmail.com \
    --cc=rjw@rjwysocki.net \
    --cc=robherring2@gmail.com \
    --cc=tglx@linutronix.de \
    --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: 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).