SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xhci: fix nec vendor quirk handling

Browse Source 
Only the TYPE_NEC_XHCI controller will have the nec vendor quirks.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 1486382139-30630-4-git-send-email-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2017-02-06 12:55:38 +01:00
parent 72a810f411
commit 2992d6b49c
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/usb/hcd-xhci.c
View File

@ -487,6 +487,8 @@ struct XHCIState {
XHCIInterrupter intr[MAXINTRS]; XHCIInterrupter intr[MAXINTRS];
XHCIRing cmd_ring; XHCIRing cmd_ring;
bool nec_quirks;
}; };
#define TYPE_XHCI "base-xhci" #define TYPE_XHCI "base-xhci"
@ -2745,11 +2747,15 @@ static void xhci_process_commands(XHCIState *xhci)
xhci_via_challenge(xhci, trb.parameter); xhci_via_challenge(xhci, trb.parameter);
break; break;
case CR_VENDOR_NEC_FIRMWARE_REVISION: case CR_VENDOR_NEC_FIRMWARE_REVISION:
if (xhci->nec_quirks) {
event.type = 48; /* NEC reply */ event.type = 48; /* NEC reply */
event.length = 0x3025; event.length = 0x3025;
} else {
event.ccode = CC_TRB_ERROR;
}
break; break;
case CR_VENDOR_NEC_CHALLENGE_RESPONSE: case CR_VENDOR_NEC_CHALLENGE_RESPONSE:
{ if (xhci->nec_quirks) {
uint32_t chi = trb.parameter >> 32; uint32_t chi = trb.parameter >> 32;
uint32_t clo = trb.parameter; uint32_t clo = trb.parameter;
uint32_t val = xhci_nec_challenge(chi, clo); uint32_t val = xhci_nec_challenge(chi, clo);
@ -2757,6 +2763,8 @@ static void xhci_process_commands(XHCIState *xhci)
event.epid = val >> 16; event.epid = val >> 16;
slotid = val >> 24; slotid = val >> 24;
event.type = 48; /* NEC reply */ event.type = 48; /* NEC reply */
} else {
event.ccode = CC_TRB_ERROR;
} }
break; break;
default: default:
@ -3265,9 +3273,12 @@ static void xhci_runtime_write(void *ptr, hwaddr reg,
intr->erstsz = val & 0xffff; intr->erstsz = val & 0xffff;
break; break;
case 0x10: /* ERSTBA low */ case 0x10: /* ERSTBA low */
/* XXX NEC driver bug: it doesn't align this to 64 bytes if (xhci->nec_quirks) {
intr->erstba_low = val & 0xffffffc0; */ /* NEC driver bug: it doesn't align this to 64 bytes */
intr->erstba_low = val & 0xfffffff0; intr->erstba_low = val & 0xfffffff0;
} else {
intr->erstba_low = val & 0xffffffc0;
}
break; break;
case 0x14: /* ERSTBA high */ case 0x14: /* ERSTBA high */
intr->erstba_high = val; intr->erstba_high = val;
@ -3562,6 +3573,9 @@ static void usb_xhci_realize(struct PCIDevice *dev, Error **errp)
dev->config[PCI_CACHE_LINE_SIZE] = 0x10; dev->config[PCI_CACHE_LINE_SIZE] = 0x10;
dev->config[0x60] = 0x30; /* release number */ dev->config[0x60] = 0x30; /* release number */
if (strcmp(object_get_typename(OBJECT(dev)), TYPE_NEC_XHCI) == 0) {
xhci->nec_quirks = true;
}
if (xhci->numintrs > MAXINTRS) { if (xhci->numintrs > MAXINTRS) {
xhci->numintrs = MAXINTRS; xhci->numintrs = MAXINTRS;
} }