mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ehci: fix ehci_qh_do_overlay

Browse Source 
Use ehci_flush_qh to make sure we touch inly the fields the hc is
allowed to touch.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2012-06-19 16:23:32 +02:00
parent 84988cf910
commit a5e0139ab6
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
hw/usb/hcd-ehci.c
View File

@ -1246,6 +1246,23 @@ static inline int put_dwords(EHCIState *ehci, uint32_t addr,
return 1; return 1;
} }
/*
* Write the qh back to guest physical memory. This step isn't
* in the EHCI spec but we need to do it since we don't share
* physical memory with our guest VM.
*
* The first three dwords are read-only for the EHCI, so skip them
* when writing back the qh.
*/
static void ehci_flush_qh(EHCIQueue *q)
{
uint32_t *qh = (uint32_t *) &q->qh;
uint32_t dwords = sizeof(EHCIqh) >> 2;
uint32_t addr = NLPTR_GET(q->qhaddr);
put_dwords(q->ehci, addr + 3 * sizeof(uint32_t), qh + 3, dwords - 3);
}
// 4.10.2 // 4.10.2
static int ehci_qh_do_overlay(EHCIQueue *q) static int ehci_qh_do_overlay(EHCIQueue *q)
@ -1293,8 +1310,7 @@ static int ehci_qh_do_overlay(EHCIQueue *q)
q->qh.bufptr[1] &= ~BUFPTR_CPROGMASK_MASK; q->qh.bufptr[1] &= ~BUFPTR_CPROGMASK_MASK;
q->qh.bufptr[2] &= ~BUFPTR_FRAMETAG_MASK; q->qh.bufptr[2] &= ~BUFPTR_FRAMETAG_MASK;
put_dwords(q->ehci, NLPTR_GET(q->qhaddr), (uint32_t *) &q->qh, ehci_flush_qh(q);
sizeof(EHCIqh) >> 2);
return 0; return 0;
} }
@ -1600,23 +1616,6 @@ static int ehci_process_itd(EHCIState *ehci,
} }
/*
* Write the qh back to guest physical memory. This step isn't
* in the EHCI spec but we need to do it since we don't share
* physical memory with our guest VM.
*
* The first three dwords are read-only for the EHCI, so skip them
* when writing back the qh.
*/
static void ehci_flush_qh(EHCIQueue *q)
{
uint32_t *qh = (uint32_t *) &q->qh;
uint32_t dwords = sizeof(EHCIqh) >> 2;
uint32_t addr = NLPTR_GET(q->qhaddr);
put_dwords(q->ehci, addr + 3 * sizeof(uint32_t), qh + 3, dwords - 3);
}
/* This state is the entry point for asynchronous schedule /* This state is the entry point for asynchronous schedule
* processing. Entry here consitutes a EHCI start event state (4.8.5) * processing. Entry here consitutes a EHCI start event state (4.8.5)
*/ */