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

Commit f2569053 authored by Avi Kivity's avatar Avi Kivity
Browse files

Merge branch 'for-upstream' of git://github.com/agraf/linux-2.6 into next 

PPC updates from Alex.

* 'for-upstream' of git://github.com/agraf/linux-2.6

:
  KVM: PPC: Emulator: clean up SPR reads and writes
  KVM: PPC: Emulator: clean up instruction parsing
  kvm/powerpc: Add new ioctl to retreive server MMU infos
  kvm/book3s: Make kernel emulated H_PUT_TCE available for "PR" KVM
  KVM: PPC: bookehv: Fix r8/r13 storing in level exception handler
  KVM: PPC: Book3S: Enable IRQs during exit handling
  KVM: PPC: Fix PR KVM on POWER7 bare metal
  KVM: PPC: Fix stbux emulation
  KVM: PPC: bookehv: Use lwz/stw instead of PPC_LL/PPC_STL for 32-bit fields
  KVM: PPC: Book3S: PR: No isync in slbie path
  KVM: PPC: Book3S: PR: Optimize entry path
  KVM: PPC: booke(hv): Fix save/restore of guest accessible SPRGs.
  KVM: PPC: Restrict PPC_[L|ST]D macro to asm code
  KVM: PPC: bookehv: Use a Macro for saving/restoring guest registers to/from their 64 bit copies.
  KVM: PPC: Use clockevent multiplier and shifter for decrementer
  KVM: Use minimum and maximum address mapped by TLB1

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parents 9f4260e7 54771e62

Documentation/virtual/kvm/api.txt

+70 −0
Original line number Diff line number Diff line
@@ -1860,6 +1860,76 @@ See KVM_GET_PIT2 for details on struct kvm_pit_state2. 
This IOCTL replaces the obsolete KVM_SET_PIT.





4.74 KVM_PPC_GET_SMMU_INFO



Capability: KVM_CAP_PPC_GET_SMMU_INFO

Architectures: powerpc

Type: vm ioctl

Parameters: None

Returns: 0 on success, -1 on error



This populates and returns a structure describing the features of

the "Server" class MMU emulation supported by KVM.

This can in turn be used by userspace to generate the appropariate

device-tree properties for the guest operating system.



The structure contains some global informations, followed by an

array of supported segment page sizes:



      struct kvm_ppc_smmu_info {

	     __u64 flags;

	     __u32 slb_size;

	     __u32 pad;

	     struct kvm_ppc_one_seg_page_size sps[KVM_PPC_PAGE_SIZES_MAX_SZ];

      };



The supported flags are:



    - KVM_PPC_PAGE_SIZES_REAL:

        When that flag is set, guest page sizes must "fit" the backing

        store page sizes. When not set, any page size in the list can

        be used regardless of how they are backed by userspace.



    - KVM_PPC_1T_SEGMENTS

        The emulated MMU supports 1T segments in addition to the

        standard 256M ones.



The "slb_size" field indicates how many SLB entries are supported



The "sps" array contains 8 entries indicating the supported base

page sizes for a segment in increasing order. Each entry is defined

as follow:



   struct kvm_ppc_one_seg_page_size {

	__u32 page_shift;	/* Base page shift of segment (or 0) */

	__u32 slb_enc;		/* SLB encoding for BookS */

	struct kvm_ppc_one_page_size enc[KVM_PPC_PAGE_SIZES_MAX_SZ];

   };



An entry with a "page_shift" of 0 is unused. Because the array is

organized in increasing order, a lookup can stop when encoutering

such an entry.



The "slb_enc" field provides the encoding to use in the SLB for the

page size. The bits are in positions such as the value can directly

be OR'ed into the "vsid" argument of the slbmte instruction.



The "enc" array is a list which for each of those segment base page

size provides the list of supported actual page sizes (which can be

only larger or equal to the base page size), along with the

corresponding encoding in the hash PTE. Similarily, the array is

8 entries sorted by increasing sizes and an entry with a "0" shift

is an empty entry and a terminator:



   struct kvm_ppc_one_page_size {

	__u32 page_shift;	/* Page shift (or 0) */

	__u32 pte_enc;		/* Encoding in the HPTE (>>12) */

   };



The "pte_enc" field provides a value that can OR'ed into the hash

PTE's RPN field (ie, it needs to be shifted left by 12 to OR it

into the hash PTE second double word).



5. The kvm_run structure

------------------------

arch/powerpc/include/asm/kvm_asm.h

+10 −0
Original line number Diff line number Diff line
@@ -20,6 +20,16 @@ 
#ifndef __POWERPC_KVM_ASM_H__

#define __POWERPC_KVM_ASM_H__



#ifdef __ASSEMBLY__

#ifdef CONFIG_64BIT

#define PPC_STD(sreg, offset, areg)  std sreg, (offset)(areg)

#define PPC_LD(treg, offset, areg)   ld treg, (offset)(areg)

#else

#define PPC_STD(sreg, offset, areg)  stw sreg, (offset+4)(areg)

#define PPC_LD(treg, offset, areg)   lwz treg, (offset+4)(areg)

#endif

#endif



/* IVPR must be 64KiB-aligned. */

#define VCPU_SIZE_ORDER 4

#define VCPU_SIZE_LOG   (VCPU_SIZE_ORDER + 12)

arch/powerpc/include/asm/kvm_host.h

+3 −1
Original line number Diff line number Diff line
@@ -237,7 +237,6 @@ struct kvm_arch { 
	unsigned long vrma_slb_v;

	int rma_setup_done;

	int using_mmu_notifiers;

	struct list_head spapr_tce_tables;

	spinlock_t slot_phys_lock;

	unsigned long *slot_phys[KVM_MEM_SLOTS_NUM];

	int slot_npages[KVM_MEM_SLOTS_NUM];
@@ -245,6 +244,9 @@ struct kvm_arch { 
	struct kvmppc_vcore *vcores[KVM_MAX_VCORES];

	struct kvmppc_linear_info *hpt_li;

#endif /* CONFIG_KVM_BOOK3S_64_HV */

#ifdef CONFIG_PPC_BOOK3S_64

	struct list_head spapr_tce_tables;

#endif

};



/*

arch/powerpc/include/asm/kvm_ppc.h

+8 −2
Original line number Diff line number Diff line
@@ -107,8 +107,10 @@ extern void kvmppc_core_dequeue_external(struct kvm_vcpu *vcpu, 


extern int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,

                                  unsigned int op, int *advance);

extern int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs);

extern int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt);

extern int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn,

				     ulong val);

extern int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn,

				     ulong *val);



extern int kvmppc_booke_init(void);

extern void kvmppc_booke_exit(void);
@@ -126,6 +128,8 @@ extern void kvmppc_map_vrma(struct kvm_vcpu *vcpu, 
extern int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu);

extern long kvm_vm_ioctl_create_spapr_tce(struct kvm *kvm,

				struct kvm_create_spapr_tce *args);

extern long kvmppc_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn,

			     unsigned long ioba, unsigned long tce);

extern long kvm_vm_ioctl_allocate_rma(struct kvm *kvm,

				struct kvm_allocate_rma *rma);

extern struct kvmppc_linear_info *kvm_alloc_rma(void);
@@ -138,6 +142,8 @@ extern int kvmppc_core_prepare_memory_region(struct kvm *kvm, 
				struct kvm_userspace_memory_region *mem);

extern void kvmppc_core_commit_memory_region(struct kvm *kvm,

				struct kvm_userspace_memory_region *mem);

extern int kvm_vm_ioctl_get_smmu_info(struct kvm *kvm,

				      struct kvm_ppc_smmu_info *info);



extern int kvmppc_bookehv_init(void);

extern void kvmppc_bookehv_exit(void);

arch/powerpc/include/asm/time.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
extern unsigned long tb_ticks_per_jiffy;

extern unsigned long tb_ticks_per_usec;

extern unsigned long tb_ticks_per_sec;

extern struct clock_event_device decrementer_clockevent;



struct rtc_time;

extern void to_tm(int tim, struct rtc_time * tm);