KVM: PPC: Move xics_debugfs_init out of create

[linux-2.6-block.git] / arch / powerpc / kvm / book3s_xics.c

diff --git a/arch/powerpc/kvm/book3s_xics.c b/arch/powerpc/kvm/book3s_xics.c
index 46871d554057a7e841af248d09e05779513b9506..f2def8e45fef1321c579c8dcc224ded4ff351ce9 100644 (file)
--- a/arch/powerpc/kvm/book3s_xics.c
+++ b/arch/powerpc/kvm/book3s_xics.c
@@ -92,7 +92,7 @@ static int ics_deliver_irq(struct kvmppc_xics *xics, u32 irq, u32 level)
         * we are the only setter, thus concurrent access is undefined
         * to begin with.
         */
-       if (level == 1 || level == KVM_INTERRUPT_SET_LEVEL)
+       if ((level == 1 && state->lsi) || level == KVM_INTERRUPT_SET_LEVEL)
                state->asserted = 1;
        else if (level == 0 || level == KVM_INTERRUPT_UNSET) {
                state->asserted = 0;
@@ -280,7 +280,7 @@ static inline bool icp_try_update(struct kvmppc_icp *icp,
        if (!success)
                goto bail;
 
-       XICS_DBG("UPD [%04x] - C:%02x M:%02x PP: %02x PI:%06x R:%d O:%d\n",
+       XICS_DBG("UPD [%04lx] - C:%02x M:%02x PP: %02x PI:%06x R:%d O:%d\n",
                 icp->server_num,
                 old.cppr, old.mfrr, old.pending_pri, old.xisr,
                 old.need_resend, old.out_ee);
@@ -336,7 +336,7 @@ static bool icp_try_to_deliver(struct kvmppc_icp *icp, u32 irq, u8 priority,
        union kvmppc_icp_state old_state, new_state;
        bool success;
 
-       XICS_DBG("try deliver %#x(P:%#x) to server %#x\n", irq, priority,
+       XICS_DBG("try deliver %#x(P:%#x) to server %#lx\n", irq, priority,
                 icp->server_num);
 
        do {
@@ -1174,9 +1174,11 @@ static int xics_get_source(struct kvmppc_xics *xics, long irq, u64 addr)
                        prio = irqp->saved_priority;
                }
                val |= prio << KVM_XICS_PRIORITY_SHIFT;
-               if (irqp->asserted)
-                       val |= KVM_XICS_LEVEL_SENSITIVE | KVM_XICS_PENDING;
-               else if (irqp->masked_pending || irqp->resend)
+               if (irqp->lsi) {
+                       val |= KVM_XICS_LEVEL_SENSITIVE;
+                       if (irqp->asserted)
+                               val |= KVM_XICS_PENDING;
+               } else if (irqp->masked_pending || irqp->resend)
                        val |= KVM_XICS_PENDING;
                ret = 0;
        }
@@ -1228,9 +1230,13 @@ static int xics_set_source(struct kvmppc_xics *xics, long irq, u64 addr)
        irqp->priority = prio;
        irqp->resend = 0;
        irqp->masked_pending = 0;
+       irqp->lsi = 0;
        irqp->asserted = 0;
-       if ((val & KVM_XICS_PENDING) && (val & KVM_XICS_LEVEL_SENSITIVE))
-               irqp->asserted = 1;
+       if (val & KVM_XICS_LEVEL_SENSITIVE) {
+               irqp->lsi = 1;
+               if (val & KVM_XICS_PENDING)
+                       irqp->asserted = 1;
+       }
        irqp->exists = 1;
        arch_spin_unlock(&ics->lock);
        local_irq_restore(flags);
@@ -1249,11 +1255,10 @@ int kvm_set_irq(struct kvm *kvm, int irq_source_id, u32 irq, int level,
        return ics_deliver_irq(xics, irq, level);
 }
 
-int kvm_set_msi(struct kvm_kernel_irq_routing_entry *irq_entry, struct kvm *kvm,
-               int irq_source_id, int level, bool line_status)
+int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *irq_entry,
+                             struct kvm *kvm, int irq_source_id,
+                             int level, bool line_status)
 {
-       if (!level)
-               return -1;
        return kvm_set_irq(kvm, irq_source_id, irq_entry->gsi,
                           level, line_status);
 }
@@ -1336,8 +1341,6 @@ static int kvmppc_xics_create(struct kvm_device *dev, u32 type)
                return ret;
        }
 
-       xics_debugfs_init(xics);
-
 #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
        if (cpu_has_feature(CPU_FTR_ARCH_206)) {
                /* Enable real mode support */
@@ -1349,9 +1352,17 @@ static int kvmppc_xics_create(struct kvm_device *dev, u32 type)
        return 0;
 }
 
+static void kvmppc_xics_init(struct kvm_device *dev)
+{
+       struct kvmppc_xics *xics = (struct kvmppc_xics *)dev->private;
+
+       xics_debugfs_init(xics);
+}
+
 struct kvm_device_ops kvm_xics_ops = {
        .name = "kvm-xics",
        .create = kvmppc_xics_create,
+       .init = kvmppc_xics_init,
        .destroy = kvmppc_xics_free,
        .set_attr = xics_set_attr,
        .get_attr = xics_get_attr,