KVM: PPC: Book 3S: XICS cleanup: remove XICS_RM_REJECT

Commit b0221556dbd3 ("KVM: PPC: Book3S HV: Move virtual mode ICP functions
 to real-mode") removed the setting of the XICS_RM_REJECT flag. And
since that commit, nothing else sets the flag any more, so we can remove
the flag and the remaining code that handles it, including the counter
that counts how many times it get set.

Signed-off-by: Li Zhong <zhong@linux.vnet.ibm.com>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>

diff --git a/arch/powerpc/kvm/book3s_xics.c b/arch/powerpc/kvm/book3s_xics.c
index 20dff102a06fb01ea94171438ebd540447dc5c18..debda779a240ada27059f30736f69e39c7a33f18 100644 (file)
--- 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)
                icp->n_rm_check_resend++;
                icp_check_resend(xics, icp->rm_resend_icp);
        }
-       if (icp->rm_action & XICS_RM_REJECT) {
-               icp->n_rm_reject++;
-               icp_deliver_irq(xics, icp, icp->rm_reject);
-       }
        if (icp->rm_action & XICS_RM_NOTIFY_EOI) {
                icp->n_rm_notify_eoi++;
                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)
        int icsid, i;
        unsigned long flags;
        unsigned long t_rm_kick_vcpu, t_rm_check_resend;
-       unsigned long t_rm_reject, t_rm_notify_eoi;
+       unsigned long t_rm_notify_eoi;
        unsigned long t_reject, t_check_resend;
 
        if (!kvm)
@@ -929,7 +925,6 @@ static int xics_debug_show(struct seq_file *m, void *private)
        t_rm_kick_vcpu = 0;
        t_rm_notify_eoi = 0;
        t_rm_check_resend = 0;
-       t_rm_reject = 0;
        t_check_resend = 0;
        t_reject = 0;
 
@@ -952,14 +947,13 @@ static int xics_debug_show(struct seq_file *m, void *private)
                t_rm_kick_vcpu += icp->n_rm_kick_vcpu;
                t_rm_notify_eoi += icp->n_rm_notify_eoi;
                t_rm_check_resend += icp->n_rm_check_resend;
-               t_rm_reject += icp->n_rm_reject;
                t_check_resend += icp->n_check_resend;
                t_reject += icp->n_reject;
        }
 
-       seq_printf(m, "ICP Guest->Host totals: kick_vcpu=%lu check_resend=%lu reject=%lu notify_eoi=%lu\n",
+       seq_printf(m, "ICP Guest->Host totals: kick_vcpu=%lu check_resend=%lu notify_eoi=%lu\n",
                        t_rm_kick_vcpu, t_rm_check_resend,
-                       t_rm_reject, t_rm_notify_eoi);
+                       t_rm_notify_eoi);
        seq_printf(m, "ICP Real Mode totals: check_resend=%lu resend=%lu\n",
                        t_check_resend, t_reject);
        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 2a50320b55ca62a023ccd49c809b1d9c393eac08..1d5fac80b7067ba7abff34b42cd74a265be0917b 100644 (file)
--- a/arch/powerpc/kvm/book3s_xics.h
+++ b/arch/powerpc/kvm/book3s_xics.h
@@ -73,7 +73,6 @@ struct kvmppc_icp {
         */
 #define XICS_RM_KICK_VCPU      0x1
 #define XICS_RM_CHECK_RESEND   0x2
-#define XICS_RM_REJECT         0x4
 #define XICS_RM_NOTIFY_EOI     0x8
        u32 rm_action;
        struct kvm_vcpu *rm_kick_target;
@@ -84,7 +83,6 @@ struct kvmppc_icp {
        /* Counters for each reason we exited real mode */
        unsigned long n_rm_kick_vcpu;
        unsigned long n_rm_check_resend;
-       unsigned long n_rm_reject;
        unsigned long n_rm_notify_eoi;
        /* Counters for handling ICP processing in real mode */
        unsigned long n_check_resend;