1 From a44147a09baf8c46cc0b02332df3a4656e0659d5 Mon Sep 17 00:00:00 2001
2 From: Arne Fitzenreiter <arne_f@ipfire.org>
3 Date: Mon, 10 Dec 2018 13:12:00 +0100
4 Subject: [PATCH] Revert "usb: dwc2: Fix DMA alignment to start at allocated
7 This reverts commit 68fc92a0f3913d539d1ac68a861f895e34099e46.
9 drivers/usb/dwc2/hcd.c | 44 +++++++++++++++++++++-----------------------
10 1 file changed, 21 insertions(+), 23 deletions(-)
12 diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
13 index fa20ec4..4b81d08 100644
14 --- a/drivers/usb/dwc2/hcd.c
15 +++ b/drivers/usb/dwc2/hcd.c
16 @@ -2644,29 +2644,34 @@ static int dwc2_alloc_split_dma_aligned_buf(struct dwc2_hsotg *hsotg,
18 #define DWC2_USB_DMA_ALIGN 4
20 +struct dma_aligned_buffer {
22 + void *old_xfer_buffer;
26 static void dwc2_free_dma_aligned_buffer(struct urb *urb)
28 - void *stored_xfer_buffer;
29 + struct dma_aligned_buffer *temp;
31 if (!(urb->transfer_flags & URB_ALIGNED_TEMP_BUFFER))
34 - /* Restore urb->transfer_buffer from the end of the allocated area */
35 - memcpy(&stored_xfer_buffer, urb->transfer_buffer +
36 - urb->transfer_buffer_length, sizeof(urb->transfer_buffer));
37 + temp = container_of(urb->transfer_buffer,
38 + struct dma_aligned_buffer, data);
40 if (usb_urb_dir_in(urb))
41 - memcpy(stored_xfer_buffer, urb->transfer_buffer,
42 + memcpy(temp->old_xfer_buffer, temp->data,
43 urb->transfer_buffer_length);
44 - kfree(urb->transfer_buffer);
45 - urb->transfer_buffer = stored_xfer_buffer;
46 + urb->transfer_buffer = temp->old_xfer_buffer;
47 + kfree(temp->kmalloc_ptr);
49 urb->transfer_flags &= ~URB_ALIGNED_TEMP_BUFFER;
52 static int dwc2_alloc_dma_aligned_buffer(struct urb *urb, gfp_t mem_flags)
55 + struct dma_aligned_buffer *temp, *kmalloc_ptr;
58 if (urb->num_sgs || urb->sg ||
59 @@ -2674,29 +2679,22 @@ static int dwc2_alloc_dma_aligned_buffer(struct urb *urb, gfp_t mem_flags)
60 !((uintptr_t)urb->transfer_buffer & (DWC2_USB_DMA_ALIGN - 1)))
64 - * Allocate a buffer with enough padding for original transfer_buffer
65 - * pointer. This allocation is guaranteed to be aligned properly for
68 + /* Allocate a buffer with enough padding for alignment */
69 kmalloc_size = urb->transfer_buffer_length +
70 - sizeof(urb->transfer_buffer);
71 + sizeof(struct dma_aligned_buffer) + DWC2_USB_DMA_ALIGN - 1;
73 kmalloc_ptr = kmalloc(kmalloc_size, mem_flags);
78 - * Position value of original urb->transfer_buffer pointer to the end
79 - * of allocation for later referencing
81 - memcpy(kmalloc_ptr + urb->transfer_buffer_length,
82 - &urb->transfer_buffer, sizeof(urb->transfer_buffer));
84 + /* Position our struct dma_aligned_buffer such that data is aligned */
85 + temp = PTR_ALIGN(kmalloc_ptr + 1, DWC2_USB_DMA_ALIGN) - 1;
86 + temp->kmalloc_ptr = kmalloc_ptr;
87 + temp->old_xfer_buffer = urb->transfer_buffer;
88 if (usb_urb_dir_out(urb))
89 - memcpy(kmalloc_ptr, urb->transfer_buffer,
90 + memcpy(temp->data, urb->transfer_buffer,
91 urb->transfer_buffer_length);
92 - urb->transfer_buffer = kmalloc_ptr;
93 + urb->transfer_buffer = temp->data;
95 urb->transfer_flags |= URB_ALIGNED_TEMP_BUFFER;