Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-01 00:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

KVM: PPC: Make PAM a define

Browse Source 
On PowerPC it's very normal to not support all of the physical RAM in real mode.
To check if we're matching on the shared page or not, we need to know the limits
so we can restrain ourselves to that range.

So let's make it a define instead of open-coding it. And while at it, let's also
increase it.

Signed-off-by: Alexander Graf <agraf@suse.de>

v2 -> v3:

  - RMO -> PAM (non-magic page)
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Alexander Graf 2010-07-29 14:47:52 +02:00 committed by Avi Kivity
parent 90bba35887
commit 28e83b4fa7
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/powerpc/include/asm/kvm_host.h
View File

@ -48,6 +48,9 @@
#define HPTEG_HASH_NUM_VPTE (1 << HPTEG_HASH_BITS_VPTE) #define HPTEG_HASH_NUM_VPTE (1 << HPTEG_HASH_BITS_VPTE)
#define HPTEG_HASH_NUM_VPTE_LONG (1 << HPTEG_HASH_BITS_VPTE_LONG) #define HPTEG_HASH_NUM_VPTE_LONG (1 << HPTEG_HASH_BITS_VPTE_LONG)
/* Physical Address Mask - allowed range of real mode RAM access */
#define KVM_PAM 0x0fffffffffffffffULL
struct kvm; struct kvm;
struct kvm_run; struct kvm_run;
struct kvm_vcpu; struct kvm_vcpu;

4
arch/powerpc/kvm/book3s.c
View File

@ -465,7 +465,7 @@ static int kvmppc_xlate(struct kvm_vcpu *vcpu, ulong eaddr, bool data,
r = vcpu->arch.mmu.xlate(vcpu, eaddr, pte, data); r = vcpu->arch.mmu.xlate(vcpu, eaddr, pte, data);
} else { } else {
pte->eaddr = eaddr; pte->eaddr = eaddr;
pte->raddr = eaddr & 0xffffffff; pte->raddr = eaddr & KVM_PAM;
pte->vpage = VSID_REAL | eaddr >> 12; pte->vpage = VSID_REAL | eaddr >> 12;
pte->may_read = true; pte->may_read = true;
pte->may_write = true; pte->may_write = true;
@ -579,7 +579,7 @@ int kvmppc_handle_pagefault(struct kvm_run *run, struct kvm_vcpu *vcpu,
pte.may_execute = true; pte.may_execute = true;
pte.may_read = true; pte.may_read = true;
pte.may_write = true; pte.may_write = true;
pte.raddr = eaddr & 0xffffffff; pte.raddr = eaddr & KVM_PAM;
pte.eaddr = eaddr; pte.eaddr = eaddr;
pte.vpage = eaddr >> 12; pte.vpage = eaddr >> 12;
} }