USB: Allow transfer_buffer with transfer_dma (35d07fd5) · Commits · 戴 / test

Some host controller drivers may need a PIO fallback when a DMA channel is temporarily unavailable. This patch provides an address that such drivers can use for PIO in those cases, and nulls that field out when no such address is available (highmem) which should help usbmon. Signed-off-by:

Tony Lindgren <tony@atomide.com> Signed-off-by:

David Brownell <dbrownell@users.sourceforge.net> Signed-off-by:

Greg Kroah-Hartman <gregkh@suse.de>

drivers/usb/core/message.c

+15 −1

Original line number	Diff line number	Diff line
		@@ -412,10 +412,24 @@ int usb_sg_init (
		io->urbs [i]->status = -EINPROGRESS;
		io->urbs [i]->actual_length = 0;

		/*
		* Some systems need to revert to PIO when DMA is temporarily
		* unavailable. For their sakes, both transfer_buffer and
		* transfer_dma are set when possible. However this can only
		* work on systems without HIGHMEM, since DMA buffers located
		* in high memory are not directly addressable by the CPU for
		* PIO ... so when HIGHMEM is in use, transfer_buffer is NULL
		* to prevent stale pointers and to help spot bugs.
		*/
		if (dma) {
		/* hc may use _only_ transfer_dma */
		io->urbs [i]->transfer_dma = sg_dma_address (sg + i);
		len = sg_dma_len (sg + i);
		#ifdef CONFIG_HIGHMEM
		io->urbs[i]->transfer_buffer = NULL;
		#else
		io->urbs[i]->transfer_buffer =
		page_address(sg[i].page) + sg[i].offset;
		#endif
		} else {
		/* hc may use _only_ transfer_buffer */
		io->urbs [i]->transfer_buffer =

Admin message