queue-5.1/usb-dwc2-fix-dma-cache-alignment-issues.patch

   1 From 4a4863bf2e7932e584a3a462d3c6daf891142ddc Mon Sep 17 00:00:00 2001
   2 From: Martin Schiller <ms@dev.tdt.de>
   3 Date: Mon, 18 Feb 2019 07:37:30 +0100
   4 Subject: usb: dwc2: Fix DMA cache alignment issues
   5
   6 From: Martin Schiller <ms@dev.tdt.de>
   7
   8 commit 4a4863bf2e7932e584a3a462d3c6daf891142ddc upstream.
   9
  10 Insert a padding between data and the stored_xfer_buffer pointer to
  11 ensure they are not on the same cache line.
  12
  13 Otherwise, the stored_xfer_buffer gets corrupted for IN URBs on
  14 non-cache-coherent systems. (In my case: Lantiq xRX200 MIPS)
  15
  16 Fixes: 3bc04e28a030 ("usb: dwc2: host: Get aligned DMA in a more supported way")
  17 Fixes: 56406e017a88 ("usb: dwc2: Fix DMA alignment to start at allocated boundary")
  18 Cc: <stable@vger.kernel.org>
  19 Tested-by: Douglas Anderson <dianders@chromium.org>
  20 Reviewed-by: Douglas Anderson <dianders@chromium.org>
  21 Acked-by: Minas Harutyunyan <hminas@synopsys.com>
  22 Signed-off-by: Martin Schiller <ms@dev.tdt.de>
  23 Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
  24 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  25
  26 ---
  27  drivers/usb/dwc2/hcd.c |   10 +++++++---
  28  1 file changed, 7 insertions(+), 3 deletions(-)
  29
  30 --- a/drivers/usb/dwc2/hcd.c
  31 +++ b/drivers/usb/dwc2/hcd.c
  32 @@ -2664,8 +2664,10 @@ static void dwc2_free_dma_aligned_buffer
  33                 return;
  34
  35         /* Restore urb->transfer_buffer from the end of the allocated area */
  36 -       memcpy(&stored_xfer_buffer, urb->transfer_buffer +
  37 -              urb->transfer_buffer_length, sizeof(urb->transfer_buffer));
  38 +       memcpy(&stored_xfer_buffer,
  39 +              PTR_ALIGN(urb->transfer_buffer + urb->transfer_buffer_length,
  40 +                        dma_get_cache_alignment()),
  41 +              sizeof(urb->transfer_buffer));
  42
  43         if (usb_urb_dir_in(urb)) {
  44                 if (usb_pipeisoc(urb->pipe))
  45 @@ -2697,6 +2699,7 @@ static int dwc2_alloc_dma_aligned_buffer
  46          * DMA
  47          */
  48         kmalloc_size = urb->transfer_buffer_length +
  49 +               (dma_get_cache_alignment() - 1) +
  50                 sizeof(urb->transfer_buffer);
  51
  52         kmalloc_ptr = kmalloc(kmalloc_size, mem_flags);
  53 @@ -2707,7 +2710,8 @@ static int dwc2_alloc_dma_aligned_buffer
  54          * Position value of original urb->transfer_buffer pointer to the end
  55          * of allocation for later referencing
  56          */
  57 -       memcpy(kmalloc_ptr + urb->transfer_buffer_length,
  58 +       memcpy(PTR_ALIGN(kmalloc_ptr + urb->transfer_buffer_length,
  59 +                        dma_get_cache_alignment()),
  60                &urb->transfer_buffer, sizeof(urb->transfer_buffer));
  61
  62         if (usb_urb_dir_out(urb))