[PATCH v3 6/6] kvm: arm64: Add ACPI support for virt arch timer

From	fu.wei@linaro.org
Newsgroups	linux.kernel
Subject	[PATCH v3 6/6] kvm: arm64: Add ACPI support for virt arch timer
Date	2016-02-01 21:30 +0100
Message-ID	<qXtgL-8eB-19@gated-at.bofh.it> (permalink)
References	<qXtgK-8eB-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 6/6] kvm: arm64: Add ACPI support for virt arch timer fu.wei@linaro.org - 2016-02-01 21:30 +0100
  Re: [PATCH v3 6/6] kvm: arm64: Add ACPI support for virt arch timer Marc Zyngier <marc.zyngier@arm.com> - 2016-02-08 18:20 +0100

csiph-web