aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/kvm/book3s_xics.c12
-rw-r--r--arch/powerpc/kvm/book3s_xics.h2
2 files changed, 3 insertions, 11 deletions
diff --git a/arch/powerpc/kvm/book3s_xics.c b/arch/powerpc/kvm/book3s_xics.c
index 20dff102a06f..debda779a240 100644
--- a/arch/powerpc/kvm/book3s_xics.c
+++ b/arch/powerpc/kvm/book3s_xics.c
@@ -832,10 +832,6 @@ int kvmppc_xics_rm_complete(struct kvm_vcpu *vcpu, u32 hcall)
832 icp->n_rm_check_resend++; 832 icp->n_rm_check_resend++;
833 icp_check_resend(xics, icp->rm_resend_icp); 833 icp_check_resend(xics, icp->rm_resend_icp);
834 } 834 }
835 if (icp->rm_action & XICS_RM_REJECT) {
836 icp->n_rm_reject++;
837 icp_deliver_irq(xics, icp, icp->rm_reject);
838 }
839 if (icp->rm_action & XICS_RM_NOTIFY_EOI) { 835 if (icp->rm_action & XICS_RM_NOTIFY_EOI) {
840 icp->n_rm_notify_eoi++; 836 icp->n_rm_notify_eoi++;
841 kvm_notify_acked_irq(vcpu->kvm, 0, icp->rm_eoied_irq); 837 kvm_notify_acked_irq(vcpu->kvm, 0, icp->rm_eoied_irq);
@@ -920,7 +916,7 @@ static int xics_debug_show(struct seq_file *m, void *private)
920 int icsid, i; 916 int icsid, i;
921 unsigned long flags; 917 unsigned long flags;
922 unsigned long t_rm_kick_vcpu, t_rm_check_resend; 918 unsigned long t_rm_kick_vcpu, t_rm_check_resend;
923 unsigned long t_rm_reject, t_rm_notify_eoi; 919 unsigned long t_rm_notify_eoi;
924 unsigned long t_reject, t_check_resend; 920 unsigned long t_reject, t_check_resend;
925 921
926 if (!kvm) 922 if (!kvm)
@@ -929,7 +925,6 @@ static int xics_debug_show(struct seq_file *m, void *private)
929 t_rm_kick_vcpu = 0; 925 t_rm_kick_vcpu = 0;
930 t_rm_notify_eoi = 0; 926 t_rm_notify_eoi = 0;
931 t_rm_check_resend = 0; 927 t_rm_check_resend = 0;
932 t_rm_reject = 0;
933 t_check_resend = 0; 928 t_check_resend = 0;
934 t_reject = 0; 929 t_reject = 0;
935 930
@@ -952,14 +947,13 @@ static int xics_debug_show(struct seq_file *m, void *private)
952 t_rm_kick_vcpu += icp->n_rm_kick_vcpu; 947 t_rm_kick_vcpu += icp->n_rm_kick_vcpu;
953 t_rm_notify_eoi += icp->n_rm_notify_eoi; 948 t_rm_notify_eoi += icp->n_rm_notify_eoi;
954 t_rm_check_resend += icp->n_rm_check_resend; 949 t_rm_check_resend += icp->n_rm_check_resend;
955 t_rm_reject += icp->n_rm_reject;
956 t_check_resend += icp->n_check_resend; 950 t_check_resend += icp->n_check_resend;
957 t_reject += icp->n_reject; 951 t_reject += icp->n_reject;
958 } 952 }
959 953
960 seq_printf(m, "ICP Guest->Host totals: kick_vcpu=%lu check_resend=%lu reject=%lu notify_eoi=%lu\n", 954 seq_printf(m, "ICP Guest->Host totals: kick_vcpu=%lu check_resend=%lu notify_eoi=%lu\n",
961 t_rm_kick_vcpu, t_rm_check_resend, 955 t_rm_kick_vcpu, t_rm_check_resend,
962 t_rm_reject, t_rm_notify_eoi); 956 t_rm_notify_eoi);
963 seq_printf(m, "ICP Real Mode totals: check_resend=%lu resend=%lu\n", 957 seq_printf(m, "ICP Real Mode totals: check_resend=%lu resend=%lu\n",
964 t_check_resend, t_reject); 958 t_check_resend, t_reject);
965 for (icsid = 0; icsid <= KVMPPC_XICS_MAX_ICS_ID; icsid++) { 959 for (icsid = 0; icsid <= KVMPPC_XICS_MAX_ICS_ID; icsid++) {
diff --git a/arch/powerpc/kvm/book3s_xics.h b/arch/powerpc/kvm/book3s_xics.h
index 2a50320b55ca..1d5fac80b706 100644
--- a/arch/powerpc/kvm/book3s_xics.h
+++ b/arch/powerpc/kvm/book3s_xics.h
@@ -73,7 +73,6 @@ struct kvmppc_icp {
73 */ 73 */
74#define XICS_RM_KICK_VCPU 0x1 74#define XICS_RM_KICK_VCPU 0x1
75#define XICS_RM_CHECK_RESEND 0x2 75#define XICS_RM_CHECK_RESEND 0x2
76#define XICS_RM_REJECT 0x4
77#define XICS_RM_NOTIFY_EOI 0x8 76#define XICS_RM_NOTIFY_EOI 0x8
78 u32 rm_action; 77 u32 rm_action;
79 struct kvm_vcpu *rm_kick_target; 78 struct kvm_vcpu *rm_kick_target;
@@ -84,7 +83,6 @@ struct kvmppc_icp {
84 /* Counters for each reason we exited real mode */ 83 /* Counters for each reason we exited real mode */
85 unsigned long n_rm_kick_vcpu; 84 unsigned long n_rm_kick_vcpu;
86 unsigned long n_rm_check_resend; 85 unsigned long n_rm_check_resend;
87 unsigned long n_rm_reject;
88 unsigned long n_rm_notify_eoi; 86 unsigned long n_rm_notify_eoi;
89 /* Counters for handling ICP processing in real mode */ 87 /* Counters for handling ICP processing in real mode */
90 unsigned long n_check_resend; 88 unsigned long n_check_resend;