Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2694a48d authored by Robert Morell's avatar Robert Morell Committed by Greg Kroah-Hartman
Browse files

USB: HCD: Add driver hooks for (un)?map_urb_for_dma 



Provide optional hooks for the host controller driver to override the
default DMA mapping and unmapping routines.  In general, these shouldn't
be necessary unless the host controller has special DMA requirements,
such as alignment contraints.  If these are not specified, the
general usb_hcd_(un)?map_urb_for_dma functions will be used instead.
Also, pass the status to unmap_urb_for_dma so it can know whether the
DMA buffer has been overwritten.

Finally, add a flag to be used by these implementations if they
allocated a temporary buffer so it can be freed properly when unmapping.

Signed-off-by: default avatarRobert Morell <rmorell@nvidia.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c8cf203a

drivers/usb/core/hcd.c

+20 −2
Original line number Diff line number Diff line
@@ -1281,6 +1281,14 @@ void usb_hcd_unmap_urb_setup_for_dma(struct usb_hcd *hcd, struct urb *urb) 
}

EXPORT_SYMBOL_GPL(usb_hcd_unmap_urb_setup_for_dma);



static void unmap_urb_for_dma(struct usb_hcd *hcd, struct urb *urb)

{

	if (hcd->driver->unmap_urb_for_dma)

		hcd->driver->unmap_urb_for_dma(hcd, urb);

	else

		usb_hcd_unmap_urb_for_dma(hcd, urb);

}



void usb_hcd_unmap_urb_for_dma(struct usb_hcd *hcd, struct urb *urb)

{

	enum dma_data_direction dir;
@@ -1318,6 +1326,15 @@ EXPORT_SYMBOL_GPL(usb_hcd_unmap_urb_for_dma); 


static int map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb,

			   gfp_t mem_flags)

{

	if (hcd->driver->map_urb_for_dma)

		return hcd->driver->map_urb_for_dma(hcd, urb, mem_flags);

	else

		return usb_hcd_map_urb_for_dma(hcd, urb, mem_flags);

}



int usb_hcd_map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb,

			    gfp_t mem_flags)

{

	enum dma_data_direction dir;

	int ret = 0;
@@ -1414,6 +1431,7 @@ static int map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb, 
	}

	return ret;

}

EXPORT_SYMBOL_GPL(usb_hcd_map_urb_for_dma);



/*-------------------------------------------------------------------------*/
@@ -1451,7 +1469,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags) 
		if (likely(status == 0)) {

			status = hcd->driver->urb_enqueue(hcd, urb, mem_flags);

			if (unlikely(status))

				usb_hcd_unmap_urb_for_dma(hcd, urb);

				unmap_urb_for_dma(hcd, urb);

		}

	}
@@ -1557,7 +1575,7 @@ void usb_hcd_giveback_urb(struct usb_hcd *hcd, struct urb *urb, int status) 
			!status))

		status = -EREMOTEIO;



	usb_hcd_unmap_urb_for_dma(hcd, urb);

	unmap_urb_for_dma(hcd, urb);

	usbmon_urb_complete(&hcd->self, urb, status);

	usb_unanchor_urb(urb);

include/linux/usb.h

+1 −0
Original line number Diff line number Diff line
@@ -976,6 +976,7 @@ extern int usb_disabled(void); 
#define URB_SETUP_MAP_SINGLE	0x00100000	/* Setup packet DMA mapped */

#define URB_SETUP_MAP_LOCAL	0x00200000	/* HCD-local setup packet */

#define URB_DMA_SG_COMBINED	0x00400000	/* S-G entries were combined */

#define URB_ALIGNED_TEMP_BUFFER	0x00800000	/* Temp buffer was alloc'd */



struct usb_iso_packet_descriptor {

	unsigned int offset;

include/linux/usb/hcd.h

+15 −0
Original line number Diff line number Diff line
@@ -233,6 +233,19 @@ struct hc_driver { 
	int	(*urb_dequeue)(struct usb_hcd *hcd,

				struct urb *urb, int status);



	/*

	 * (optional) these hooks allow an HCD to override the default DMA

	 * mapping and unmapping routines.  In general, they shouldn't be

	 * necessary unless the host controller has special DMA requirements,

	 * such as alignment contraints.  If these are not specified, the

	 * general usb_hcd_(un)?map_urb_for_dma functions will be used instead

	 * (and it may be a good idea to call these functions in your HCD

	 * implementation)

	 */

	int	(*map_urb_for_dma)(struct usb_hcd *hcd, struct urb *urb,

				   gfp_t mem_flags);

	void    (*unmap_urb_for_dma)(struct usb_hcd *hcd, struct urb *urb);



	/* hw synch, freeing endpoint resources that urb_dequeue can't */

	void	(*endpoint_disable)(struct usb_hcd *hcd,

			struct usb_host_endpoint *ep);
@@ -329,6 +342,8 @@ 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 void usb_hcd_giveback_urb(struct usb_hcd *hcd, struct urb *urb,

		int status);

extern int usb_hcd_map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb,

		gfp_t mem_flags);

extern void usb_hcd_unmap_urb_setup_for_dma(struct usb_hcd *, struct urb *);

extern void usb_hcd_unmap_urb_for_dma(struct usb_hcd *, struct urb *);

extern void usb_hcd_flush_endpoint(struct usb_device *udev,