From 48dbbecb0b010ff1c6a64a3a18a7272cce314bf8 Mon Sep 17 00:00:00 2001

From: Hans de Goede <hdegoede@redhat.com>

Date: Wed, 12 Sep 2012 15:08:40 +0200

Subject: [PATCH] uhci: Don't queue up packets after one with the SPD flag set

Don't queue up packets after a packet with the SPD (short packet detect)

flag set. Since we won't know if the packet will actually be short until it

has completed, and if it is short we should stop the queue.

This fixes a miniature photoframe emulating a USB cdrom with the windows

software for it not working.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>

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

(cherry picked from commit 72a04d0c178f01908d74539230d9de64ffc6da19)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

---

 hw/usb/hcd-uhci.c | 5 ++++-

 1 file changed, 4 insertions(+), 1 deletion(-)

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

index c7c8786..cdc8bc3 100644

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

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

@@ -1000,6 +1000,9 @@ static void uhci_fill_queue(UHCIState *s, UHCI_TD *td)

         }

         assert(ret == TD_RESULT_ASYNC_START);

         assert(int_mask == 0);

+        if (ptd.ctrl & TD_CTRL_SPD) {

+            break;

+        }

         plink = ptd.link;

     }

 }

@@ -1097,7 +1100,7 @@ static void uhci_process_frame(UHCIState *s)

         case TD_RESULT_ASYNC_START:

             trace_usb_uhci_td_async(curr_qh & ~0xf, link & ~0xf);

-            if (is_valid(td.link)) {

+            if (is_valid(td.link) && !(td.ctrl & TD_CTRL_SPD)) {

                 uhci_fill_queue(s, &td);

             }

             link = curr_qh ? qh.link : td.link;

-- 

1.7.12.1