[Qemu-trivial] Bug #757654: UHCI fails to signal stall response patch

qemu-trivial.nongnu.org archive mirror
 help / color / mirror / Atom feed

* [Qemu-trivial] Bug #757654: UHCI fails to signal stall response patch
@ 2011-04-15 20:57 Jan Vesely
  2011-05-05 12:05 ` [Qemu-trivial] [Qemu-devel] " Gerd Hoffmann
  0 siblings, 1 reply; 8+ messages in thread
From: Jan Vesely @ 2011-04-15 20:57 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial

Hi,

I'm sending a patch for bug #757654. The bug does not really break
anything it just makes USB error detection harder.
It's a quick fix and might need some polishing but it works (I am
currently using it).

thx,
jan

PS: I guess you need this line:
Signed-off-by: Jan Vesely <jano.vesely@gmail.com>

diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c
index 346db3e..a51d89b 100644
--- a/hw/usb-uhci.c
+++ b/hw/usb-uhci.c
@@ -732,11 +732,21 @@ out:
     case USB_RET_STALL:
         td->ctrl |= TD_CTRL_STALL;
         td->ctrl &= ~TD_CTRL_ACTIVE;
+        s->status |= UHCI_STS_USBERR;
+        *int_mask |= 0x02;
+        if (td->ctrl & TD_CTRL_IOC)
+            *int_mask |= 0x01;
+        uhci_update_irq(s);
         return 1;

     case USB_RET_BABBLE:
         td->ctrl |= TD_CTRL_BABBLE | TD_CTRL_STALL;
         td->ctrl &= ~TD_CTRL_ACTIVE;
+        s->status |= UHCI_STS_USBERR;
+        *int_mask |= 0x02;
+        if (td->ctrl & TD_CTRL_IOC)
+           *int_mask |= 0x01;
+        uhci_update_irq(s);
         /* frame interrupted */
         return -1;


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [Qemu-trivial] [Qemu-devel] Bug #757654: UHCI fails to signal stall response patch
  2011-04-15 20:57 [Qemu-trivial] Bug #757654: UHCI fails to signal stall response patch Jan Vesely
@ 2011-05-05 12:05 ` Gerd Hoffmann
  2011-05-06  8:07   ` Jan Vesely
  0 siblings, 1 reply; 8+ messages in thread
From: Gerd Hoffmann @ 2011-05-05 12:05 UTC (permalink / raw)
  To: Jan Vesely; +Cc: qemu-trivial, qemu-devel

> diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c
> index 346db3e..a51d89b 100644
> --- a/hw/usb-uhci.c
> +++ b/hw/usb-uhci.c
> @@ -732,11 +732,21 @@ out:
>       case USB_RET_STALL:
>           td->ctrl |= TD_CTRL_STALL;
>           td->ctrl&= ~TD_CTRL_ACTIVE;
> +        s->status |= UHCI_STS_USBERR;

Just this line should be enougth.

>       case USB_RET_BABBLE:
>           td->ctrl |= TD_CTRL_BABBLE | TD_CTRL_STALL;
>           td->ctrl&= ~TD_CTRL_ACTIVE;
> +        s->status |= UHCI_STS_USBERR;

Likewise.

Tried that?

cheers,
   Gerd



^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [Qemu-trivial] [Qemu-devel] Bug #757654: UHCI fails to signal stall response patch
  2011-05-05 12:05 ` [Qemu-trivial] [Qemu-devel] " Gerd Hoffmann
@ 2011-05-06  8:07   ` Jan Vesely
  2011-05-09  7:55     ` Gerd Hoffmann
  0 siblings, 1 reply; 8+ messages in thread
From: Jan Vesely @ 2011-05-06  8:07 UTC (permalink / raw)
  To: Gerd Hoffmann; +Cc: qemu-trivial, qemu-devel

hi,
using the modified (single line) patch only works half-way, it sets
the value in status register (guess that's what that line does :))
but hw interrupt is not generated.

I tried adding uhci_update_irq and this patch:

diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c
index a65e0b3..1e9c1e7 100644
--- a/hw/usb-uhci.c
+++ b/hw/usb-uhci.c
@@ -702,11 +702,15 @@ out:
     case USB_RET_STALL:
         td->ctrl |= TD_CTRL_STALL;
         td->ctrl &= ~TD_CTRL_ACTIVE;
+        s->status |= UHCI_STS_USBERR;
+        uhci_update_irq(s);
         return 1;

     case USB_RET_BABBLE:
         td->ctrl |= TD_CTRL_BABBLE | TD_CTRL_STALL;
         td->ctrl &= ~TD_CTRL_ACTIVE;
+        s->status |= UHCI_STS_USBERR;
+        uhci_update_irq(s);
         /* frame interrupted */
         return -1;

works.

jan

On Thu, May 5, 2011 at 2:05 PM, Gerd Hoffmann <kraxel@redhat.com> wrote:
>> diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c
>> index 346db3e..a51d89b 100644
>> --- a/hw/usb-uhci.c
>> +++ b/hw/usb-uhci.c
>> @@ -732,11 +732,21 @@ out:
>>      case USB_RET_STALL:
>>          td->ctrl |= TD_CTRL_STALL;
>>          td->ctrl&= ~TD_CTRL_ACTIVE;
>> +        s->status |= UHCI_STS_USBERR;
>
> Just this line should be enougth.
>
>>      case USB_RET_BABBLE:
>>          td->ctrl |= TD_CTRL_BABBLE | TD_CTRL_STALL;
>>          td->ctrl&= ~TD_CTRL_ACTIVE;
>> +        s->status |= UHCI_STS_USBERR;
>
> Likewise.
>
> Tried that?
>
> cheers,
>  Gerd
>
>


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [Qemu-trivial] [Qemu-devel] Bug #757654: UHCI fails to signal stall response patch
  2011-05-06  8:07   ` Jan Vesely
@ 2011-05-09  7:55     ` Gerd Hoffmann
  2011-05-09 10:16       ` Jan Vesely
  0 siblings, 1 reply; 8+ messages in thread
From: Gerd Hoffmann @ 2011-05-09  7:55 UTC (permalink / raw)
  To: Jan Vesely; +Cc: qemu-trivial, qemu-devel

On 05/06/11 10:07, Jan Vesely wrote:
> hi,
> using the modified (single line) patch only works half-way, it sets
> the value in status register (guess that's what that line does :))
> but hw interrupt is not generated.
>
> I tried adding uhci_update_irq and this patch:

> +        s->status |= UHCI_STS_USBERR;
> +        uhci_update_irq(s);

> works.

Good.  Can you create a patch with a changelog entry & signed-off 
please?  I'll go queue it up then.

thanks,
   Gerd



^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [Qemu-trivial] [Qemu-devel] Bug #757654: UHCI fails to signal stall response patch
  2011-05-09  7:55     ` Gerd Hoffmann
@ 2011-05-09 10:16       ` Jan Vesely
  2011-05-09 11:43         ` Gerd Hoffmann
  0 siblings, 1 reply; 8+ messages in thread
From: Jan Vesely @ 2011-05-09 10:16 UTC (permalink / raw)
  To: Gerd Hoffmann; +Cc: qemu-trivial, qemu-devel

UHCI host controller status register indicates error and
an interrupt is triggered on BABBLE and STALL errors.

Signed-off-by: Jan Vesely <jano.vesely@gmail.com>
---
 hw/usb-uhci.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c
index a65e0b3..1e9c1e7 100644
--- a/hw/usb-uhci.c
+++ b/hw/usb-uhci.c
@@ -702,11 +702,15 @@ out:
     case USB_RET_STALL:
         td->ctrl |= TD_CTRL_STALL;
         td->ctrl &= ~TD_CTRL_ACTIVE;
+        s->status |= UHCI_STS_USBERR;
+        uhci_update_irq(s);
         return 1;

     case USB_RET_BABBLE:
         td->ctrl |= TD_CTRL_BABBLE | TD_CTRL_STALL;
         td->ctrl &= ~TD_CTRL_ACTIVE;
+        s->status |= UHCI_STS_USBERR;
+        uhci_update_irq(s);
         /* frame interrupted */
         return -1;

-- 
1.7.3.4


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [Qemu-trivial] [Qemu-devel] Bug #757654: UHCI fails to signal stall response patch
  2011-05-09 10:16       ` Jan Vesely
@ 2011-05-09 11:43         ` Gerd Hoffmann
  2011-05-11 11:33           ` Jan Vesely
  0 siblings, 1 reply; 8+ messages in thread
From: Gerd Hoffmann @ 2011-05-09 11:43 UTC (permalink / raw)
  To: Jan Vesely; +Cc: qemu-trivial, qemu-devel

On 05/09/11 12:16, Jan Vesely wrote:
> UHCI host controller status register indicates error and
> an interrupt is triggered on BABBLE and STALL errors.

Queued up.

thanks,
   Gerd



^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [Qemu-trivial] [Qemu-devel] Bug #757654: UHCI fails to signal stall response patch
  2011-05-09 11:43         ` Gerd Hoffmann
@ 2011-05-11 11:33           ` Jan Vesely
  2011-05-12  9:28             ` Gerd Hoffmann
  0 siblings, 1 reply; 8+ messages in thread
From: Jan Vesely @ 2011-05-11 11:33 UTC (permalink / raw)
  To: Gerd Hoffmann; +Cc: qemu-trivial, qemu-devel

glad I could help

the original bug report is here: https://bugs.launchpad.net/qemu/+bug/757654
should I update it? or will it be updated when the patch reaches master?

j.

On Mon, May 9, 2011 at 1:43 PM, Gerd Hoffmann <kraxel@redhat.com> wrote:
> On 05/09/11 12:16, Jan Vesely wrote:
>>
>> UHCI host controller status register indicates error and
>> an interrupt is triggered on BABBLE and STALL errors.
>
> Queued up.
>
> thanks,
>  Gerd
>
>


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [Qemu-trivial] [Qemu-devel] Bug #757654: UHCI fails to signal stall response patch
  2011-05-11 11:33           ` Jan Vesely
@ 2011-05-12  9:28             ` Gerd Hoffmann
  0 siblings, 0 replies; 8+ messages in thread
From: Gerd Hoffmann @ 2011-05-12  9:28 UTC (permalink / raw)
  To: Jan Vesely; +Cc: qemu-trivial, qemu-devel

On 05/11/11 13:33, Jan Vesely wrote:
> glad I could help
>
> the original bug report is here: https://bugs.launchpad.net/qemu/+bug/757654
> should I update it? or will it be updated when the patch reaches master?

Better wait until the stuff hits master, that is less confusing and you 
can also add the git commit hash then.

cheers,
   Gerd



^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2011-05-12  9:28 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-15 20:57 [Qemu-trivial] Bug #757654: UHCI fails to signal stall response patch Jan Vesely
2011-05-05 12:05 ` [Qemu-trivial] [Qemu-devel] " Gerd Hoffmann
2011-05-06  8:07   ` Jan Vesely
2011-05-09  7:55     ` Gerd Hoffmann
2011-05-09 10:16       ` Jan Vesely
2011-05-09 11:43         ` Gerd Hoffmann
2011-05-11 11:33           ` Jan Vesely
2011-05-12  9:28             ` Gerd Hoffmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).