p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xhci: Urgent bug fixes for usb-next and 3.14. 

Hi Greg,
 
 Please queue these two patches to usb-next for 3.14.
 
 An xHCI driver fix for USB ethernet devices that went into 3.13 and 3.12
 stable is causing usb-storage to go into an infinite loop, and these two
 patches fix the issue.  I would like these to get into 3.14-rc1 so we
 can avoid any potential data corruption for users.
 
 Sarah Sharp
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJSzazIAAoJEBMGWMLi1Gc5hpcP/jsLbsRY7hfp1a4saWxNvt0P
 MQ7XrNvhGQCjgoS4pFZIxoWjO8cOTRNYwxsv0r+SLgXOmfGz78+RpJsw4OdGFUUE
 tiiY/8U/9OpHvor7VomxxHYi230mSAncukoWW+wTGwQjyA6KbZ/RnPvXAkzaP6T+
 yLWETFtgbNO5FlkfgseAhVk74DrHOVCsBmdT39Te+oLasXH9X8Q6VtSSZ7+aovCl
 SoPRotX5wRc8DuaLQ16Z+TUWnaKTNfiMf8LXthZRI8SReHq5N2gT9zUiyQ+2js4w
 79jOYB1nUAGiT/0IphdLrsIiGi/ZTph+v8kZ5f8W57gBBii0W2jDMrT2HnAqWUKB
 VNSM2s7fMgn4e7Nkvv5f0EVK/XcADwiPyKI8kTFVE27rnSC3N6mDUCYtaWm7EoPt
 4wme+bCQ+CeRN65aIUGw6hIKy1nejBMMKu7A5uGP+W/wXzwR/dLgTJj4izlaX3fX
 frg7RqNoGgRL5q5Gfontz0d5w0L9pRJqYG6is1crQa765BWty9OxqlW1B4QppksW
 VBuHwt+LWhPWBlIi/NAR1/POrzYjkzxoLgcknuODLLArCyj3cXgQYr1YDcnmtzKN
 qGV+NBuowPd04vTEkjZipoJHNIBNEq+TgGM5mjYZIQB22vbqarCr3khtuIBuWQmb
 GvjKUx6iBnl8CSHBubf6
 =c4QZ
 -----END PGP SIGNATURE-----

Merge tag 'for-usb-next-2014-01-08' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-next

Sarah writes:

xhci: Urgent bug fixes for usb-next and 3.14.

Hi Greg,

Please queue these two patches to usb-next for 3.14.

An xHCI driver fix for USB ethernet devices that went into 3.13 and 3.12
stable is causing usb-storage to go into an infinite loop, and these two
patches fix the issue.  I would like these to get into 3.14-rc1 so we
can avoid any potential data corruption for users.

Sarah Sharp
This commit is contained in:
Greg Kroah-Hartman 2014-01-08 12:29:28 -08:00
parent d85b277ed1 f2d9b991c5
commit c0e0f8855f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/host/xhci-ring.c
View File

@ -3000,7 +3000,7 @@ static int prepare_ring(struct xhci_hcd *xhci, struct xhci_ring *ep_ring,
if (num_trbs >= TRBS_PER_SEGMENT) {
xhci_err(xhci, "Too many fragments %d, max %d\n",
num_trbs, TRBS_PER_SEGMENT - 1);
return -ENOMEM;
return -EINVAL;
}
nop_cmd = cpu_to_le32(TRB_TYPE(TRB_TR_NOOP) |

4
drivers/usb/host/xhci.c
View File

@ -4730,8 +4730,8 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
struct device *dev = hcd->self.controller;
int retval;
/* Accept arbitrarily long scatter-gather lists */
hcd->self.sg_tablesize = ~0;
/* Limit the block layer scatter-gather lists to half a segment. */
hcd->self.sg_tablesize = TRBS_PER_SEGMENT / 2;
/* support to build packet from discontinuous buffers */
hcd->self.no_sg_constraint = 1;

2
drivers/usb/host/xhci.h
View File

@ -1279,7 +1279,7 @@ union xhci_trb {
* since the command ring is 64-byte aligned.
* It must also be greater than 16.
*/
#define TRBS_PER_SEGMENT 64
#define TRBS_PER_SEGMENT 256
/* Allow two commands + a link TRB, along with any reserved command TRBs */
#define MAX_RSVD_CMD_TRBS (TRBS_PER_SEGMENT - 3)
#define TRB_SEGMENT_SIZE (TRBS_PER_SEGMENT*16)