[Qemu-devel] ehci fixes

[Qemu-devel] ehci fixes

[Vincent Palatin]

Dear developers,

While using the EHCI patchset, I have found 2 minor issues.
So, I send in this email thread 2 fix proposals.

Those patches apply on top of the Jan Kiszka's ehci branch.
Thanks to Jan and David for gathering and updating this patchset.

--
Vincent

[Qemu-devel] [PATCH 1/2] ehci: Fix error detection when registering a new list base address

[Vincent Palatin]

We must check against the current running command not the list address.

Signed-off-by: Vincent Palatin <vincent.palatin_qemu@m4x.org>
---
 hw/usb-ehci.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c
index 8be0780..e724653 100644
--- a/hw/usb-ehci.c
+++ b/hw/usb-ehci.c
@@ -774,7 +774,7 @@ static void ehci_mem_writel(void *ptr, target_phys_addr_t addr, uint32_t val)
         break;
 
     case PERIODICLISTBASE:
-        if (val & USBCMD_PSE) {
+        if (s->usbcmd & USBCMD_PSE) {
             fprintf(stderr, "Guest OS should not be setting the periodic"
                    " list base register while periodic schedule is enabled\n");
             return;
@@ -783,7 +783,7 @@ static void ehci_mem_writel(void *ptr, target_phys_addr_t addr, uint32_t val)
         break;
 
     case ASYNCLISTADDR:
-        if (val & USBCMD_ASE) {
+        if (s->usbcmd & USBCMD_ASE) {
             fprintf(stderr, "Guest OS should not be setting the async list"
                    " address register while async schedule is enabled\n");
             return;
-- 
1.5.6.5

[Qemu-devel] [PATCH 2/2] ehci: Fix debug traces

[Vincent Palatin]

- fix build error when activating traces
- properly display the config flags register

Signed-off-by: Vincent Palatin <vincent.palatin_qemu@m4x.org>
---
 hw/usb-ehci.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c
index e724653..ab9a23e 100644
--- a/hw/usb-ehci.c
+++ b/hw/usb-ehci.c
@@ -469,6 +469,10 @@ static const char *addr2str(unsigned addr)
         case PORTSC_BEGIN ... PORTSC_END:
             r = "PORT STATUS";
             break;
+
+        case CONFIGFLAG:
+            r = "CONFIG FLAG";
+            break;
     }
 
     return r;
@@ -1956,7 +1960,7 @@ static void ehci_map(PCIDevice *pci_dev, int region_num,
 {
     EHCIState *s =(EHCIState *)pci_dev;
 
-    DPRINTF("ehci_map: region %d, addr %08lX, size %ld, s->mem %08X\n",
+    DPRINTF("ehci_map: region %d, addr %08llX, size %lld, s->mem %08X\n",
             region_num, addr, size, s->mem);
     s->mem_base = addr;
     cpu_register_physical_memory(addr, size, s->mem);
-- 
1.5.6.5

[Qemu-devel] Re: ehci fixes

[David S. Ahern]

On 05/09/2010 08:32 PM, Vincent Palatin wrote:
> Dear developers,
> 
> While using the EHCI patchset, I have found 2 minor issues.
> So, I send in this email thread 2 fix proposals.

Changes look good to me.

Are you looking at any particular device or EHCI in general?

David


> 
> Those patches apply on top of the Jan Kiszka's ehci branch.
> Thanks to Jan and David for gathering and updating this patchset.
> 
> --
> Vincent
> 
> 

Re: [Qemu-devel] Re: ehci fixes

[Vincent Palatin]

On Sun, 09 May 2010 20:36:03 -0600
"David S. Ahern" <daahern@cisco.com> wrote:

> > While using the EHCI patchset, I have found 2 minor issues.
> > So, I send in this email thread 2 fix proposals.
> 
> Changes look good to me.
> 
> Are you looking at any particular device or EHCI in general?

I'm just using it to exercise/debug EHCI bootloader code mainly with
mass storage and CDC ACM devices.


-- 
Vincent

[Qemu-devel] Re: ehci fixes

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 230 bytes --]

Vincent Palatin wrote:
> Dear developers,
> 
> While using the EHCI patchset, I have found 2 minor issues.
> So, I send in this email thread 2 fix proposals.

Thanks, merged both and pushed an updated ehci branch.

Jan


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 257 bytes --]