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

Commit 0ede76fc authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: remove uses of URB_NO_SETUP_DMA_MAP 



This patch (as1350) removes all usages of coherent buffers for USB
control-request setup-packet buffers.  There's no good reason to
reserve coherent memory for these things; control requests are hardly
ever used in large quantity (the major exception is firmware
transfers, and they aren't time-critical).  Furthermore, only seven
drivers used it.  We might as well always use streaming DMA mappings
for setup-packet buffers, and remove some extra complexity from
usbcore.

The DMA-mapping portion of hcd.c is currently in flux.  A separate
patch will be submitted to remove support for URB_NO_SETUP_DMA_MAP
after everything else settles down.  The removal should go smoothly,
as by then nobody will be using it.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 749da5f8

drivers/hid/usbhid/hid-core.c

+3 −5
Original line number Diff line number Diff line
@@ -787,8 +787,7 @@ static int hid_alloc_buffers(struct usb_device *dev, struct hid_device *hid) 
			&usbhid->inbuf_dma);

	usbhid->outbuf = usb_buffer_alloc(dev, usbhid->bufsize, GFP_KERNEL,

			&usbhid->outbuf_dma);

	usbhid->cr = usb_buffer_alloc(dev, sizeof(*usbhid->cr), GFP_KERNEL,

			&usbhid->cr_dma);

	usbhid->cr = kmalloc(sizeof(*usbhid->cr), GFP_KERNEL);

	usbhid->ctrlbuf = usb_buffer_alloc(dev, usbhid->bufsize, GFP_KERNEL,

			&usbhid->ctrlbuf_dma);

	if (!usbhid->inbuf || !usbhid->outbuf || !usbhid->cr ||
@@ -846,7 +845,7 @@ static void hid_free_buffers(struct usb_device *dev, struct hid_device *hid) 


	usb_buffer_free(dev, usbhid->bufsize, usbhid->inbuf, usbhid->inbuf_dma);

	usb_buffer_free(dev, usbhid->bufsize, usbhid->outbuf, usbhid->outbuf_dma);

	usb_buffer_free(dev, sizeof(*(usbhid->cr)), usbhid->cr, usbhid->cr_dma);

	kfree(usbhid->cr);

	usb_buffer_free(dev, usbhid->bufsize, usbhid->ctrlbuf, usbhid->ctrlbuf_dma);

}
@@ -1007,9 +1006,8 @@ static int usbhid_start(struct hid_device *hid) 


	usb_fill_control_urb(usbhid->urbctrl, dev, 0, (void *) usbhid->cr,

			     usbhid->ctrlbuf, 1, hid_ctrl, hid);

	usbhid->urbctrl->setup_dma = usbhid->cr_dma;

	usbhid->urbctrl->transfer_dma = usbhid->ctrlbuf_dma;

	usbhid->urbctrl->transfer_flags |= (URB_NO_TRANSFER_DMA_MAP | URB_NO_SETUP_DMA_MAP);

	usbhid->urbctrl->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;



	if (!(hid->quirks & HID_QUIRK_NO_INIT_REPORTS))

		usbhid_init_reports(hid);

drivers/hid/usbhid/usbhid.h

+0 −1
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ struct usbhid_device { 


	struct urb *urbctrl;                                            /* Control URB */

	struct usb_ctrlrequest *cr;                                     /* Control request struct */

	dma_addr_t cr_dma;                                              /* Control request struct dma */

	struct hid_control_fifo ctrl[HID_CONTROL_FIFO_SIZE];  		/* Control fifo */

	unsigned char ctrlhead, ctrltail;                               /* Control fifo head & tail */

	char *ctrlbuf;                                                  /* Control buffer */

drivers/hid/usbhid/usbkbd.c

+3 −5
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ struct usb_kbd { 
	unsigned char *new;

	struct usb_ctrlrequest *cr;

	unsigned char *leds;

	dma_addr_t cr_dma;

	dma_addr_t new_dma;

	dma_addr_t leds_dma;

};
@@ -199,7 +198,7 @@ static int usb_kbd_alloc_mem(struct usb_device *dev, struct usb_kbd *kbd) 
		return -1;

	if (!(kbd->new = usb_buffer_alloc(dev, 8, GFP_ATOMIC, &kbd->new_dma)))

		return -1;

	if (!(kbd->cr = usb_buffer_alloc(dev, sizeof(struct usb_ctrlrequest), GFP_ATOMIC, &kbd->cr_dma)))

	if (!(kbd->cr = kmalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL)))

		return -1;

	if (!(kbd->leds = usb_buffer_alloc(dev, 1, GFP_ATOMIC, &kbd->leds_dma)))

		return -1;
@@ -212,7 +211,7 @@ static void usb_kbd_free_mem(struct usb_device *dev, struct usb_kbd *kbd) 
	usb_free_urb(kbd->irq);

	usb_free_urb(kbd->led);

	usb_buffer_free(dev, 8, kbd->new, kbd->new_dma);

	usb_buffer_free(dev, sizeof(struct usb_ctrlrequest), kbd->cr, kbd->cr_dma);

	kfree(kbd->cr);

	usb_buffer_free(dev, 1, kbd->leds, kbd->leds_dma);

}
@@ -304,9 +303,8 @@ static int usb_kbd_probe(struct usb_interface *iface, 
	usb_fill_control_urb(kbd->led, dev, usb_sndctrlpipe(dev, 0),

			     (void *) kbd->cr, kbd->leds, 1,

			     usb_kbd_led, kbd);

	kbd->led->setup_dma = kbd->cr_dma;

	kbd->led->transfer_dma = kbd->leds_dma;

	kbd->led->transfer_flags |= (URB_NO_TRANSFER_DMA_MAP | URB_NO_SETUP_DMA_MAP);

	kbd->led->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;



	error = input_register_device(kbd->dev);

	if (error)

drivers/input/misc/cm109.c

+3 −9
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ struct cm109_dev { 
	struct cm109_ctl_packet *ctl_data;

	dma_addr_t ctl_dma;

	struct usb_ctrlrequest *ctl_req;

	dma_addr_t ctl_req_dma;

	struct urb *urb_ctl;

	/*

	 * The 3 bitfields below are protected by ctl_submit_lock.
@@ -629,9 +628,7 @@ static const struct usb_device_id cm109_usb_table[] = { 


static void cm109_usb_cleanup(struct cm109_dev *dev)

{

	if (dev->ctl_req)

		usb_buffer_free(dev->udev, sizeof(*(dev->ctl_req)),

				dev->ctl_req, dev->ctl_req_dma);

	kfree(dev->ctl_req);

	if (dev->ctl_data)

		usb_buffer_free(dev->udev, USB_PKT_LEN,

				dev->ctl_data, dev->ctl_dma);
@@ -696,8 +693,7 @@ static int cm109_usb_probe(struct usb_interface *intf, 
	if (!dev->ctl_data)

		goto err_out;



	dev->ctl_req = usb_buffer_alloc(udev, sizeof(*(dev->ctl_req)),

					GFP_KERNEL, &dev->ctl_req_dma);

	dev->ctl_req = kmalloc(sizeof(*(dev->ctl_req)), GFP_KERNEL);

	if (!dev->ctl_req)

		goto err_out;
@@ -735,10 +731,8 @@ static int cm109_usb_probe(struct usb_interface *intf, 
	usb_fill_control_urb(dev->urb_ctl, udev, usb_sndctrlpipe(udev, 0),

			     (void *)dev->ctl_req, dev->ctl_data, USB_PKT_LEN,

			     cm109_urb_ctl_callback, dev);

	dev->urb_ctl->setup_dma = dev->ctl_req_dma;

	dev->urb_ctl->transfer_dma = dev->ctl_dma;

	dev->urb_ctl->transfer_flags |= URB_NO_SETUP_DMA_MAP |

					URB_NO_TRANSFER_DMA_MAP;

	dev->urb_ctl->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;

	dev->urb_ctl->dev = udev;



	/* find out the physical bus location */

drivers/input/misc/powermate.c

+2 −7
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ struct powermate_device { 
	dma_addr_t data_dma;

	struct urb *irq, *config;

	struct usb_ctrlrequest *configcr;

	dma_addr_t configcr_dma;

	struct usb_device *udev;

	struct input_dev *input;

	spinlock_t lock;
@@ -182,8 +181,6 @@ static void powermate_sync_state(struct powermate_device *pm) 
	usb_fill_control_urb(pm->config, pm->udev, usb_sndctrlpipe(pm->udev, 0),

			     (void *) pm->configcr, NULL, 0,

			     powermate_config_complete, pm);

	pm->config->setup_dma = pm->configcr_dma;

	pm->config->transfer_flags |= URB_NO_SETUP_DMA_MAP;



	if (usb_submit_urb(pm->config, GFP_ATOMIC))

		printk(KERN_ERR "powermate: usb_submit_urb(config) failed");
@@ -281,8 +278,7 @@ static int powermate_alloc_buffers(struct usb_device *udev, struct powermate_dev 
	if (!pm->data)

		return -1;



	pm->configcr = usb_buffer_alloc(udev, sizeof(*(pm->configcr)),

					GFP_ATOMIC, &pm->configcr_dma);

	pm->configcr = kmalloc(sizeof(*(pm->configcr)), GFP_KERNEL);

	if (!pm->configcr)

		return -1;
@@ -293,8 +289,7 @@ static void powermate_free_buffers(struct usb_device *udev, struct powermate_dev 
{

	usb_buffer_free(udev, POWERMATE_PAYLOAD_SIZE_MAX,

			pm->data, pm->data_dma);

	usb_buffer_free(udev, sizeof(*(pm->configcr)),

			pm->configcr, pm->configcr_dma);

	kfree(pm->configcr);

}



/* Called whenever a USB device matching one in our supported devices table is connected */