lkml.org 
[lkml]   [2018]   [Jan]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/14] arm/arm64: KVM: Consolidate the PSCI include files
    Date
    As we're about to update the PSCI support, and because I'm lazy,
    let's move the PSCI include file to include/kvm so that both
    ARM architectures can find it.

    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
    ---
    arch/arm/include/asm/psci.h | 25 ----------------------
    arch/arm/kvm/handle_exit.c | 2 +-
    arch/arm64/kvm/handle_exit.c | 3 ++-
    .../asm/kvm_psci.h => include/kvm/arm_psci.h | 6 +++---
    virt/kvm/arm/arm.c | 2 +-
    virt/kvm/arm/psci.c | 3 ++-
    6 files changed, 9 insertions(+), 32 deletions(-)
    delete mode 100644 arch/arm/include/asm/psci.h
    rename arch/arm64/include/asm/kvm_psci.h => include/kvm/arm_psci.h (89%)

    diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
    deleted file mode 100644
    index e1b825dfab23..000000000000
    --- a/arch/arm/include/asm/psci.h
    +++ /dev/null
    @@ -1,25 +0,0 @@
    -/*
    - * This program is free software; you can redistribute it and/or modify
    - * it under the terms of the GNU General Public License version 2 as
    - * published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope that it will be useful,
    - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    - * GNU General Public License for more details.
    - *
    - * Copyright (C) 2012 ARM Limited
    - */
    -
    -#ifndef __ASM_ARM_PSCI_H
    -#define __ASM_ARM_PSCI_H
    -
    -extern const struct smp_operations psci_smp_ops;
    -
    -#if defined(CONFIG_SMP) && defined(CONFIG_ARM_PSCI)
    -bool psci_smp_available(void);
    -#else
    -static inline bool psci_smp_available(void) { return false; }
    -#endif
    -
    -#endif /* __ASM_ARM_PSCI_H */
    diff --git a/arch/arm/kvm/handle_exit.c b/arch/arm/kvm/handle_exit.c
    index d15ac772d186..e020cc82c4b1 100644
    --- a/arch/arm/kvm/handle_exit.c
    +++ b/arch/arm/kvm/handle_exit.c
    @@ -21,7 +21,7 @@
    #include <asm/kvm_emulate.h>
    #include <asm/kvm_coproc.h>
    #include <asm/kvm_mmu.h>
    -#include <asm/kvm_psci.h>
    +#include <kvm/arm_psci.h>
    #include <trace/events/kvm.h>

    #include "trace.h"
    diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c
    index 520b0dad3c62..97e8d64a203d 100644
    --- a/arch/arm64/kvm/handle_exit.c
    +++ b/arch/arm64/kvm/handle_exit.c
    @@ -22,13 +22,14 @@
    #include <linux/kvm.h>
    #include <linux/kvm_host.h>

    +#include <kvm/arm_psci.h>
    +
    #include <asm/esr.h>
    #include <asm/exception.h>
    #include <asm/kvm_asm.h>
    #include <asm/kvm_coproc.h>
    #include <asm/kvm_emulate.h>
    #include <asm/kvm_mmu.h>
    -#include <asm/kvm_psci.h>
    #include <asm/debug-monitors.h>
    #include <asm/traps.h>

    diff --git a/arch/arm64/include/asm/kvm_psci.h b/include/kvm/arm_psci.h
    similarity index 89%
    rename from arch/arm64/include/asm/kvm_psci.h
    rename to include/kvm/arm_psci.h
    index bc39e557c56c..2042bb909474 100644
    --- a/arch/arm64/include/asm/kvm_psci.h
    +++ b/include/kvm/arm_psci.h
    @@ -15,8 +15,8 @@
    * along with this program. If not, see <http://www.gnu.org/licenses/>.
    */

    -#ifndef __ARM64_KVM_PSCI_H__
    -#define __ARM64_KVM_PSCI_H__
    +#ifndef __KVM_ARM_PSCI_H__
    +#define __KVM_ARM_PSCI_H__

    #define KVM_ARM_PSCI_0_1 1
    #define KVM_ARM_PSCI_0_2 2
    @@ -24,4 +24,4 @@
    int kvm_psci_version(struct kvm_vcpu *vcpu);
    int kvm_psci_call(struct kvm_vcpu *vcpu);

    -#endif /* __ARM64_KVM_PSCI_H__ */
    +#endif /* __KVM_ARM_PSCI_H__ */
    diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c
    index 15bf026eb182..af3e98fc377e 100644
    --- a/virt/kvm/arm/arm.c
    +++ b/virt/kvm/arm/arm.c
    @@ -31,6 +31,7 @@
    #include <linux/irqbypass.h>
    #include <trace/events/kvm.h>
    #include <kvm/arm_pmu.h>
    +#include <kvm/arm_psci.h>

    #define CREATE_TRACE_POINTS
    #include "trace.h"
    @@ -46,7 +47,6 @@
    #include <asm/kvm_mmu.h>
    #include <asm/kvm_emulate.h>
    #include <asm/kvm_coproc.h>
    -#include <asm/kvm_psci.h>
    #include <asm/sections.h>

    #ifdef REQUIRES_VIRT
    diff --git a/virt/kvm/arm/psci.c b/virt/kvm/arm/psci.c
    index f1e363bab5e8..b322e46fd142 100644
    --- a/virt/kvm/arm/psci.c
    +++ b/virt/kvm/arm/psci.c
    @@ -21,9 +21,10 @@

    #include <asm/cputype.h>
    #include <asm/kvm_emulate.h>
    -#include <asm/kvm_psci.h>
    #include <asm/kvm_host.h>

    +#include <kvm/arm_psci.h>
    +
    #include <uapi/linux/psci.h>

    /*
    --
    2.14.2
    \
     
     \ /
      Last update: 2018-01-26 15:33    [W:3.157 / U:0.556 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site