Commit 4085ae80 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch 'kvm-arm64/ptp' into kvmarm-master/next 



Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents 979a2652 182a71a3

Documentation/virt/kvm/arm/ptp_kvm.rst

+2 −2
Original line number Diff line number Diff line
@@ -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)

drivers/ptp/ptp_kvm_common.c

+2 −1
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ static int __init ptp_kvm_init(void) 


	ret = kvm_arch_ptp_init();

	if (ret) {

		if (ret != -EOPNOTSUPP)

			pr_err("fail to initialize ptp_kvm");

		return ret;

	}