Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b106aff authored by Mark Rutland's avatar Mark Rutland Committed by Greg Kroah-Hartman
Browse files

arm/arm64: KVM: Consolidate the PSCI include files 




From: Marc Zyngier <marc.zyngier@arm.com>

commit 1a2fb94e6a771ff94f4afa22497a4695187b820c upstream.

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.

Acked-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Tested-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
[v4.9: account for files moved to virt/ upstream]
Signed-off-by: Mark Rutland <mark.rutland@arm.com> [v4.9 backport]
Tested-by: default avatarGreg Hackmann <ghackmann@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e06ea9af

arch/arm/include/asm/kvm_psci.h

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 - ARM Ltd

 * Author: Marc Zyngier <marc.zyngier@arm.com>

 *

 * 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.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#ifndef __ARM_KVM_PSCI_H__

#define __ARM_KVM_PSCI_H__



#define KVM_ARM_PSCI_0_1	1

#define KVM_ARM_PSCI_0_2	2



int kvm_psci_version(struct kvm_vcpu *vcpu);

int kvm_psci_call(struct kvm_vcpu *vcpu);



#endif /* __ARM_KVM_PSCI_H__ */

arch/arm/kvm/arm.c

+1 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/kvm.h>

#include <trace/events/kvm.h>

#include <kvm/arm_pmu.h>

#include <kvm/arm_psci.h>



#define CREATE_TRACE_POINTS

#include "trace.h"
@@ -44,7 +45,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

arch/arm/kvm/handle_exit.c

+1 −1
Original line number Diff line number Diff line
@@ -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"

arch/arm/kvm/psci.c

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



/*

arch/arm64/kvm/handle_exit.c

+4 −1
Original line number Diff line number Diff line
@@ -22,12 +22,15 @@ 
#include <linux/kvm.h>

#include <linux/kvm_host.h>



#include <kvm/arm_psci.h>



#include <asm/esr.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>



#define CREATE_TRACE_POINTS

#include "trace.h"