[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20200817084110.2672-5-zhukeqian1@huawei.com>
Date: Mon, 17 Aug 2020 16:41:09 +0800
From: Keqian Zhu <zhukeqian1@...wei.com>
To: <linux-kernel@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>,
<kvmarm@...ts.cs.columbia.edu>, <kvm@...r.kernel.org>
CC: Marc Zyngier <maz@...nel.org>, Steven Price <steven.price@....com>,
Catalin Marinas <catalin.marinas@....com>,
Will Deacon <will@...nel.org>,
James Morse <james.morse@....com>,
Suzuki K Poulose <suzuki.poulose@....com>,
<wanghaibin.wang@...wei.com>, Keqian Zhu <zhukeqian1@...wei.com>
Subject: [RFC PATCH 4/5] clocksource: arm_arch_timer: Add pvtime LPT initialization
Enable paravirtualized time to be used in a KVM guest if the host
supports it. This allows the guest to derive a counter which is clocked
at a persistent rate even when the guest is migrated.
If we discover that the system supports SMCCC v1.1 then we probe to
determine whether the hypervisor supports paravirtualized features and
finally whether it supports "Live Physical Time" reporting. If so a
shared structure is made available to the guest containing coefficients
to calculate the derived clock.
Signed-off-by: Steven Price <steven.price@....com>
Signed-off-by: Keqian Zhu <zhukeqian1@...wei.com>
---
drivers/clocksource/arm_arch_timer.c | 69 ++++++++++++++++++++++++++++++++++++
1 file changed, 69 insertions(+)
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 6c3e841..eb2e57a 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -26,6 +26,7 @@
#include <linux/acpi.h>
#include <asm/arch_timer.h>
+#include <asm/pvclock-abi.h>
#include <asm/virt.h>
#include <clocksource/arm_arch_timer.h>
@@ -84,6 +85,66 @@ static int __init early_evtstrm_cfg(char *buf)
}
early_param("clocksource.arm_arch_timer.evtstrm", early_evtstrm_cfg);
+/* PV-time LPT */
+#ifdef CONFIG_ARM64
+struct pvclock_vm_lpt_time *lpt_info;
+EXPORT_SYMBOL_GPL(lpt_info);
+DEFINE_STATIC_KEY_FALSE(pvclock_lpt_key_enabled);
+EXPORT_SYMBOL_GPL(pvclock_lpt_key_enabled);
+
+static bool has_pv_lpt_clock(void)
+{
+ struct arm_smccc_res res;
+
+ if (arm_smccc_1_1_get_conduit() == SMCCC_CONDUIT_NONE)
+ return false;
+
+ arm_smccc_1_1_invoke(ARM_SMCCC_ARCH_FEATURES_FUNC_ID,
+ ARM_SMCCC_HV_PV_TIME_FEATURES, &res);
+ if (res.a0 != SMCCC_RET_SUCCESS)
+ return false;
+
+ arm_smccc_1_1_invoke(ARM_SMCCC_HV_PV_TIME_FEATURES,
+ ARM_SMCCC_HV_PV_TIME_LPT, &res);
+ return res.a0 == SMCCC_RET_SUCCESS;
+}
+
+static int pvclock_lpt_init(void)
+{
+ struct arm_smccc_res res;
+
+ if (!has_pv_lpt_clock())
+ return 0;
+
+ arm_smccc_1_1_invoke(ARM_SMCCC_HV_PV_TIME_LPT, 0, &res);
+ if (res.a0 == SMCCC_RET_NOT_SUPPORTED)
+ return 0;
+
+ lpt_info = memremap(res.a0, sizeof(*lpt_info), MEMREMAP_WB);
+ if (!lpt_info) {
+ pr_warn("Failed to map pvclock LPT data structure\n");
+ return -EFAULT;
+ }
+
+ if (le32_to_cpu(lpt_info->revision) != 0 ||
+ le32_to_cpu(lpt_info->attributes) != 0) {
+ pr_warn_once("Unexpected revision or attributes "
+ "in pvclock LPT data structure\n");
+ return -EFAULT;
+ }
+
+ static_branch_enable(&pvclock_lpt_key_enabled);
+ pr_info("Using pvclock LPT\n");
+ return 0;
+}
+#else /* CONFIG_ARM64 */
+static int pvclock_lpt_init(void)
+{
+ return 0;
+}
+#endif /* CONFIG_ARM64 */
+
+
/*
* Architected system timer support.
*/
@@ -1285,6 +1346,10 @@ static int __init arch_timer_of_init(struct device_node *np)
arch_timer_populate_kvm_info();
+ ret = pvclock_lpt_init();
+ if (ret)
+ return ret;
+
rate = arch_timer_get_cntfrq();
arch_timer_of_configure_rate(rate, np);
@@ -1613,6 +1678,10 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table)
arch_timer_populate_kvm_info();
+ ret = pvclock_lpt_init();
+ if (ret)
+ return ret;
+
/*
* When probing via ACPI, we have no mechanism to override the sysreg
* CNTFRQ value. This *must* be correct.
--
1.8.3.1
Powered by blists - more mailing lists