jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-30 10:52:50 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

MFC r342778:

Browse Source 
Reduce timeout for reading the USB HUB port status to 1000ms and try to filter
out dead USB HUB devices by implementing an error counter, so that the USB
enumeration thread does not spend all its time reading from non-responding
devices, blocking user-space access in the end.

Tested by:	Matthias Apitz <guru@unixarea.de>
Sponsored by:	Mellanox Technologies
This commit is contained in:
Hans Petter Selasky 2019-01-18 08:49:10 +00:00
parent e264efd0ee
commit 9d1ff4df70
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/stable/10/; revision=343136
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/dev/usb/usb_hub.c
View File

@ -130,6 +130,8 @@ struct uhub_softc {
int sc_disable_enumeration;
int sc_disable_port_power;
#endif
uint8_t sc_usb_port_errors; /* error counter */
#define UHUB_USB_PORT_ERRORS_MAX 4
uint8_t sc_flags;
#define UHUB_FLAG_DID_EXPLORE 0x01
};
@ -588,13 +590,25 @@ uhub_read_port_status(struct uhub_softc *sc, uint8_t portno)
struct usb_port_status ps;
usb_error_t err;
if (sc->sc_usb_port_errors >= UHUB_USB_PORT_ERRORS_MAX) {
DPRINTFN(4, "port %d, HUB looks dead, too many errors\n", portno);
sc->sc_st.port_status = 0;
sc->sc_st.port_change = 0;
return (USB_ERR_TIMEOUT);
}
err = usbd_req_get_port_status(
sc->sc_udev, NULL, &ps, portno);
/* update status regardless of error */
sc->sc_st.port_status = UGETW(ps.wPortStatus);
sc->sc_st.port_change = UGETW(ps.wPortChange);
if (err == 0) {
sc->sc_st.port_status = UGETW(ps.wPortStatus);
sc->sc_st.port_change = UGETW(ps.wPortChange);
sc->sc_usb_port_errors = 0;
} else {
sc->sc_st.port_status = 0;
sc->sc_st.port_change = 0;
sc->sc_usb_port_errors++;
}
/* debugging print */

5
sys/dev/usb/usb_request.c
View File

@ -1595,8 +1595,9 @@ usbd_req_get_port_status(struct usb_device *udev, struct mtx *mtx,
USETW(req.wValue, 0);
req.wIndex[0] = port;
req.wIndex[1] = 0;
USETW(req.wLength, sizeof *ps);
return (usbd_do_request(udev, mtx, &req, ps));
USETW(req.wLength, sizeof(*ps));
return (usbd_do_request_flags(udev, mtx, &req, ps, 0, NULL, 1000));
}
/*------------------------------------------------------------------------*