lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 420/575] powerpc: Refactor is_kvm_guest() declaration to new header
    Date
    From: Srikar Dronamraju <srikar@linux.vnet.ibm.com>

    [ Upstream commit 92cc6bf01c7f4c5cfefd1963985c0064687ebeda ]

    Only code/declaration movement, in anticipation of doing a KVM-aware
    vcpu_is_preempted(). No additional changes.

    Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
    Acked-by: Waiman Long <longman@redhat.com>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Link: https://lore.kernel.org/r/20201202050456.164005-2-srikar@linux.vnet.ibm.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/powerpc/include/asm/firmware.h | 6 ------
    arch/powerpc/include/asm/kvm_guest.h | 15 +++++++++++++++
    arch/powerpc/include/asm/kvm_para.h | 2 +-
    arch/powerpc/kernel/firmware.c | 1 +
    arch/powerpc/platforms/pseries/smp.c | 1 +
    5 files changed, 18 insertions(+), 7 deletions(-)
    create mode 100644 arch/powerpc/include/asm/kvm_guest.h

    diff --git a/arch/powerpc/include/asm/firmware.h b/arch/powerpc/include/asm/firmware.h
    index 0b295bdb201e8..aa6a5ef5d4830 100644
    --- a/arch/powerpc/include/asm/firmware.h
    +++ b/arch/powerpc/include/asm/firmware.h
    @@ -134,12 +134,6 @@ extern int ibm_nmi_interlock_token;

    extern unsigned int __start___fw_ftr_fixup, __stop___fw_ftr_fixup;

    -#if defined(CONFIG_PPC_PSERIES) || defined(CONFIG_KVM_GUEST)
    -bool is_kvm_guest(void);
    -#else
    -static inline bool is_kvm_guest(void) { return false; }
    -#endif
    -
    #ifdef CONFIG_PPC_PSERIES
    void pseries_probe_fw_features(void);
    #else
    diff --git a/arch/powerpc/include/asm/kvm_guest.h b/arch/powerpc/include/asm/kvm_guest.h
    new file mode 100644
    index 0000000000000..d2c946dbbd2c0
    --- /dev/null
    +++ b/arch/powerpc/include/asm/kvm_guest.h
    @@ -0,0 +1,15 @@
    +/* SPDX-License-Identifier: GPL-2.0-only */
    +/*
    + * Copyright (C) 2020 IBM Corporation
    + */
    +
    +#ifndef _ASM_POWERPC_KVM_GUEST_H_
    +#define _ASM_POWERPC_KVM_GUEST_H_
    +
    +#if defined(CONFIG_PPC_PSERIES) || defined(CONFIG_KVM_GUEST)
    +bool is_kvm_guest(void);
    +#else
    +static inline bool is_kvm_guest(void) { return false; }
    +#endif
    +
    +#endif /* _ASM_POWERPC_KVM_GUEST_H_ */
    diff --git a/arch/powerpc/include/asm/kvm_para.h b/arch/powerpc/include/asm/kvm_para.h
    index 744612054c94c..abe1b5e82547b 100644
    --- a/arch/powerpc/include/asm/kvm_para.h
    +++ b/arch/powerpc/include/asm/kvm_para.h
    @@ -8,7 +8,7 @@
    #ifndef __POWERPC_KVM_PARA_H__
    #define __POWERPC_KVM_PARA_H__

    -#include <asm/firmware.h>
    +#include <asm/kvm_guest.h>

    #include <uapi/asm/kvm_para.h>

    diff --git a/arch/powerpc/kernel/firmware.c b/arch/powerpc/kernel/firmware.c
    index fe48d319d490e..5f48e5ad24cdd 100644
    --- a/arch/powerpc/kernel/firmware.c
    +++ b/arch/powerpc/kernel/firmware.c
    @@ -14,6 +14,7 @@
    #include <linux/of.h>

    #include <asm/firmware.h>
    +#include <asm/kvm_guest.h>

    #ifdef CONFIG_PPC64
    unsigned long powerpc_firmware_features __read_mostly;
    diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c
    index 624e80b00eb18..7be7094075ab5 100644
    --- a/arch/powerpc/platforms/pseries/smp.c
    +++ b/arch/powerpc/platforms/pseries/smp.c
    @@ -42,6 +42,7 @@
    #include <asm/plpar_wrappers.h>
    #include <asm/code-patching.h>
    #include <asm/svm.h>
    +#include <asm/kvm_guest.h>

    #include "pseries.h"

    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 03:00    [W:2.162 / U:0.252 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site