KVM: PPC: e500: merge <asm/kvm_e500.h> into arch/powerpc/kvm/e500.h (fc6cf995) · Commits · 戴 / test

arch/powerpc/include/asm/kvm_e500.h

deleted100644 → 0

+0 −96

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2008-2011 Freescale Semiconductor, Inc. All rights reserved.
		*
		* Author: Yu Liu, <yu.liu@freescale.com>
		*
		* Description:
		* This file is derived from arch/powerpc/include/asm/kvm_44x.h,
		* by Hollis Blanchard <hollisb@us.ibm.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.
		*/

		#ifndef __ASM_KVM_E500_H__
		#define __ASM_KVM_E500_H__

		#include <linux/kvm_host.h>

		#define BOOKE_INTERRUPT_SIZE 36

		#define E500_PID_NUM 3
		#define E500_TLB_NUM 2

		#define E500_TLB_VALID 1
		#define E500_TLB_DIRTY 2

		struct tlbe_ref {
		pfn_t pfn;
		unsigned int flags; /* E500_TLB_* */
		};

		struct tlbe_priv {
		struct tlbe_ref ref; /* TLB0 only -- TLB1 uses tlb_refs */
		};

		struct vcpu_id_table;

		struct kvmppc_e500_tlb_params {
		int entries, ways, sets;
		};

		struct kvmppc_vcpu_e500 {
		/* Unmodified copy of the guest's TLB -- shared with host userspace. */
		struct kvm_book3e_206_tlb_entry *gtlb_arch;

		/* Starting entry number in gtlb_arch[] */
		int gtlb_offset[E500_TLB_NUM];

		/* KVM internal information associated with each guest TLB entry */
		struct tlbe_priv *gtlb_priv[E500_TLB_NUM];

		struct kvmppc_e500_tlb_params gtlb_params[E500_TLB_NUM];

		unsigned int gtlb_nv[E500_TLB_NUM];

		/*
		* information associated with each host TLB entry --
		* TLB1 only for now. If/when guest TLB1 entries can be
		* mapped with host TLB0, this will be used for that too.
		*
		* We don't want to use this for guest TLB0 because then we'd
		* have the overhead of doing the translation again even if
		* the entry is still in the guest TLB (e.g. we swapped out
		* and back, and our host TLB entries got evicted).
		*/
		struct tlbe_ref *tlb_refs[E500_TLB_NUM];
		unsigned int host_tlb1_nv;

		u32 host_pid[E500_PID_NUM];
		u32 pid[E500_PID_NUM];
		u32 svr;

		/* vcpu id table */
		struct vcpu_id_table *idt;

		u32 l1csr0;
		u32 l1csr1;
		u32 hid0;
		u32 hid1;
		u32 tlb0cfg;
		u32 tlb1cfg;
		u64 mcar;

		struct page **shared_tlb_pages;
		int num_shared_tlb_pages;

		struct kvm_vcpu vcpu;
		};

		static inline struct kvmppc_vcpu_e500 to_e500(struct kvm_vcpu vcpu)
		{
		return container_of(vcpu, struct kvmppc_vcpu_e500, vcpu);
		}

		#endif /* __ASM_KVM_E500_H__ */

arch/powerpc/kvm/e500.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@
		#include <asm/reg.h>
		#include <asm/cputable.h>
		#include <asm/tlbflush.h>
		#include <asm/kvm_e500.h>
		#include <asm/kvm_ppc.h>

		#include "booke.h"

arch/powerpc/kvm/e500.h

+78 −4

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2008-2011 Freescale Semiconductor, Inc. All rights reserved.
		*
		* Author: Yu Liu, yu.liu@freescale.com
		* Author: Yu Liu <yu.liu@freescale.com>
		*
		* Description:
		* This file is based on arch/powerpc/kvm/44x_tlb.h,
		* by Hollis Blanchard <hollisb@us.ibm.com>.
		* This file is based on arch/powerpc/kvm/44x_tlb.h and
		* arch/powerpc/include/asm/kvm_44x.h by Hollis Blanchard <hollisb@us.ibm.com>,
		* Copyright IBM Corp. 2007-2008
		*
		* 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
		@@ -18,7 +19,80 @@
		#include <linux/kvm_host.h>
		#include <asm/mmu-book3e.h>
		#include <asm/tlb.h>
		#include <asm/kvm_e500.h>

		#define E500_PID_NUM 3
		#define E500_TLB_NUM 2

		#define E500_TLB_VALID 1
		#define E500_TLB_DIRTY 2

		struct tlbe_ref {
		pfn_t pfn;
		unsigned int flags; /* E500_TLB_* */
		};

		struct tlbe_priv {
		struct tlbe_ref ref; /* TLB0 only -- TLB1 uses tlb_refs */
		};

		struct vcpu_id_table;

		struct kvmppc_e500_tlb_params {
		int entries, ways, sets;
		};

		struct kvmppc_vcpu_e500 {
		/* Unmodified copy of the guest's TLB -- shared with host userspace. */
		struct kvm_book3e_206_tlb_entry *gtlb_arch;

		/* Starting entry number in gtlb_arch[] */
		int gtlb_offset[E500_TLB_NUM];

		/* KVM internal information associated with each guest TLB entry */
		struct tlbe_priv *gtlb_priv[E500_TLB_NUM];

		struct kvmppc_e500_tlb_params gtlb_params[E500_TLB_NUM];

		unsigned int gtlb_nv[E500_TLB_NUM];

		/*
		* information associated with each host TLB entry --
		* TLB1 only for now. If/when guest TLB1 entries can be
		* mapped with host TLB0, this will be used for that too.
		*
		* We don't want to use this for guest TLB0 because then we'd
		* have the overhead of doing the translation again even if
		* the entry is still in the guest TLB (e.g. we swapped out
		* and back, and our host TLB entries got evicted).
		*/
		struct tlbe_ref *tlb_refs[E500_TLB_NUM];
		unsigned int host_tlb1_nv;

		u32 host_pid[E500_PID_NUM];
		u32 pid[E500_PID_NUM];
		u32 svr;

		/* vcpu id table */
		struct vcpu_id_table *idt;

		u32 l1csr0;
		u32 l1csr1;
		u32 hid0;
		u32 hid1;
		u32 tlb0cfg;
		u32 tlb1cfg;
		u64 mcar;

		struct page **shared_tlb_pages;
		int num_shared_tlb_pages;

		struct kvm_vcpu vcpu;
		};

		static inline struct kvmppc_vcpu_e500 to_e500(struct kvm_vcpu vcpu)
		{
		return container_of(vcpu, struct kvmppc_vcpu_e500, vcpu);
		}

		/* This geometry is the legacy default -- can be overridden by userspace */
		#define KVM_E500_TLB0_WAY_SIZE 128

arch/powerpc/kvm/e500_emulate.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@

		#include <asm/kvm_ppc.h>
		#include <asm/disassemble.h>
		#include <asm/kvm_e500.h>

		#include "booke.h"
		#include "e500.h"

arch/powerpc/kvm/e500_tlb.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@
		#include <linux/vmalloc.h>
		#include <linux/hugetlb.h>
		#include <asm/kvm_ppc.h>
		#include <asm/kvm_e500.h>

		#include "../mm/mmu_decl.h"
		#include "e500.h"

Admin message