Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-10-03 12:18:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

drivers/usbhost: Announce what an xHCI port has attached.

Browse source 
Report each device as it comes up, and report it going away.

The announcement is made at the end of the port enable rather than at
connect, because the PORTSC speed field means nothing until the port has
been reset: a USB2 port reports its reset default, full speed, until then,
so every device would be announced at 12Mbps regardless of what it
negotiates a moment later.

Assisted-by: Claude:claude-opus-5
Signed-off-by: Justin Hammond <justin@dynam.ac>
This commit is contained in:
Justin Hammond 2026-08-16 17:16:41 +08:00 • committed by Xiang Xiao
parent 6b24a0cac5
commit a4475ca284
1 changed files with 45 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

45
drivers/usbhost/usbhost_xhci.c
View file

@ -27,6 +27,7 @@
#include <assert.h>
#include <nuttx/debug.h>
#include <errno.h>
#include <syslog.h>
#include <inttypes.h>
#include <string.h>
@ -358,6 +359,7 @@ static int xhci_ctrl_reset(FAR struct usbhost_xhci_s *priv);
/* Port management **********************************************************/
static void xhci_probe_ports(FAR struct usbhost_xhci_s *priv);
static FAR const char *xhci_speed_str(uint32_t portsc);
static int xhci_port_enable(FAR struct usbhost_xhci_s *priv,
FAR struct usbhost_hubport_s *hport);
@ -1496,6 +1498,16 @@ static int xhci_port_enable(FAR struct usbhost_xhci_s *priv,
}
}
/* Say what turned up, now that the port can answer.
*
* The speed field only means anything once the port has been reset and
* enabled. A USB2 port reports the reset default, full speed, until
* then.
*/
syslog(LOG_INFO, "%s: port %d: device attached at %s\n",
priv->name, rhpndx + 1, xhci_speed_str(regval));
return OK;
}
@ -2732,6 +2744,36 @@ static void xhci_asynch_completion(FAR struct xhci_epinfo_s *epinfo)
}
#endif
/****************************************************************************
* Name: xhci_speed_str
*
* Description:
* What a port negotiated, in words. PORTSC reports a speed ID, not a
* speed.
*
****************************************************************************/
static FAR const char *xhci_speed_str(uint32_t portsc)
{
switch (XHCI_PORTSC_PS(portsc))
{
case XHCI_PORTSC_PS_FULL:
return "full speed, 12Mbps";
case XHCI_PORTSC_PS_LOW:
return "low speed, 1.5Mbps";
case XHCI_PORTSC_PS_HIGH:
return "high speed, 480Mbps";
case XHCI_PORTSC_PS_SUPPER11:
return "SuperSpeed, 5Gbps";
case XHCI_PORTSC_PS_SUPPER21:
case XHCI_PORTSC_PS_SUPPER12:
case XHCI_PORTSC_PS_SUPPER22:
return "SuperSpeed+, 10Gbps";
default:
return "an unknown speed";
}
}
/****************************************************************************
* Name: xhci_portsc_work
*
@ -2811,6 +2853,9 @@ static void xhci_portsc_work(FAR void *arg)
usbhost_vtrace2(XHCI_VTRACE2_PORTSC_DISCONND,
rhpndx + 1, priv->pscwait);
syslog(LOG_INFO, "%s: port %d: device removed\n",
priv->name, rhpndx + 1);
rhport->connected = false;
/* Are we bound to a class instance? */