mirror of https://gitee.com/openkylin/linux.git
USB: introduce unmap_urb_setup_for_dma()
Split unmap_urb_for_dma() to allow just the setup buffer to be unmapped. This allows HCDs to use PIO for the setup buffer if it is not suitable for DMA. Signed-off-by: Martin Fuzzey <mfuzzey@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
7a7e789642
commit
1dae423dd9
|
@ -1263,10 +1263,8 @@ static void hcd_free_coherent(struct usb_bus *bus, dma_addr_t *dma_handle,
|
||||||
*dma_handle = 0;
|
*dma_handle = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void unmap_urb_for_dma(struct usb_hcd *hcd, struct urb *urb)
|
void unmap_urb_setup_for_dma(struct usb_hcd *hcd, struct urb *urb)
|
||||||
{
|
{
|
||||||
enum dma_data_direction dir;
|
|
||||||
|
|
||||||
if (urb->transfer_flags & URB_SETUP_MAP_SINGLE)
|
if (urb->transfer_flags & URB_SETUP_MAP_SINGLE)
|
||||||
dma_unmap_single(hcd->self.controller,
|
dma_unmap_single(hcd->self.controller,
|
||||||
urb->setup_dma,
|
urb->setup_dma,
|
||||||
|
@ -1279,6 +1277,17 @@ void unmap_urb_for_dma(struct usb_hcd *hcd, struct urb *urb)
|
||||||
sizeof(struct usb_ctrlrequest),
|
sizeof(struct usb_ctrlrequest),
|
||||||
DMA_TO_DEVICE);
|
DMA_TO_DEVICE);
|
||||||
|
|
||||||
|
/* Make it safe to call this routine more than once */
|
||||||
|
urb->transfer_flags &= ~(URB_SETUP_MAP_SINGLE | URB_SETUP_MAP_LOCAL);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(unmap_urb_setup_for_dma);
|
||||||
|
|
||||||
|
void unmap_urb_for_dma(struct usb_hcd *hcd, struct urb *urb)
|
||||||
|
{
|
||||||
|
enum dma_data_direction dir;
|
||||||
|
|
||||||
|
unmap_urb_setup_for_dma(hcd, urb);
|
||||||
|
|
||||||
dir = usb_urb_dir_in(urb) ? DMA_FROM_DEVICE : DMA_TO_DEVICE;
|
dir = usb_urb_dir_in(urb) ? DMA_FROM_DEVICE : DMA_TO_DEVICE;
|
||||||
if (urb->transfer_flags & URB_DMA_MAP_SG)
|
if (urb->transfer_flags & URB_DMA_MAP_SG)
|
||||||
dma_unmap_sg(hcd->self.controller,
|
dma_unmap_sg(hcd->self.controller,
|
||||||
|
@ -1303,8 +1312,7 @@ void unmap_urb_for_dma(struct usb_hcd *hcd, struct urb *urb)
|
||||||
dir);
|
dir);
|
||||||
|
|
||||||
/* Make it safe to call this routine more than once */
|
/* Make it safe to call this routine more than once */
|
||||||
urb->transfer_flags &= ~(URB_SETUP_MAP_SINGLE | URB_SETUP_MAP_LOCAL |
|
urb->transfer_flags &= ~(URB_DMA_MAP_SG | URB_DMA_MAP_PAGE |
|
||||||
URB_DMA_MAP_SG | URB_DMA_MAP_PAGE |
|
|
||||||
URB_DMA_MAP_SINGLE | URB_MAP_LOCAL);
|
URB_DMA_MAP_SINGLE | URB_MAP_LOCAL);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(unmap_urb_for_dma);
|
EXPORT_SYMBOL_GPL(unmap_urb_for_dma);
|
||||||
|
|
|
@ -329,6 +329,7 @@ extern int usb_hcd_submit_urb(struct urb *urb, gfp_t mem_flags);
|
||||||
extern int usb_hcd_unlink_urb(struct urb *urb, int status);
|
extern int usb_hcd_unlink_urb(struct urb *urb, int status);
|
||||||
extern void usb_hcd_giveback_urb(struct usb_hcd *hcd, struct urb *urb,
|
extern void usb_hcd_giveback_urb(struct usb_hcd *hcd, struct urb *urb,
|
||||||
int status);
|
int status);
|
||||||
|
extern void unmap_urb_setup_for_dma(struct usb_hcd *, struct urb *);
|
||||||
extern void unmap_urb_for_dma(struct usb_hcd *, struct urb *);
|
extern void unmap_urb_for_dma(struct usb_hcd *, struct urb *);
|
||||||
extern void usb_hcd_flush_endpoint(struct usb_device *udev,
|
extern void usb_hcd_flush_endpoint(struct usb_device *udev,
|
||||||
struct usb_host_endpoint *ep);
|
struct usb_host_endpoint *ep);
|
||||||
|
|
Loading…
Reference in New Issue