D51411.1793646179.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D51411.1793646179.diff
View Options

	diff --git a/usr.sbin/bhyve/pci_xhci.c b/usr.sbin/bhyve/pci_xhci.c
	--- a/usr.sbin/bhyve/pci_xhci.c
	+++ b/usr.sbin/bhyve/pci_xhci.c
	@@ -2588,7 +2588,7 @@
	if (dev) {
	port->portsc &= ~(XHCI_PS_PLS_MASK \| XHCI_PS_PR \| XHCI_PS_PRC);
	port->portsc \|= XHCI_PS_PED \|
	- XHCI_PS_SPEED_SET(dev->dev_ue->ue_usbspeed);
	+ XHCI_PS_SPEED_SET(dev->hci.hci_speed);

	if (warm && dev->dev_ue->ue_usbver == 3) {
	port->portsc \|= XHCI_PS_WRC;
	@@ -2622,11 +2622,11 @@

	if (dev->dev_ue->ue_usbver == 2) {
	port->portsc \|= XHCI_PS_PLS_SET(UPS_PORT_LS_POLL) \|
	- XHCI_PS_SPEED_SET(dev->dev_ue->ue_usbspeed);
	+ XHCI_PS_SPEED_SET(dev->hci.hci_speed);
	} else {
	port->portsc \|= XHCI_PS_PLS_SET(UPS_PORT_LS_U0) \|
	- XHCI_PS_PED \| /* enabled */
	- XHCI_PS_SPEED_SET(dev->dev_ue->ue_usbspeed);
	+ XHCI_PS_PED \| /* enabled */
	+ XHCI_PS_SPEED_SET(dev->hci.hci_speed);
	}

	DPRINTF(("Init port %d 0x%x", portn, port->portsc));
	@@ -2833,6 +2833,7 @@
	dev->hci.hci_sc = dev;
	dev->hci.hci_intr = pci_xhci_dev_intr;
	dev->hci.hci_event = pci_xhci_dev_event;
	+ dev->hci.hci_speed = USB_SPEED_MAX;

	if (ue->ue_usbver == 2) {
	if (usb2_port == sc->usb2_port_start +
	@@ -2863,6 +2864,8 @@

	dev->dev_ue = ue;
	dev->dev_sc = devsc;
	+ if (dev->hci.hci_speed == USB_SPEED_MAX)
	+ dev->hci.hci_speed = ue->ue_usbspeed;

	XHCI_SLOTDEV_PTR(sc, slot) = dev;
	ndevices++;
	diff --git a/usr.sbin/bhyve/usb_emul.h b/usr.sbin/bhyve/usb_emul.h
	--- a/usr.sbin/bhyve/usb_emul.h
	+++ b/usr.sbin/bhyve/usb_emul.h
	@@ -85,6 +85,7 @@
	/* controller managed fields */
	int hci_address;
	int hci_port;
	+ int hci_speed;
	};

	/*