From 3bf435b656390f75ce8b8990f7484efb162472c9 Mon Sep 17 00:00:00 2001

From: Gerd Hoffmann <kraxel@redhat.com>

Date: Thu, 30 Aug 2012 13:05:10 +0200

Subject: [PATCH] xhci: rework interrupt handling

Split xhci_irq_update into a function which handles intx updates

(including lowering the irq line once the guests acks the interrupt)

and one which is used for raising an irq only.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

---

 hw/usb/hcd-xhci.c | 47 +++++++++++++++++++++++++++++++++--------------

 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c

index d2e6ee6..1857f42 100644

--- a/hw/usb/hcd-xhci.c

+++ b/hw/usb/hcd-xhci.c

@@ -612,24 +612,43 @@ static XHCIPort *xhci_lookup_port(XHCIState *xhci, struct USBPort *uport)

     return &xhci->ports[index];

 }

-static void xhci_irq_update(XHCIState *xhci)

+static void xhci_intx_update(XHCIState *xhci)

 {

     int level = 0;

-    if (xhci->iman & IMAN_IP && xhci->iman & IMAN_IE &&

+    if (msi_enabled(&xhci->pci_dev)) {

+        return;

+    }

+

+    if (xhci->iman & IMAN_IP &&

+        xhci->iman & IMAN_IE &&

         xhci->usbcmd & USBCMD_INTE) {

         level = 1;

     }

+    trace_usb_xhci_irq_intx(level);

+    qemu_set_irq(xhci->irq, level);

+}

+

+static void xhci_intr_raise(XHCIState *xhci)

+{

+    if (!(xhci->iman & IMAN_IP) ||

+        !(xhci->iman & IMAN_IE)) {

+        return;

+    }

+

+    if (!(xhci->usbcmd & USBCMD_INTE)) {

+        return;

+    }

+

     if (msi_enabled(&xhci->pci_dev)) {

-        if (level) {

-            trace_usb_xhci_irq_msi(0);

-            msi_notify(&xhci->pci_dev, 0);

-        }

-    } else {

-        trace_usb_xhci_irq_intx(level);

-        qemu_set_irq(xhci->irq, level);

+        trace_usb_xhci_irq_msi(0);

+        msi_notify(&xhci->pci_dev, 0);

+        return;

     }

+

+    trace_usb_xhci_irq_intx(1);

+    qemu_set_irq(xhci->irq, 1);

 }

 static inline int xhci_running(XHCIState *xhci)

@@ -732,7 +751,7 @@ static void xhci_events_update(XHCIState *xhci)

         xhci->erdp_low |= ERDP_EHB;

         xhci->iman |= IMAN_IP;

         xhci->usbsts |= USBSTS_EINT;

-        xhci_irq_update(xhci);

+        xhci_intr_raise(xhci);

     }

     if (xhci->er_full && xhci->ev_buffer_put == xhci->ev_buffer_get) {

@@ -796,7 +815,7 @@ static void xhci_event(XHCIState *xhci, XHCIEvent *event)

     xhci->iman |= IMAN_IP;

     xhci->usbsts |= USBSTS_EINT;

-    xhci_irq_update(xhci);

+    xhci_intr_raise(xhci);

 }

 static void xhci_ring_init(XHCIState *xhci, XHCIRing *ring,

@@ -2479,13 +2498,13 @@ static void xhci_oper_write(XHCIState *xhci, uint32_t reg, uint32_t val)

         if (val & USBCMD_HCRST) {

             xhci_reset(&xhci->pci_dev.qdev);

         }

-        xhci_irq_update(xhci);

+        xhci_intx_update(xhci);

         break;

     case 0x04: /* USBSTS */

         /* these bits are write-1-to-clear */

         xhci->usbsts &= ~(val & (USBSTS_HSE|USBSTS_EINT|USBSTS_PCD|USBSTS_SRE));

-        xhci_irq_update(xhci);

+        xhci_intx_update(xhci);

         break;

     case 0x14: /* DNCTRL */

@@ -2570,7 +2589,7 @@ static void xhci_runtime_write(XHCIState *xhci, uint32_t reg, uint32_t val)

         }

         xhci->iman &= ~IMAN_IE;

         xhci->iman |= val & IMAN_IE;

-        xhci_irq_update(xhci);

+        xhci_intx_update(xhci);

         break;

     case 0x24: /* IMOD */

         xhci->imod = val;

-- 

1.7.12.1