Commit cf1c4cce authored by Sam Bobroff's avatar Sam Bobroff Committed by David Gibson
Browse files

target-ppc: support KVM_CAP_PPC_MMU_RADIX, KVM_CAP_PPC_MMU_HASH_V3 



Query and cache the value of two new KVM capabilities that indicate
KVM's support for new radix and hash modes of the MMU.

Signed-off-by: default avatarSam Bobroff <sam.bobroff@au1.ibm.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent c64abd1f

target/ppc/kvm.c

+14 −0
Original line number Diff line number Diff line
@@ -86,6 +86,8 @@ static int cap_papr; 
static int cap_htab_fd;

static int cap_fixup_hcalls;

static int cap_htm;             /* Hardware transactional memory support */

static int cap_mmu_radix;

static int cap_mmu_hash_v3;



static uint32_t debug_inst_opcode;
@@ -140,6 +142,8 @@ int kvm_arch_init(MachineState *ms, KVMState *s) 
    cap_htab_fd = kvm_check_extension(s, KVM_CAP_PPC_HTAB_FD);

    cap_fixup_hcalls = kvm_check_extension(s, KVM_CAP_PPC_FIXUP_HCALL);

    cap_htm = kvm_vm_check_extension(s, KVM_CAP_PPC_HTM);

    cap_mmu_radix = kvm_vm_check_extension(s, KVM_CAP_PPC_MMU_RADIX);

    cap_mmu_hash_v3 = kvm_vm_check_extension(s, KVM_CAP_PPC_MMU_HASH_V3);



    if (!cap_interrupt_level) {

        fprintf(stderr, "KVM: Couldn't find level irq capability. Expect the "
@@ -2354,6 +2358,16 @@ bool kvmppc_has_cap_htm(void) 
    return cap_htm;

}



bool kvmppc_has_cap_mmu_radix(void)

{

    return cap_mmu_radix;

}



bool kvmppc_has_cap_mmu_hash_v3(void)

{

    return cap_mmu_hash_v3;

}



static PowerPCCPUClass *ppc_cpu_get_family_class(PowerPCCPUClass *pcc)

{

    ObjectClass *oc = OBJECT_CLASS(pcc);

target/ppc/kvm_ppc.h

+12 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ void kvmppc_read_hptes(ppc_hash_pte64_t *hptes, hwaddr ptex, int n); 
void kvmppc_write_hpte(hwaddr ptex, uint64_t pte0, uint64_t pte1);

bool kvmppc_has_cap_fixup_hcalls(void);

bool kvmppc_has_cap_htm(void);

bool kvmppc_has_cap_mmu_radix(void);

bool kvmppc_has_cap_mmu_hash_v3(void);

int kvmppc_enable_hwrng(void);

int kvmppc_put_books_sregs(PowerPCCPU *cpu);

PowerPCCPUClass *kvm_ppc_get_host_cpu_class(void);
@@ -254,6 +256,16 @@ static inline bool kvmppc_has_cap_htm(void) 
    return false;

}



static inline bool kvmppc_has_cap_mmu_radix(void)

{

    return false;

}



static inline bool kvmppc_has_cap_mmu_hash_v3(void)

{

    return false;

}



static inline int kvmppc_enable_hwrng(void)

{

    return -1;