Skip to content

Commit

Permalink
ptp: kvm: x86: Return EOPNOTSUPP instead of ENODEV from kvm_arch_ptp_…
Browse files Browse the repository at this point in the history
…init()

[ Upstream commit 5e7aa97 ]

The caller, ptp_kvm_init(), emits a warning if kvm_arch_ptp_init() exits
with any error which is not EOPNOTSUPP:

	"fail to initialize ptp_kvm"

Replace ENODEV with EOPNOTSUPP to avoid this spurious warning,
aligning with the ARM implementation.

Fixes: a86ed2c ("ptp: Don't print an error if ptp_kvm is not supported")
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Link: https://patch.msgid.link/20241203-kvm_ptp-eopnotsuppp-v2-1-d1d060f27aa6@weissschuh.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
t-8ch authored and gregkh committed Dec 19, 2024
1 parent 03528ff commit 74f0a69
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/ptp/ptp_kvm_x86.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ int kvm_arch_ptp_init(void)
long ret;

if (!kvm_para_available())
return -ENODEV;
return -EOPNOTSUPP;

if (cc_platform_has(CC_ATTR_GUEST_MEM_ENCRYPT)) {
p = alloc_page(GFP_KERNEL | __GFP_ZERO);
Expand All @@ -46,14 +46,14 @@ int kvm_arch_ptp_init(void)

clock_pair_gpa = slow_virt_to_phys(clock_pair);
if (!pvclock_get_pvti_cpu0_va()) {
ret = -ENODEV;
ret = -EOPNOTSUPP;
goto err;
}

ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING, clock_pair_gpa,
KVM_CLOCK_PAIRING_WALLCLOCK);
if (ret == -KVM_ENOSYS) {
ret = -ENODEV;
ret = -EOPNOTSUPP;
goto err;
}

Expand Down

0 comments on commit 74f0a69

Please sign in to comment.