github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-28 16:27:01 +00:00
Code Issues Projects Releases Wiki Activity

DM USB: xHCI: change log level for S3 process

Browse Source 
The USB S3 virtualization logic is complicated and heavily affected by system
timing. To make the debugging work easily, change related log level to facilitate
quick bug fixing.

Tracked-On: #1893
Signed-off-by: Xiaoguang Wu <xiaoguang.wu@intel.com>
Reviewed-by: Liang Yang <liang3.yang@intel.com>
Acked-by: Yu Wang <yu1.wang@intel.com>
This commit is contained in:
Xiaoguang Wu 2018-12-14 19:13:15 +08:00 committed by wenlingz
parent 3dadb62d0f
commit 1c3344b782
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
devicemodel/hw/pci/xhci.c
View File

@ -758,12 +758,12 @@ pci_xhci_native_usb_dev_conn_cb(void *hci_data, void *dev_data)
di = dev_data; di = dev_data;
/* print physical information about new device */ /* print physical information about new device */
UPRINTF(LDBG, "%04x:%04x %d-%s connecting.\r\n", di->vid, di->pid, UPRINTF(LINF, "%04x:%04x %d-%s connecting.\r\n", di->vid, di->pid,
di->path.bus, usb_dev_path(&di->path)); di->path.bus, usb_dev_path(&di->path));
index = pci_xhci_get_native_port_index_by_path(xdev, &di->path); index = pci_xhci_get_native_port_index_by_path(xdev, &di->path);
if (index < 0) { if (index < 0) {
UPRINTF(LDBG, "%04x:%04x %d-%s doesn't belong to this" UPRINTF(LINF, "%04x:%04x %d-%s doesn't belong to this"
" vm, bye.\r\n", di->vid, di->pid, " vm, bye.\r\n", di->vid, di->pid,
di->path.bus, usb_dev_path(&di->path)); di->path.bus, usb_dev_path(&di->path));
return 0; return 0;
@ -808,7 +808,7 @@ pci_xhci_native_usb_dev_conn_cb(void *hci_data, void *dev_data)
xdev->native_ports[index].info = *di; xdev->native_ports[index].info = *di;
xdev->native_ports[index].state = VPORT_CONNECTED; xdev->native_ports[index].state = VPORT_CONNECTED;
UPRINTF(LDBG, "%04X:%04X %d-%s is attached to virtual port %d.\r\n", UPRINTF(LINF, "%04X:%04X %d-%s is attached to virtual port %d.\r\n",
di->vid, di->pid, di->path.bus, di->vid, di->pid, di->path.bus,
usb_dev_path(&di->path), vport); usb_dev_path(&di->path), vport);
@ -910,7 +910,8 @@ pci_xhci_native_usb_dev_disconn_cb(void *hci_data, void *dev_data)
xdev->native_ports[index].state = VPORT_ASSIGNED; xdev->native_ports[index].state = VPORT_ASSIGNED;
xdev->native_ports[index].vport = 0; xdev->native_ports[index].vport = 0;
UPRINTF(LDBG, "report virtual port %d status %d\r\n", vport, state); UPRINTF(LINF, "disconnect device %d-%s on vport %d with state %d\r\n",
di->path.bus, usb_dev_path(&di->path), vport, state);
if (pci_xhci_disconnect_port(xdev, vport, need_intr)) { if (pci_xhci_disconnect_port(xdev, vport, need_intr)) {
UPRINTF(LFTL, "fail to report event\r\n"); UPRINTF(LFTL, "fail to report event\r\n");
return -1; return -1;
@ -1732,7 +1733,7 @@ pci_xhci_cmd_enable_slot(struct pci_xhci_vdev *xdev, uint32_t *slot)
*slot = i; *slot = i;
} }
UPRINTF(LDBG, "enable slot (error=%d) return slot %u\r\n", UPRINTF(LINF, "enable slot (error=%d) return slot %u\r\n",
cmderr != XHCI_TRB_ERROR_SUCCESS, *slot); cmderr != XHCI_TRB_ERROR_SUCCESS, *slot);
return cmderr; return cmderr;
} }
@ -1747,7 +1748,7 @@ pci_xhci_cmd_disable_slot(struct pci_xhci_vdev *xdev, uint32_t slot)
uint32_t cmderr; uint32_t cmderr;
int i, j, index; int i, j, index;
UPRINTF(LDBG, "pci_xhci disable slot %u\r\n", slot); UPRINTF(LINF, "pci_xhci disable slot %u\r\n", slot);
cmderr = XHCI_TRB_ERROR_NO_SLOTS; cmderr = XHCI_TRB_ERROR_NO_SLOTS;
if (xdev->portregs == NULL) if (xdev->portregs == NULL)
@ -1768,7 +1769,7 @@ pci_xhci_cmd_disable_slot(struct pci_xhci_vdev *xdev, uint32_t slot)
/* TODO: reset events and endpoints */ /* TODO: reset events and endpoints */
} }
} else { } else {
UPRINTF(LDBG, "disable NULL device, slot %d\r\n", slot); UPRINTF(LINF, "disable NULL device, slot %d\r\n", slot);
goto done; goto done;
} }
@ -1815,9 +1816,8 @@ pci_xhci_cmd_disable_slot(struct pci_xhci_vdev *xdev, uint32_t slot)
UPRINTF(LINF, "signal device %d-%s to connect\r\n", UPRINTF(LINF, "signal device %d-%s to connect\r\n",
di->path.bus, usb_dev_path(&di->path)); di->path.bus, usb_dev_path(&di->path));
} }
UPRINTF(LINF, "disable slot %d for native device %d-%s" UPRINTF(LINF, "disable slot %d for native device %d-%s\r\n",
"\r\n", slot, di->path.bus, slot, di->path.bus, usb_dev_path(&di->path));
usb_dev_path(&di->path));
} else } else
UPRINTF(LWRN, "invalid slot %d\r\n", slot); UPRINTF(LWRN, "invalid slot %d\r\n", slot);
@ -1899,7 +1899,7 @@ pci_xhci_cmd_address_device(struct pci_xhci_vdev *xdev,
cmderr = XHCI_TRB_ERROR_SUCCESS; cmderr = XHCI_TRB_ERROR_SUCCESS;
UPRINTF(LDBG, "address device, input ctl: D 0x%08x A 0x%08x,\r\n" UPRINTF(LINF, "address device, input ctl: D 0x%08x A 0x%08x,\r\n"
" slot %08x %08x %08x %08x\r\n" " slot %08x %08x %08x %08x\r\n"
" ep0 %08x %08x %016lx %08x\r\n", " ep0 %08x %08x %016lx %08x\r\n",
input_ctx->ctx_input.dwInCtx0, input_ctx->ctx_input.dwInCtx1, input_ctx->ctx_input.dwInCtx0, input_ctx->ctx_input.dwInCtx1,
@ -1911,14 +1911,14 @@ pci_xhci_cmd_address_device(struct pci_xhci_vdev *xdev,
/* when setting address: drop-ctx=0, add-ctx=slot+ep0 */ /* when setting address: drop-ctx=0, add-ctx=slot+ep0 */
if ((input_ctx->ctx_input.dwInCtx0 != 0) || if ((input_ctx->ctx_input.dwInCtx0 != 0) ||
(input_ctx->ctx_input.dwInCtx1 & 0x03) != 0x03) { (input_ctx->ctx_input.dwInCtx1 & 0x03) != 0x03) {
UPRINTF(LDBG, "address device, input ctl invalid\r\n"); UPRINTF(LWRN, "address device, input ctl invalid\r\n");
cmderr = XHCI_TRB_ERROR_TRB; cmderr = XHCI_TRB_ERROR_TRB;
goto done; goto done;
} }
if (slot <= 0 || slot > XHCI_MAX_SLOTS || if (slot <= 0 || slot > XHCI_MAX_SLOTS ||
xdev->slot_allocated[slot] == false) { xdev->slot_allocated[slot] == false) {
UPRINTF(LDBG, "address device, invalid slot %d\r\n", slot); UPRINTF(LWRN, "address device, invalid slot %d\r\n", slot);
cmderr = XHCI_TRB_ERROR_SLOT_NOT_ON; cmderr = XHCI_TRB_ERROR_SLOT_NOT_ON;
goto done; goto done;
} }
@ -1936,7 +1936,7 @@ pci_xhci_cmd_address_device(struct pci_xhci_vdev *xdev,
} }
di = &xdev->native_ports[index].info; di = &xdev->native_ports[index].info;
UPRINTF(LDBG, "create virtual device for %d-%s on virtual " UPRINTF(LINF, "create virtual device for %d-%s on virtual "
"port %d\r\n", di->path.bus, "port %d\r\n", di->path.bus,
usb_dev_path(&di->path), rh_port); usb_dev_path(&di->path), rh_port);
@ -1996,7 +1996,7 @@ pci_xhci_cmd_address_device(struct pci_xhci_vdev *xdev,
dev->dev_slotstate = XHCI_ST_ADDRESSED; dev->dev_slotstate = XHCI_ST_ADDRESSED;
UPRINTF(LDBG, "address device, output ctx\r\n" UPRINTF(LINF, "address device, output ctx\r\n"
" slot %08x %08x %08x %08x\r\n" " slot %08x %08x %08x %08x\r\n"
" ep0 %08x %08x %016lx %08x\r\n", " ep0 %08x %08x %016lx %08x\r\n",
dev_ctx->ctx_slot.dwSctx0, dev_ctx->ctx_slot.dwSctx1, dev_ctx->ctx_slot.dwSctx0, dev_ctx->ctx_slot.dwSctx1,
@ -3606,7 +3606,7 @@ pci_xhci_reset_port(struct pci_xhci_vdev *xdev, int portn, int warm)
assert(portn <= XHCI_MAX_DEVS); assert(portn <= XHCI_MAX_DEVS);
UPRINTF(LDBG, "reset port %d\r\n", portn); UPRINTF(LINF, "reset port %d\r\n", portn);
port = XHCI_PORTREG_PTR(xdev, portn); port = XHCI_PORTREG_PTR(xdev, portn);
index = pci_xhci_get_native_port_index_by_vport(xdev, portn); index = pci_xhci_get_native_port_index_by_vport(xdev, portn);