On 08/09/13 13:58, Antonis Anastasiadis wrote:
>
>> Number:         181159
>> Category:       usb
>> Synopsis:       Problem attaching USB device
>> Confidential:   no
>> Severity:       non-critical
>> Priority:       low
>> Responsible:    freebsd-usb
>> State:          open
>> Quarter:
>> Keywords:
>> Date-Required:
>> Class:          sw-bug
>> Submitter-Id:   current-users
>> Arrival-Date:   Fri Aug 09 12:00:00 UTC 2013
>> Closed-Date:
>> Last-Modified:
>> Originator:     Antonis Anastasiadis
>> Release:        9.2-RC1
>> Organization:
>> Environment:
>> Description:
> Using 9.2-RC1 system compiled with clang. The system is installed on a Hetzner EX40-SSD server.
>
> The problem is that a USB device cannot be attached. The device is from the company Peppercon/Raritan that allows the remote control of a server.
 > It is connected to the VGA, keyboard and mouse ports of the server.
>

Hi,

There are some debug parameters under:

sysctl hw.usb.timings

Which might affect the behavior of your device. Make sure you have the 
XHCI patch for 9.2-RC1 which was in a big late, if you compiled the code 
yourself.

> The exact error from the kernel output is:
>
> usb_alloc_device: device init 2 failed (USB_ERR_IOERROR, ignored)
> ugen0.2: <Unknown> at usbus0 (disconnected)
> uhub_reattach_port: could not allocate new device
>

Could you show the dmesg about which USB controller is at usbus0 in the 
non-working case?

--HPS

Thank you for your quick response.

=D3=F4=E9=F2 9 =C1=F5=E3 2013, 11:25 =EC.=EC., =EF/=E7 Hans Petter =
Selasky <hps@bitfrost.no> =DD=E3=F1=E1=F8=E5:

> Hi,
>=20
> There are some debug parameters under:
>=20
> sysctl hw.usb.timings

I've got no idea how to tune those.

> Which might affect the behavior of your device. Make sure you have the =
XHCI patch for 9.2-RC1 which was in a big late, if you compiled the code =
yourself.

The source was ~2 days old. I just updated and recompiled the kernel =
today. The issue persists.

> Could you show the dmesg about which USB controller is at usbus0 in =
the non-working case?

usbus0 on xhci0
usbus0: 5.0Gbps Super Speed USB v3.0

The m/b is an MSI MS-7816 with the Intel=AE Z87 Express Chipset.=

On 08/10/13 12:31, Antonis Anastasiadis wrote:
> Thank you for your quick response.
>
> Óôéò 9 Áõã 2013, 11:25 ì.ì., ï/ç Hans Petter Selasky <hps@bitfrost.no> Ýãñáøå:
>
>> Hi,
>>
>> There are some debug parameters under:
>>
>> sysctl hw.usb.timings
>
> I've got no idea how to tune those.

Try to double the values one by one.

Any change?

Need to reboot or re-plug the device before testing.

--HPS
>
>> Which might affect the behavior of your device. Make sure you have the XHCI patch for 9.2-RC1 which was in a big late, if you compiled the code yourself.
>
> The source was ~2 days old. I just updated and recompiled the kernel today. The issue persists.
>
>> Could you show the dmesg about which USB controller is at usbus0 in the non-working case?
>
> usbus0 on xhci0
> usbus0: 5.0Gbps Super Speed USB v3.0
>
> The m/b is an MSI MS-7816 with the Intel® Z87 Express Chipset.
>

=D3=F4=E9=F2 10 =C1=F5=E3 2013, 4:52 =EC.=EC., =EF/=E7 Hans Petter =
Selasky <hps@bitfrost.no> =DD=E3=F1=E1=F8=E5:
>=20
> Try to double the values one by one.
>=20
> Any change?
>=20
> Need to reboot or re-plug the device before testing.
>=20

I've managed to up them until the following values, rebooting after each =
change.

hw.usb.timings.port_reset_delay: 800
hw.usb.timings.port_root_reset_delay: 4000
hw.usb.timings.port_reset_recovery: 4000
hw.usb.timings.port_powerup_delay: 300
hw.usb.timings.port_resume_delay: 640
hw.usb.timings.set_address_settle: 160
hw.usb.timings.resume_delay: 4000
hw.usb.timings.resume_wait: 800
hw.usb.timings.resume_recovery: 800
hw.usb.timings.extra_power_up_time: 320

The problem still persists, although the dmesg flood rate is =
considerably smaller now. I guess this is to be expected.

Unfortunately, this USB device is allocated by request for =
troubleshooting purposes, and I cannot have access to it for more than a =
few hours at a time.=

On 08/10/13 16:53, Antonis Anastasiadis wrote:
>
> Óôéò 10 Áõã 2013, 4:52 ì.ì., ï/ç Hans Petter Selasky <hps@bitfrost.no> Ýãñáøå:
>>
>> Try to double the values one by one.
>>
>> Any change?
>>
>> Need to reboot or re-plug the device before testing.
>>
>
> I've managed to up them until the following values, rebooting after each change.
>
> hw.usb.timings.port_reset_delay: 800
> hw.usb.timings.port_root_reset_delay: 4000
> hw.usb.timings.port_reset_recovery: 4000
> hw.usb.timings.port_powerup_delay: 300
> hw.usb.timings.port_resume_delay: 640
> hw.usb.timings.set_address_settle: 160
> hw.usb.timings.resume_delay: 4000
> hw.usb.timings.resume_wait: 800
> hw.usb.timings.resume_recovery: 800
> hw.usb.timings.extra_power_up_time: 320
>
> The problem still persists, although the dmesg flood rate is considerably smaller now. I guess this is to be expected.
>
> Unfortunately, this USB device is allocated by request for troubleshooting purposes, and I cannot have access to it for more than a few hours at a time.
>

Hi,

I'll check the code a bit later today or tomorrow. What you could try is 
to identify the parent HUB or RootHUB and then set config 255 , then 
config 0. Maybe the device will enumerate then.

usbconfig -d X.1 set_config 255
usbconfig -d X.1 set_config 0

--HPS

2013/8/10 Hans Petter Selasky <hps@bitfrost.no>:
<snip>
> What you could try is to
> identify the parent HUB or RootHUB and then set config 255 , then config 0.
> Maybe the device will enumerate then.

No change. The HUB is reset as I can see from the dmesg, but the
device refuses to enumerate.

Comment 7 dfilter service 2013-09-21 22:41:05 UTC

Author: hselasky
Date: Sat Sep 21 21:40:57 2013
New Revision: 255768
URL: http://svnweb.freebsd.org/changeset/base/255768

Log:
  Stability fixes for Intel LynxPoint XHCI controllers. Disable XHCI port
  routing if we get certain errors. Poll for command completion upon
  command timeouts. The XHCI error events might not generate interrupts.
  
  MFC after:	1 week
  Reported by:	Daniel Gerzo <danger@rulez.sk>, Antonis Anastasiadis <anastasiadis@datalive.gr>
  PR:		usb/181159
  Approved by:	re (gjb)

Modified:
  head/sys/dev/usb/controller/xhci.c
  head/sys/dev/usb/controller/xhci.h
  head/sys/dev/usb/controller/xhci_pci.c

Modified: head/sys/dev/usb/controller/xhci.c
==============================================================================
--- head/sys/dev/usb/controller/xhci.c	Sat Sep 21 21:36:09 2013	(r255767)
+++ head/sys/dev/usb/controller/xhci.c	Sat Sep 21 21:40:57 2013	(r255768)
@@ -108,6 +108,8 @@ TUNABLE_INT("hw.usb.xhci.xhci_port_route
 SYSCTL_INT(_hw_usb_xhci, OID_AUTO, use_polling, CTLFLAG_RW | CTLFLAG_TUN,
     &xhcipolling, 0, "Set to enable software interrupt polling for XHCI controller");
 TUNABLE_INT("hw.usb.xhci.use_polling", &xhcipolling);
+#else
+#define	xhciroute 0
 #endif
 
 #define	XHCI_INTR_ENDPT 1
@@ -194,16 +196,6 @@ xhci_dump_device(struct xhci_softc *sc, 
 }
 #endif
 
-uint32_t
-xhci_get_port_route(void)
-{
-#ifdef USB_DEBUG
-	return (0xFFFFFFFFU ^ ((uint32_t)xhciroute));
-#else
-	return (0xFFFFFFFFU);
-#endif
-}
-
 uint8_t
 xhci_use_polling(void)
 {
@@ -505,6 +497,11 @@ xhci_start_controller(struct xhci_softc 
 	/* catch any lost interrupts */
 	xhci_do_poll(&sc->sc_bus);
 
+	if (sc->sc_port_route != NULL) {
+		/* Route all ports to the XHCI by default */
+		sc->sc_port_route(sc->sc_bus.parent,
+		    ~xhciroute, xhciroute);
+	}
 	return (0);
 }
 
@@ -951,7 +948,7 @@ xhci_check_transfer(struct xhci_softc *s
 	}
 }
 
-static void
+static int
 xhci_check_command(struct xhci_softc *sc, struct xhci_trb *trb)
 {
 	if (sc->sc_cmd_addr == trb->qwTrb0) {
@@ -959,16 +956,19 @@ xhci_check_command(struct xhci_softc *sc
 		sc->sc_cmd_result[0] = trb->dwTrb2;
 		sc->sc_cmd_result[1] = trb->dwTrb3;
 		cv_signal(&sc->sc_cmd_cv);
+		return (1);	/* command match */
 	}
+	return (0);
 }
 
-static void
+static int
 xhci_interrupt_poll(struct xhci_softc *sc)
 {
 	struct usb_page_search buf_res;
 	struct xhci_hw_root *phwr;
 	uint64_t addr;
 	uint32_t temp;
+	int retval = 0;
 	uint16_t i;
 	uint8_t event;
 	uint8_t j;
@@ -1008,7 +1008,7 @@ xhci_interrupt_poll(struct xhci_softc *s
 			xhci_check_transfer(sc, &phwr->hwr_events[i]);
 			break;
 		case XHCI_TRB_EVENT_CMD_COMPLETE:
-			xhci_check_command(sc, &phwr->hwr_events[i]);
+			retval |= xhci_check_command(sc, &phwr->hwr_events[i]);
 			break;
 		default:
 			DPRINTF("Unhandled event = %u\n", event);
@@ -1045,6 +1045,8 @@ xhci_interrupt_poll(struct xhci_softc *s
 
 	XWRITE4(sc, runt, XHCI_ERDP_LO(0), (uint32_t)addr);
 	XWRITE4(sc, runt, XHCI_ERDP_HI(0), (uint32_t)(addr >> 32));
+
+	return (retval);
 }
 
 static usb_error_t
@@ -1132,7 +1134,15 @@ xhci_do_command(struct xhci_softc *sc, s
 	err = cv_timedwait(&sc->sc_cmd_cv, &sc->sc_bus.bus_mtx,
 	    USB_MS_TO_TICKS(timeout_ms));
 
-	if (err) {
+	/*
+	 * In some error cases event interrupts are not generated.
+	 * Poll one time to see if the command has completed.
+	 */
+	if (err != 0 && xhci_interrupt_poll(sc) != 0) {
+		DPRINTF("Command was completed when polling\n");
+		err = 0;
+	}
+	if (err != 0) {
 		DPRINTFN(0, "Command timeout!\n");
 		err = USB_ERR_TIMEOUT;
 		trb->dwTrb2 = 0;
@@ -1311,6 +1321,14 @@ xhci_set_address(struct usb_device *udev
 		    (address == 0), index);
 
 		if (err != 0) {
+			temp = le32toh(sc->sc_cmd_result[0]);
+			if (address == 0 && sc->sc_port_route != NULL &&
+			    XHCI_TRB_2_ERROR_GET(temp) ==
+			    XHCI_TRB_ERROR_PARAMETER) {
+				/* LynxPoint XHCI - ports are not switchable */
+				/* Un-route all ports from the XHCI */
+				sc->sc_port_route(sc->sc_bus.parent, 0, ~0);
+			}
 			DPRINTF("Could not set address "
 			    "for slot %u.\n", index);
 			if (address != 0)

Modified: head/sys/dev/usb/controller/xhci.h
==============================================================================
--- head/sys/dev/usb/controller/xhci.h	Sat Sep 21 21:36:09 2013	(r255767)
+++ head/sys/dev/usb/controller/xhci.h	Sat Sep 21 21:40:57 2013	(r255768)
@@ -431,6 +431,8 @@ union xhci_hub_desc {
 	uint8_t				temp[128];
 };
 
+typedef int (xhci_port_route_t)(device_t, uint32_t, uint32_t);
+
 struct xhci_softc {
 	struct xhci_hw_softc	sc_hw;
 	/* base device */
@@ -440,6 +442,8 @@ struct xhci_softc {
 
 	struct usb_callout	sc_callout;
 
+	xhci_port_route_t	*sc_port_route;
+
 	union xhci_hub_desc	sc_hub_desc;
 
 	struct cv		sc_cmd_cv;
@@ -502,7 +506,6 @@ struct xhci_softc {
 
 /* prototypes */
 
-uint32_t	xhci_get_port_route(void);
 uint8_t 	xhci_use_polling(void);
 usb_error_t xhci_halt_controller(struct xhci_softc *);
 usb_error_t xhci_init(struct xhci_softc *, device_t);

Modified: head/sys/dev/usb/controller/xhci_pci.c
==============================================================================
--- head/sys/dev/usb/controller/xhci_pci.c	Sat Sep 21 21:36:09 2013	(r255767)
+++ head/sys/dev/usb/controller/xhci_pci.c	Sat Sep 21 21:40:57 2013	(r255768)
@@ -146,6 +146,25 @@ xhci_interrupt_poll(void *_sc)
 }
 
 static int
+xhci_pci_port_route(device_t self, uint32_t set, uint32_t clear)
+{
+	uint32_t temp;
+
+	temp = pci_read_config(self, PCI_XHCI_INTEL_USB3_PSSEN, 4) |
+	    pci_read_config(self, PCI_XHCI_INTEL_XUSB2PR, 4);
+
+	temp |= set;
+	temp &= ~clear;
+
+	pci_write_config(self, PCI_XHCI_INTEL_USB3_PSSEN, temp, 4);
+	pci_write_config(self, PCI_XHCI_INTEL_XUSB2PR, temp, 4);
+
+	device_printf(self, "Port routing mask set to 0x%08x\n", temp);
+
+	return (0);
+}
+
+static int
 xhci_pci_attach(device_t self)
 {
 	struct xhci_softc *sc = device_get_softc(self);
@@ -189,7 +208,7 @@ xhci_pci_attach(device_t self)
 	    &sc->sc_irq_rid, RF_SHAREABLE | RF_ACTIVE);
 	if (sc->sc_irq_res == NULL) {
 		device_printf(self, "Could not allocate IRQ\n");
-		goto error;
+		/* goto error; FALLTHROUGH - use polling */
 	}
 	sc->sc_bus.bdev = device_add_child(self, "usbus", -1);
 	if (sc->sc_bus.bdev == NULL) {
@@ -216,6 +235,16 @@ xhci_pci_attach(device_t self)
 		USB_BUS_UNLOCK(&sc->sc_bus);
 	}
 
+	/* On Intel chipsets reroute ports from EHCI to XHCI controller. */
+	switch (pci_get_devid(self)) {
+	case 0x1e318086:	/* Panther Point */
+	case 0x8c318086:	/* Lynx Point */
+		sc->sc_port_route = &xhci_pci_port_route;
+		break;
+	default:
+		break;
+	}
+
 	xhci_pci_take_controller(self);
 
 	err = xhci_halt_controller(sc);
@@ -284,7 +313,6 @@ static int
 xhci_pci_take_controller(device_t self)
 {
 	struct xhci_softc *sc = device_get_softc(self);
-	uint32_t device_id = pci_get_devid(self);
 	uint32_t cparams;
 	uint32_t eecp;
 	uint32_t eec;
@@ -325,13 +353,5 @@ xhci_pci_take_controller(device_t self)
 			usb_pause_mtx(NULL, hz / 100);	/* wait 10ms */
 		}
 	}
-
-	/* On Intel chipsets reroute ports from EHCI to XHCI controller. */
-	if (device_id == 0x1e318086 /* Panther Point */ ||
-	    device_id == 0x8c318086 /* Lynx Point */) {
-		uint32_t temp = xhci_get_port_route();
-		pci_write_config(self, PCI_XHCI_INTEL_USB3_PSSEN, temp, 4);
-		pci_write_config(self, PCI_XHCI_INTEL_XUSB2PR, temp, 4);
-	}
 	return (0);
 }
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"

Comment 8 dfilter service 2013-10-01 09:39:01 UTC

Author: hselasky
Date: Tue Oct  1 08:38:47 2013
New Revision: 255965
URL: http://svnweb.freebsd.org/changeset/base/255965

Log:
  MFC r255768:
  Stability fixes for Intel LynxPoint XHCI controllers. Disable XHCI port
  routing if we get certain errors. Poll for command completion upon
  command timeouts. The XHCI error events might not generate interrupts.
  
  PR:		usb/181159

Modified:
  stable/9/sys/dev/usb/controller/xhci.c
  stable/9/sys/dev/usb/controller/xhci.h
  stable/9/sys/dev/usb/controller/xhci_pci.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/usb/controller/xhci.c
==============================================================================
--- stable/9/sys/dev/usb/controller/xhci.c	Tue Oct  1 07:22:04 2013	(r255964)
+++ stable/9/sys/dev/usb/controller/xhci.c	Tue Oct  1 08:38:47 2013	(r255965)
@@ -94,6 +94,8 @@ TUNABLE_INT("hw.usb.xhci.debug", &xhcide
 SYSCTL_INT(_hw_usb_xhci, OID_AUTO, xhci_port_route, CTLFLAG_RW | CTLFLAG_TUN,
     &xhciroute, 0, "Routing bitmap for switching EHCI ports to XHCI controller");
 TUNABLE_INT("hw.usb.xhci.xhci_port_route", &xhciroute);
+#else
+#define	xhciroute 0
 #endif
 
 #define	XHCI_INTR_ENDPT 1
@@ -179,16 +181,6 @@ xhci_dump_device(struct xhci_softc *sc, 
 }
 #endif
 
-uint32_t
-xhci_get_port_route(void)
-{
-#ifdef USB_DEBUG
-	return (0xFFFFFFFFU ^ ((uint32_t)xhciroute));
-#else
-	return (0xFFFFFFFFU);
-#endif
-}
-
 static void
 xhci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_sub_cb_t *cb)
 {
@@ -480,6 +472,11 @@ xhci_start_controller(struct xhci_softc 
 	/* catch any lost interrupts */
 	xhci_do_poll(&sc->sc_bus);
 
+	if (sc->sc_port_route != NULL) {
+		/* Route all ports to the XHCI by default */
+		sc->sc_port_route(sc->sc_bus.parent,
+		    ~xhciroute, xhciroute);
+	}
 	return (0);
 }
 
@@ -917,7 +914,7 @@ xhci_check_transfer(struct xhci_softc *s
 	}
 }
 
-static void
+static int
 xhci_check_command(struct xhci_softc *sc, struct xhci_trb *trb)
 {
 	if (sc->sc_cmd_addr == trb->qwTrb0) {
@@ -925,16 +922,19 @@ xhci_check_command(struct xhci_softc *sc
 		sc->sc_cmd_result[0] = trb->dwTrb2;
 		sc->sc_cmd_result[1] = trb->dwTrb3;
 		cv_signal(&sc->sc_cmd_cv);
+		return (1);	/* command match */
 	}
+	return (0);
 }
 
-static void
+static int
 xhci_interrupt_poll(struct xhci_softc *sc)
 {
 	struct usb_page_search buf_res;
 	struct xhci_hw_root *phwr;
 	uint64_t addr;
 	uint32_t temp;
+	int retval = 0;
 	uint16_t i;
 	uint8_t event;
 	uint8_t j;
@@ -974,7 +974,7 @@ xhci_interrupt_poll(struct xhci_softc *s
 			xhci_check_transfer(sc, &phwr->hwr_events[i]);
 			break;
 		case XHCI_TRB_EVENT_CMD_COMPLETE:
-			xhci_check_command(sc, &phwr->hwr_events[i]);
+			retval |= xhci_check_command(sc, &phwr->hwr_events[i]);
 			break;
 		default:
 			DPRINTF("Unhandled event = %u\n", event);
@@ -1011,6 +1011,8 @@ xhci_interrupt_poll(struct xhci_softc *s
 
 	XWRITE4(sc, runt, XHCI_ERDP_LO(0), (uint32_t)addr);
 	XWRITE4(sc, runt, XHCI_ERDP_HI(0), (uint32_t)(addr >> 32));
+
+	return (retval);
 }
 
 static usb_error_t
@@ -1098,7 +1100,15 @@ xhci_do_command(struct xhci_softc *sc, s
 	err = cv_timedwait(&sc->sc_cmd_cv, &sc->sc_bus.bus_mtx,
 	    USB_MS_TO_TICKS(timeout_ms));
 
-	if (err) {
+	/*
+	 * In some error cases event interrupts are not generated.
+	 * Poll one time to see if the command has completed.
+	 */
+	if (err != 0 && xhci_interrupt_poll(sc) != 0) {
+		DPRINTF("Command was completed when polling\n");
+		err = 0;
+	}
+	if (err != 0) {
 		DPRINTFN(0, "Command timeout!\n");
 		err = USB_ERR_TIMEOUT;
 		trb->dwTrb2 = 0;
@@ -1277,6 +1287,14 @@ xhci_set_address(struct usb_device *udev
 		    (address == 0), index);
 
 		if (err != 0) {
+			temp = le32toh(sc->sc_cmd_result[0]);
+			if (address == 0 && sc->sc_port_route != NULL &&
+			    XHCI_TRB_2_ERROR_GET(temp) ==
+			    XHCI_TRB_ERROR_PARAMETER) {
+				/* LynxPoint XHCI - ports are not switchable */
+				/* Un-route all ports from the XHCI */
+				sc->sc_port_route(sc->sc_bus.parent, 0, ~0);
+			}
 			DPRINTF("Could not set address "
 			    "for slot %u.\n", index);
 			if (address != 0)

Modified: stable/9/sys/dev/usb/controller/xhci.h
==============================================================================
--- stable/9/sys/dev/usb/controller/xhci.h	Tue Oct  1 07:22:04 2013	(r255964)
+++ stable/9/sys/dev/usb/controller/xhci.h	Tue Oct  1 08:38:47 2013	(r255965)
@@ -421,6 +421,8 @@ union xhci_hub_desc {
 	uint8_t				temp[128];
 };
 
+typedef int (xhci_port_route_t)(device_t, uint32_t, uint32_t);
+
 struct xhci_softc {
 	struct xhci_hw_softc	sc_hw;
 	/* base device */
@@ -429,6 +431,8 @@ struct xhci_softc {
 	struct usb_process	sc_config_proc;
 	struct usb_bus_msg	sc_config_msg[2];
 
+	xhci_port_route_t	*sc_port_route;
+
 	union xhci_hub_desc	sc_hub_desc;
 
 	struct cv		sc_cmd_cv;
@@ -491,7 +495,6 @@ struct xhci_softc {
 
 /* prototypes */
 
-uint32_t	xhci_get_port_route(void);
 usb_error_t xhci_halt_controller(struct xhci_softc *);
 usb_error_t xhci_init(struct xhci_softc *, device_t);
 usb_error_t xhci_start_controller(struct xhci_softc *);

Modified: stable/9/sys/dev/usb/controller/xhci_pci.c
==============================================================================
--- stable/9/sys/dev/usb/controller/xhci_pci.c	Tue Oct  1 07:22:04 2013	(r255964)
+++ stable/9/sys/dev/usb/controller/xhci_pci.c	Tue Oct  1 08:38:47 2013	(r255965)
@@ -136,6 +136,25 @@ static int xhci_use_msi = 1;
 TUNABLE_INT("hw.usb.xhci.msi", &xhci_use_msi);
 
 static int
+xhci_pci_port_route(device_t self, uint32_t set, uint32_t clear)
+{
+	uint32_t temp;
+
+	temp = pci_read_config(self, PCI_XHCI_INTEL_USB3_PSSEN, 4) |
+	    pci_read_config(self, PCI_XHCI_INTEL_XUSB2PR, 4);
+
+	temp |= set;
+	temp &= ~clear;
+
+	pci_write_config(self, PCI_XHCI_INTEL_USB3_PSSEN, temp, 4);
+	pci_write_config(self, PCI_XHCI_INTEL_XUSB2PR, temp, 4);
+
+	device_printf(self, "Port routing mask set to 0x%08x\n", temp);
+
+	return (0);
+}
+
+static int
 xhci_pci_attach(device_t self)
 {
 	struct xhci_softc *sc = device_get_softc(self);
@@ -200,6 +219,16 @@ xhci_pci_attach(device_t self)
 		sc->sc_intr_hdl = NULL;
 		goto error;
 	}
+	/* On Intel chipsets reroute ports from EHCI to XHCI controller. */
+	switch (pci_get_devid(self)) {
+	case 0x1e318086:	/* Panther Point */
+	case 0x8c318086:	/* Lynx Point */
+		sc->sc_port_route = &xhci_pci_port_route;
+		break;
+	default:
+		break;
+	}
+
 	xhci_pci_take_controller(self);
 
 	err = xhci_halt_controller(sc);
@@ -266,7 +295,6 @@ static int
 xhci_pci_take_controller(device_t self)
 {
 	struct xhci_softc *sc = device_get_softc(self);
-	uint32_t device_id = pci_get_devid(self);
 	uint32_t cparams;
 	uint32_t eecp;
 	uint32_t eec;
@@ -307,13 +335,5 @@ xhci_pci_take_controller(device_t self)
 			usb_pause_mtx(NULL, hz / 100);	/* wait 10ms */
 		}
 	}
-
-	/* On Intel chipsets reroute ports from EHCI to XHCI controller. */
-	if (device_id == 0x1e318086 /* Panther Point */ ||
-	    device_id == 0x8c318086 /* Lynx Point */) {
-		uint32_t temp = xhci_get_port_route();
-		pci_write_config(self, PCI_XHCI_INTEL_USB3_PSSEN, temp, 4);
-		pci_write_config(self, PCI_XHCI_INTEL_XUSB2PR, temp, 4);
-	}
 	return (0);
 }
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"

Comment 9 dfilter service 2013-10-01 09:41:43 UTC

Author: hselasky
Date: Tue Oct  1 08:41:28 2013
New Revision: 255966
URL: http://svnweb.freebsd.org/changeset/base/255966

Log:
  MFC r255768:
  Stability fixes for Intel LynxPoint XHCI controllers. Disable XHCI port
  routing if we get certain errors. Poll for command completion upon
  command timeouts. The XHCI error events might not generate interrupts.
  
  PR:		usb/181159

Modified:
  stable/8/sys/dev/usb/controller/xhci.c
  stable/8/sys/dev/usb/controller/xhci.h
  stable/8/sys/dev/usb/controller/xhci_pci.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/dev/   (props changed)
  stable/8/sys/dev/usb/   (props changed)

Modified: stable/8/sys/dev/usb/controller/xhci.c
==============================================================================
--- stable/8/sys/dev/usb/controller/xhci.c	Tue Oct  1 08:38:47 2013	(r255965)
+++ stable/8/sys/dev/usb/controller/xhci.c	Tue Oct  1 08:41:28 2013	(r255966)
@@ -94,6 +94,8 @@ TUNABLE_INT("hw.usb.xhci.debug", &xhcide
 SYSCTL_INT(_hw_usb_xhci, OID_AUTO, xhci_port_route, CTLFLAG_RW | CTLFLAG_TUN,
     &xhciroute, 0, "Routing bitmap for switching EHCI ports to XHCI controller");
 TUNABLE_INT("hw.usb.xhci.xhci_port_route", &xhciroute);
+#else
+#define	xhciroute 0
 #endif
 
 #define	XHCI_INTR_ENDPT 1
@@ -179,16 +181,6 @@ xhci_dump_device(struct xhci_softc *sc, 
 }
 #endif
 
-uint32_t
-xhci_get_port_route(void)
-{
-#ifdef USB_DEBUG
-	return (0xFFFFFFFFU ^ ((uint32_t)xhciroute));
-#else
-	return (0xFFFFFFFFU);
-#endif
-}
-
 static void
 xhci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_sub_cb_t *cb)
 {
@@ -480,6 +472,11 @@ xhci_start_controller(struct xhci_softc 
 	/* catch any lost interrupts */
 	xhci_do_poll(&sc->sc_bus);
 
+	if (sc->sc_port_route != NULL) {
+		/* Route all ports to the XHCI by default */
+		sc->sc_port_route(sc->sc_bus.parent,
+		    ~xhciroute, xhciroute);
+	}
 	return (0);
 }
 
@@ -917,7 +914,7 @@ xhci_check_transfer(struct xhci_softc *s
 	}
 }
 
-static void
+static int
 xhci_check_command(struct xhci_softc *sc, struct xhci_trb *trb)
 {
 	if (sc->sc_cmd_addr == trb->qwTrb0) {
@@ -925,16 +922,19 @@ xhci_check_command(struct xhci_softc *sc
 		sc->sc_cmd_result[0] = trb->dwTrb2;
 		sc->sc_cmd_result[1] = trb->dwTrb3;
 		cv_signal(&sc->sc_cmd_cv);
+		return (1);	/* command match */
 	}
+	return (0);
 }
 
-static void
+static int
 xhci_interrupt_poll(struct xhci_softc *sc)
 {
 	struct usb_page_search buf_res;
 	struct xhci_hw_root *phwr;
 	uint64_t addr;
 	uint32_t temp;
+	int retval = 0;
 	uint16_t i;
 	uint8_t event;
 	uint8_t j;
@@ -974,7 +974,7 @@ xhci_interrupt_poll(struct xhci_softc *s
 			xhci_check_transfer(sc, &phwr->hwr_events[i]);
 			break;
 		case XHCI_TRB_EVENT_CMD_COMPLETE:
-			xhci_check_command(sc, &phwr->hwr_events[i]);
+			retval |= xhci_check_command(sc, &phwr->hwr_events[i]);
 			break;
 		default:
 			DPRINTF("Unhandled event = %u\n", event);
@@ -1011,6 +1011,8 @@ xhci_interrupt_poll(struct xhci_softc *s
 
 	XWRITE4(sc, runt, XHCI_ERDP_LO(0), (uint32_t)addr);
 	XWRITE4(sc, runt, XHCI_ERDP_HI(0), (uint32_t)(addr >> 32));
+
+	return (retval);
 }
 
 static usb_error_t
@@ -1098,7 +1100,15 @@ xhci_do_command(struct xhci_softc *sc, s
 	err = cv_timedwait(&sc->sc_cmd_cv, &sc->sc_bus.bus_mtx,
 	    USB_MS_TO_TICKS(timeout_ms));
 
-	if (err) {
+	/*
+	 * In some error cases event interrupts are not generated.
+	 * Poll one time to see if the command has completed.
+	 */
+	if (err != 0 && xhci_interrupt_poll(sc) != 0) {
+		DPRINTF("Command was completed when polling\n");
+		err = 0;
+	}
+	if (err != 0) {
 		DPRINTFN(0, "Command timeout!\n");
 		err = USB_ERR_TIMEOUT;
 		trb->dwTrb2 = 0;
@@ -1277,6 +1287,14 @@ xhci_set_address(struct usb_device *udev
 		    (address == 0), index);
 
 		if (err != 0) {
+			temp = le32toh(sc->sc_cmd_result[0]);
+			if (address == 0 && sc->sc_port_route != NULL &&
+			    XHCI_TRB_2_ERROR_GET(temp) ==
+			    XHCI_TRB_ERROR_PARAMETER) {
+				/* LynxPoint XHCI - ports are not switchable */
+				/* Un-route all ports from the XHCI */
+				sc->sc_port_route(sc->sc_bus.parent, 0, ~0);
+			}
 			DPRINTF("Could not set address "
 			    "for slot %u.\n", index);
 			if (address != 0)

Modified: stable/8/sys/dev/usb/controller/xhci.h
==============================================================================
--- stable/8/sys/dev/usb/controller/xhci.h	Tue Oct  1 08:38:47 2013	(r255965)
+++ stable/8/sys/dev/usb/controller/xhci.h	Tue Oct  1 08:41:28 2013	(r255966)
@@ -421,6 +421,8 @@ union xhci_hub_desc {
 	uint8_t				temp[128];
 };
 
+typedef int (xhci_port_route_t)(device_t, uint32_t, uint32_t);
+
 struct xhci_softc {
 	struct xhci_hw_softc	sc_hw;
 	/* base device */
@@ -429,6 +431,8 @@ struct xhci_softc {
 	struct usb_process	sc_config_proc;
 	struct usb_bus_msg	sc_config_msg[2];
 
+	xhci_port_route_t	*sc_port_route;
+
 	union xhci_hub_desc	sc_hub_desc;
 
 	struct cv		sc_cmd_cv;
@@ -490,7 +494,6 @@ struct xhci_softc {
 
 /* prototypes */
 
-uint32_t	xhci_get_port_route(void);
 usb_error_t xhci_halt_controller(struct xhci_softc *);
 usb_error_t xhci_init(struct xhci_softc *, device_t);
 usb_error_t xhci_start_controller(struct xhci_softc *);

Modified: stable/8/sys/dev/usb/controller/xhci_pci.c
==============================================================================
--- stable/8/sys/dev/usb/controller/xhci_pci.c	Tue Oct  1 08:38:47 2013	(r255965)
+++ stable/8/sys/dev/usb/controller/xhci_pci.c	Tue Oct  1 08:41:28 2013	(r255966)
@@ -130,6 +130,25 @@ xhci_pci_probe(device_t self)
 }
 
 static int
+xhci_pci_port_route(device_t self, uint32_t set, uint32_t clear)
+{
+	uint32_t temp;
+
+	temp = pci_read_config(self, PCI_XHCI_INTEL_USB3_PSSEN, 4) |
+	    pci_read_config(self, PCI_XHCI_INTEL_XUSB2PR, 4);
+
+	temp |= set;
+	temp &= ~clear;
+
+	pci_write_config(self, PCI_XHCI_INTEL_USB3_PSSEN, temp, 4);
+	pci_write_config(self, PCI_XHCI_INTEL_XUSB2PR, temp, 4);
+
+	device_printf(self, "Port routing mask set to 0x%08x\n", temp);
+
+	return (0);
+}
+
+static int
 xhci_pci_attach(device_t self)
 {
 	struct xhci_softc *sc = device_get_softc(self);
@@ -184,6 +203,16 @@ xhci_pci_attach(device_t self)
 		sc->sc_intr_hdl = NULL;
 		goto error;
 	}
+	/* On Intel chipsets reroute ports from EHCI to XHCI controller. */
+	switch (pci_get_devid(self)) {
+	case 0x1e318086:	/* Panther Point */
+	case 0x8c318086:	/* Lynx Point */
+		sc->sc_port_route = &xhci_pci_port_route;
+		break;
+	default:
+		break;
+	}
+
 	xhci_pci_take_controller(self);
 
 	err = xhci_halt_controller(sc);
@@ -247,7 +276,6 @@ static int
 xhci_pci_take_controller(device_t self)
 {
 	struct xhci_softc *sc = device_get_softc(self);
-	uint32_t device_id = pci_get_devid(self);
 	uint32_t cparams;
 	uint32_t eecp;
 	uint32_t eec;
@@ -288,13 +316,5 @@ xhci_pci_take_controller(device_t self)
 			usb_pause_mtx(NULL, hz / 100);	/* wait 10ms */
 		}
 	}
-
-	/* On Intel chipsets reroute ports from EHCI to XHCI controller. */
-	if (device_id == 0x1e318086 /* Panther Point */ ||
-	    device_id == 0x8c318086 /* Lynx Point */) {
-		uint32_t temp = xhci_get_port_route();
-		pci_write_config(self, PCI_XHCI_INTEL_USB3_PSSEN, temp, 4);
-		pci_write_config(self, PCI_XHCI_INTEL_XUSB2PR, temp, 4);
-	}
 	return (0);
 }
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"

Hi everyone,

I'm using FreeBSD 9.2-Release and facing the same issue. Today I got
patches from this revision:
http://svnweb.freebsd.org/changeset/base/255965and applied them to
9.2-Release sources, then rebuilt the kernel.

So, after reboot I still can see the same errors in dmesg, but my USB mouse
is successfully recognized and I confirm that it works. I didn't try other
USB devices yet though.

My Motherboard is Asus Z87-PRO. I posted additional information with dmesg
and usbconfig output to
http://forums.freebsd.org/showpost.php?p=235125&postcount=8

Thank you for patches, I can use my new hardware now :) Please let me know
if you need more testing, I could try to help with that.

I think I have a similar problem with an ASRock H87 Pro4 mainboard here.
First I tried with FreeBSD 9.2 RELEASE, then after I found this PR I
switched to 9.2 STABLE in order to try the patch mentioned above.
Unfortunately unlike for my fellow poster, it doesn't help in my case.

When I enable the USB 3.0 feature in UEFI BIOS, the plugged in devices
are not attached.

This is what I get from dmesg:

xhci0: <Intel Lynx Point USB 3.0 controller> mem 0xf0420000-0xf042ffff
irq 16 at device 20.0 on pci0
xhci0: 32 byte context size.
xhci0: Port routing mask set to 0xffffffff
usbus0 on xhci0
[...]
usbus0: 5.0Gbps Super Speed USB v3.0
ugen0.1: <0x8086> at usbus0
uhub0: <0x8086 XHCI root HUB, class 9/0, rev 3.00/1.00, addr 1> on usbus0
[...]
Root mount waiting for: usbus0
uhub0: 21 ports with 21 removable, self powered
Root mount waiting for: usbus0
xhci0: Port routing mask set to 0x00000000
usb_alloc_device: device init 2 failed (USB_ERR_IOERROR, ignored)
ugen0.2: <Unknown> at usbus0 (disconnected)
uhub_reattach_port: could not allocate new device



At least I'm able to use my USB devices when I disable USB 3.0 in UEFI
BIOS. Then dmesg looks like this:

ehci0: <EHCI (generic) USB 2.0 controller> mem 0xf0424000-0xf04243ff irq
16 at device 26.0 on pci0
usbus0: EHCI version 1.0
usbus0 on ehci0
[...]
ehci1: <EHCI (generic) USB 2.0 controller> mem 0xf0423000-0xf04233ff irq
23 at device 29.0 on pci0
usbus1: EHCI version 1.0
usbus1 on ehci1
[...]
usbus0: 480Mbps High Speed USB v2.0
usbus1: 480Mbps High Speed USB v2.0
ugen0.1: <Intel> at usbus0
uhub0: <Intel EHCI root HUB, class 9/0, rev 2.00/1.00, addr 1> on usbus0
ugen1.1: <Intel> at usbus1
uhub1: <Intel EHCI root HUB, class 9/0, rev 2.00/1.00, addr 1> on usbus1
[...]
Root mount waiting for: usbus1 usbus0
uhub0: 2 ports with 2 removable, self powered
uhub1: 2 ports with 2 removable, self powered
Root mount waiting for: usbus1 usbus0
ugen0.2: <vendor 0x8087> at usbus0
uhub2: <vendor 0x8087 product 0x8008, class 9/0, rev 2.00/0.05, addr 2>
on usbus0
ugen1.2: <vendor 0x8087> at usbus1
uhub3: <vendor 0x8087 product 0x8000, class 9/0, rev 2.00/0.05, addr 2>
on usbus1
uhub2: 6 ports with 6 removable, self powered
uhub3: 8 ports with 8 removable, self powered
ugen1.3: <American Power Conversion> at usbus1
Root mount waiting for: usbus1
ugen1.4: <Sunplus Technology Inc.> at usbus1
umass0: <Bulk Only Interface> on usbus1
umass0:  SCSI over Bulk-Only; quirks = 0x4101
umass0:6:0:-1: Attached to scbus6


So in EHCI mode everything is running, XHCI fails to attach the devices.
Any suggestions?

Comment 12 Eitan Adler 2018-05-28 19:46:51 UTC

batch change:

For bugs that match the following
-  Status Is In progress 
AND
- Untouched since 2018-01-01.
AND
- Affects Base System OR Documentation

DO:

Reset to open status.


Note:
I did a quick pass but if you are getting this email it might be worthwhile to double check to see if this bug ought to be closed.

Comment 13 Oleksandr Tymoshenko 2019-01-20 03:56:08 UTC

Is this PR still valid for currently supported versions?

Thanks

(In reply to Oleksandr Tymoshenko from comment #13)
Can't say anything about PR but problem is still persist.
I have ASROCK J4205-ITX and FreeBSD 12.0-p7
Can mount a flash drive (sometimes not at the first time) but failed to connect with other hardware. A real problem is UPS with USB cable. I have try APC and CyberPower. Both connected to Windows PC without problems and failed with my 12.0

No mater with port to use: USB 2.0 or USB 3.0

I can't even disable XHCI cause Motherboard BIOS do not have such option.

(In reply to Denis from comment #14)
According to my prev comment there was a question. Does make sense comment out
device		xhci
in  kernel config file, install kernel, reboot and make command kldunload xhci ?
Does all other subsystems will operate in EHCI mode or not?