Pull USB fixes from Greg KH: "Here are number of small USB fixes for 5.3-rc5. Syzbot has been on a tear recently now that it has some good USB debugging hooks integrated, so there's a number of fixes in here found by those tools for some _very_ old bugs. Also a handful of gadget driver fixes for reported issues, some hopefully-final dma fixes for host controller drivers, and some new USB serial gadget driver ids. All of these have been in linux-next this week with no reported issues (the usb-serial ones were in linux-next in its own branch, but merged into mine on Friday)" * tag 'usb-5.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: usb: add a hcd_uses_dma helper usb: don't create dma pools for HCDs with a localmem_pool usb: chipidea: imx: fix EPROBE_DEFER support during driver probe usb: host: fotg2: restart hcd after port reset USB: CDC: fix sanity checks in CDC union parser usb: cdc-acm: make sure a refcount is taken early enough USB: serial: option: add the BroadMobi BM818 card USB: serial: option: Add Motorola modem UARTs USB: core: Fix races in character device registration and deregistraion usb: gadget: mass_storage: Fix races between fsg_disable and fsg_set_alt usb: gadget: composite: Clear "suspended" on reset/disconnect usb: gadget: udc: renesas_usb3: Fix sysfs interface of "role" USB: serial: option: add D-Link DWM-222 device ID USB: serial: option: Add support for ZTE MF871A
Showing the changes to include/linux (2 of 14 files). Show all
Unified · Split
| @@ -1457,7 +1457,7 @@ typedef void (*usb_complete_t)(struct urb *); · 1456 unmodified lines | ||
| 1457 | 1457 | * field rather than determining a dma address themselves. |
| 1458 | 1458 | * |
| 1459 | 1459 | * Note that transfer_buffer must still be set if the controller |
| 1460 | − * does not support DMA (as indicated by bus.uses_dma) and when talking | |
| 1460 | + * does not support DMA (as indicated by hcd_uses_dma()) and when talking | |
| 1461 | 1461 | * to root hub. If you have to trasfer between highmem zone and the device |
| 1462 | 1462 | * on such controller, create a bounce buffer or bail out with an error. |
| 1463 | 1463 | * If transfer_buffer cannot be set (is in highmem) and the controller is DMA |
| @@ -422,6 +422,9 @@ static inline bool hcd_periodic_completion_in_progress(struct usb_hcd *hcd, · 421 unmodified lines | ||
| 422 | 422 | return hcd->high_prio_bh.completing_ep == ep; |
| 423 | 423 | } |
| 424 | 424 | |
| 425 | +#define hcd_uses_dma(hcd) \ | |
| 426 | + (IS_ENABLED(CONFIG_HAS_DMA) && (hcd)->self.uses_dma) | |
| 427 | + | |
| 425 | 428 | extern int usb_hcd_link_urb_to_ep(struct usb_hcd *hcd, struct urb *urb); |
| 426 | 429 | extern int usb_hcd_check_unlink_urb(struct usb_hcd *hcd, struct urb *urb, |
| 427 | 430 | int status); |