Pull USB/PHY updates from Greg KH: "Here's the big set of USB/PHY patches for 4.10-rc1. A number of new drivers are here in this set of changes. We have a new USB controller type "mtu3", a new usb-serial driver, and the usual churn in the gadget subsystem and the xhci host controller driver, along with a few other new small drivers added. And lots of little other changes all over the USB and PHY driver tree. Full details are in the shortlog All of these have been in linux-next for a while with no reported issues" * tag 'usb-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (309 commits) USB: serial: option: add dlink dwm-158 USB: serial: option: add support for Telit LE922A PIDs 0x1040, 0x1041 USB: OHCI: nxp: fix code warnings USB: OHCI: nxp: remove useless extern declaration USB: OHCI: at91: remove useless extern declaration usb: misc: rio500: fix result type for error message usb: mtu3: fix U3 port link issue usb: mtu3: enable auto switch from U3 to U2 usbip: fix warning in vhci_hcd_probe/lockdep_init_map usb: core: usbport: Use proper LED API to fix potential crash usbip: add missing compile time generated files to .gitignore usb: hcd.h: construct hub class request constants from simpler constants USB: OHCI: ohci-pxa27x: remove useless functions USB: OHCI: omap: remove useless extern declaration USB: OHCI: ohci-omap: remove useless functions USB: OHCI: ohci-s3c2410: remove useless functions USB: cdc-acm: add device id for GW Instek AFG-125 fsl/usb: Workarourd for USB erratum-A005697 usb: hub: Wait for connection to be reestablished after port reset usbip: vudc: Refactor init_vudc_hw() to be more obvious ...
Showing the changes to include/uapi/linux (1 of 220 files). Show all
Unified · Split
| @@ -423,6 +423,12 @@ struct usb_endpoint_descriptor { · 422 unmodified lines | |||
| 423 | #define USB_ENDPOINT_XFER_INT 3 | 423 | #define USB_ENDPOINT_XFER_INT 3 |
| 424 | #define USB_ENDPOINT_MAX_ADJUSTABLE 0x80 | 424 | #define USB_ENDPOINT_MAX_ADJUSTABLE 0x80 |
| 425 | 425 | ||
| 426 | #define USB_ENDPOINT_MAXP_MASK 0x07ff | ||
| 427 | #define USB_EP_MAXP_MULT_SHIFT 11 | ||
| 428 | #define USB_EP_MAXP_MULT_MASK (3 << USB_EP_MAXP_MULT_SHIFT) | ||
| 429 | #define USB_EP_MAXP_MULT(m) \ | ||
| 430 | (((m) & USB_EP_MAXP_MULT_MASK) >> USB_EP_MAXP_MULT_SHIFT) | ||
| 431 | |||
| 426 | /* The USB 3.0 spec redefines bits 5:4 of bmAttributes as interrupt ep type. */ | 432 | /* The USB 3.0 spec redefines bits 5:4 of bmAttributes as interrupt ep type. */ |
| 427 | #define USB_ENDPOINT_INTRTYPE 0x30 | 433 | #define USB_ENDPOINT_INTRTYPE 0x30 |
| 428 | #define USB_ENDPOINT_INTR_PERIODIC (0 << 4) | 434 | #define USB_ENDPOINT_INTR_PERIODIC (0 << 4) |
| @@ -623,11 +629,25 @@ static inline int usb_endpoint_is_isoc_out( · 194 unmodified lines | |||
| 623 | * usb_endpoint_maxp - get endpoint's max packet size | 629 | * usb_endpoint_maxp - get endpoint's max packet size |
| 624 | * @epd: endpoint to be checked | 630 | * @epd: endpoint to be checked |
| 625 | * | 631 | * |
| 626 | * Returns @epd's max packet | 632 | * Returns @epd's max packet bits [10:0] |
| 627 | */ | 633 | */ |
| 628 | static inline int usb_endpoint_maxp(const struct usb_endpoint_descriptor *epd) | 634 | static inline int usb_endpoint_maxp(const struct usb_endpoint_descriptor *epd) |
| 629 | { | 635 | { |
| 630 | return __le16_to_cpu(epd->wMaxPacketSize); | 636 | return __le16_to_cpu(epd->wMaxPacketSize) & USB_ENDPOINT_MAXP_MASK; |
| 637 | } | ||
| 638 | |||
| 639 | /** | ||
| 640 | * usb_endpoint_maxp_mult - get endpoint's transactional opportunities | ||
| 641 | * @epd: endpoint to be checked | ||
| 642 | * | ||
| 643 | * Return @epd's wMaxPacketSize[12:11] + 1 | ||
| 644 | */ | ||
| 645 | static inline int | ||
| 646 | usb_endpoint_maxp_mult(const struct usb_endpoint_descriptor *epd) | ||
| 647 | { | ||
| 648 | int maxp = __le16_to_cpu(epd->wMaxPacketSize); | ||
| 649 | |||
| 650 | return USB_EP_MAXP_MULT(maxp) + 1; | ||
| 631 | } | 651 | } |
| 632 | 652 | ||
| 633 | static inline int usb_endpoint_interrupt_type( | 653 | static inline int usb_endpoint_interrupt_type( |