Merge tag 'dt-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / arch / powerpc / include / asm / kvm_host.h

diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h
index 7f2e90d..9f52f28 100644 (file)
--- a/arch/powerpc/include/asm/kvm_host.h
+++ b/arch/powerpc/include/asm/kvm_host.h
@@ -81,12 +81,13 @@ struct kvmppc_book3s_shadow_vcpu;
 struct kvm_nested_guest;
 
 struct kvm_vm_stat {
-       ulong remote_tlb_flush;
-       ulong num_2M_pages;
-       ulong num_1G_pages;
+       struct kvm_vm_stat_generic generic;
+       u64 num_2M_pages;
+       u64 num_1G_pages;
 };
 
 struct kvm_vcpu_stat {
+       struct kvm_vcpu_stat_generic generic;
        u64 sum_exits;
        u64 mmio_exits;
        u64 signal_exits;
@@ -102,14 +103,8 @@ struct kvm_vcpu_stat {
        u64 emulated_inst_exits;
        u64 dec_exits;
        u64 ext_intr_exits;
-       u64 halt_poll_success_ns;
-       u64 halt_poll_fail_ns;
        u64 halt_wait_ns;
-       u64 halt_successful_poll;
-       u64 halt_attempted_poll;
        u64 halt_successful_wait;
-       u64 halt_poll_invalid;
-       u64 halt_wakeup;
        u64 dbell_exits;
        u64 gdbell_exits;
        u64 ld;
@@ -298,7 +293,6 @@ struct kvm_arch {
        u8 fwnmi_enabled;
        u8 secure_guest;
        u8 svm_enabled;
-       bool threads_indep;
        bool nested_enable;
        bool dawr1_enabled;
        pgd_t *pgtable;
@@ -684,7 +678,12 @@ struct kvm_vcpu_arch {
        ulong fault_dar;
        u32 fault_dsisr;
        unsigned long intr_msr;
-       ulong fault_gpa;        /* guest real address of page fault (POWER9) */
+       /*
+        * POWER9 and later: fault_gpa contains the guest real address of page
+        * fault for a radix guest, or segment descriptor (equivalent to result
+        * from slbmfev of SLB entry that translated the EA) for hash guests.
+        */
+       ulong fault_gpa;
 #endif
 
 #ifdef CONFIG_BOOKE