diff options
| author |   Marc Zyngier <maz@kernel.org> | 2021-04-20 17:22:10 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-04-20 17:22:10 +0100 |
| commit | 4085ae809334f036ec01790d1bac41a8ec3116da (patch) | |
| tree | 45e8d4a4ac5b722ca5ae44acfb34657c5b0f3ebd | |
| parent | Merge branch 'kvm-arm64/nvhe-panic-info' into kvmarm-master/next (diff) | |
| parent | KVM: arm64: Fix Function ID typo for PTP_KVM service (diff) | |
| download | linux-dev-4085ae809334f036ec01790d1bac41a8ec3116da.tar.xz linux-dev-4085ae809334f036ec01790d1bac41a8ec3116da.zip | |
Merge branch 'kvm-arm64/ptp' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
| -rw-r--r-- | Documentation/virt/kvm/arm/ptp_kvm.rst | 4 | ||||
| -rw-r--r-- | drivers/ptp/ptp_kvm_common.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/virt/kvm/arm/ptp_kvm.rst b/Documentation/virt/kvm/arm/ptp_kvm.rst index 5d2bc4558b9d..aecdc80ddcd8 100644 --- a/Documentation/virt/kvm/arm/ptp_kvm.rst +++ b/Documentation/virt/kvm/arm/ptp_kvm.rst @@ -7,11 +7,11 @@ PTP_KVM is used for high precision time sync between host and guests. It relies on transferring the wall clock and counter value from the host to the guest using a KVM-specific hypercall. -* ARM_SMCCC_HYP_KVM_PTP_FUNC_ID: 0x86000001 +* ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID: 0x86000001 This hypercall uses the SMC32/HVC32 calling convention: -ARM_SMCCC_HYP_KVM_PTP_FUNC_ID +ARM_SMCCC_VENDOR_HYP_KVM_PTP_FUNC_ID ============== ======== ===================================== Function ID: (uint32) 0x86000001 Arguments: (uint32) KVM_PTP_VIRT_COUNTER(0) diff --git a/drivers/ptp/ptp_kvm_common.c b/drivers/ptp/ptp_kvm_common.c index 721ddcede5e1..fcae32f56f25 100644 --- a/drivers/ptp/ptp_kvm_common.c +++ b/drivers/ptp/ptp_kvm_common.c @@ -138,7 +138,8 @@ static int __init ptp_kvm_init(void) ret = kvm_arch_ptp_init(); if (ret) { - pr_err("fail to initialize ptp_kvm"); + if (ret != -EOPNOTSUPP) + pr_err("fail to initialize ptp_kvm"); return ret; } |