]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ptp: kvm: x86: Return EOPNOTSUPP instead of ENODEV from kvm_arch_ptp_init()
authorThomas Weißschuh <linux@weissschuh.net>
Tue, 3 Dec 2024 17:09:55 +0000 (18:09 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 Dec 2024 17:08:53 +0000 (18:08 +0100)
[ Upstream commit 5e7aa97c7acf171275ac02a8bb018c31b8918d13 ]

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: a86ed2cfa13c ("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>
drivers/ptp/ptp_kvm_x86.c

index 902844cc1a17d5bd46461702ea149c852454db46..5e5b2ef785474fd196da31fe76e82f7875afee36 100644 (file)
@@ -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);
@@ -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;
        }