target/linux/bcm27xx/patches-5.4/950-0444-pcie-brcmstb-Correct-SoC-name.patch

   1 From 900b4ad0814df7dbacb01318bf49af5bab605fa0 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.com>
   3 Date: Fri, 31 Jan 2020 09:39:40 +0000
   4 Subject: [PATCH] pcie-brcmstb: Correct SoC name
   5
   6 The Pi 4 SoC is called BCM2711, not BCM2838.
   7
   8 Fixes: "bcm2835-dma: Add proper 40-bit DMA support"
   9 Fixes: "Ported pcie-brcmstb bounce buffer implementation to ARM64."
  10
  11 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  12 ---
  13  drivers/pci/controller/pcie-brcmstb-bounce.c   | 10 +++++-----
  14  drivers/pci/controller/pcie-brcmstb-bounce64.c | 10 +++++-----
  15  2 files changed, 10 insertions(+), 10 deletions(-)
  16
  17 --- a/drivers/pci/controller/pcie-brcmstb-bounce.c
  18 +++ b/drivers/pci/controller/pcie-brcmstb-bounce.c
  19 @@ -91,8 +91,8 @@ struct dmabounce_device_info {
  20
  21  static struct dmabounce_device_info *g_dmabounce_device_info;
  22
  23 -extern int bcm2838_dma40_memcpy_init(void);
  24 -extern void bcm2838_dma40_memcpy(dma_addr_t dst, dma_addr_t src, size_t size);
  25 +extern int bcm2711_dma40_memcpy_init(void);
  26 +extern void bcm2711_dma40_memcpy(dma_addr_t dst, dma_addr_t src, size_t size);
  27
  28  #ifdef STATS
  29  static ssize_t
  30 @@ -320,7 +320,7 @@ map_single(struct device *dev, struct sa
  31
  32         if ((dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL) &&
  33             !(attrs & DMA_ATTR_SKIP_CPU_SYNC))
  34 -               bcm2838_dma40_memcpy(buf->safe_dma_addr, buf->unsafe_dma_addr,
  35 +               bcm2711_dma40_memcpy(buf->safe_dma_addr, buf->unsafe_dma_addr,
  36                                      size);
  37
  38         return buf->safe_dma_addr;
  39 @@ -338,7 +338,7 @@ unmap_single(struct device *dev, struct
  40                 dev_dbg(dev, "unmap: %llx->%llx\n", (u64)buf->safe_dma_addr,
  41                         (u64)buf->unsafe_dma_addr);
  42
  43 -               bcm2838_dma40_memcpy(buf->unsafe_dma_addr, buf->safe_dma_addr,
  44 +               bcm2711_dma40_memcpy(buf->unsafe_dma_addr, buf->safe_dma_addr,
  45                                      size);
  46         }
  47         return buf->unsafe_dma_addr;
  48 @@ -476,7 +476,7 @@ int brcm_pcie_bounce_init(struct device
  49         if (g_dmabounce_device_info)
  50                 return -EBUSY;
  51
  52 -       ret = bcm2838_dma40_memcpy_init();
  53 +       ret = bcm2711_dma40_memcpy_init();
  54         if (ret)
  55                 return ret;
  56
  57 --- a/drivers/pci/controller/pcie-brcmstb-bounce64.c
  58 +++ b/drivers/pci/controller/pcie-brcmstb-bounce64.c
  59 @@ -93,8 +93,8 @@ struct dmabounce_device_info {
  60
  61  static struct dmabounce_device_info *g_dmabounce_device_info;
  62
  63 -extern int bcm2838_dma40_memcpy_init(void);
  64 -extern void bcm2838_dma40_memcpy(dma_addr_t dst, dma_addr_t src, size_t size);
  65 +extern int bcm2711_dma40_memcpy_init(void);
  66 +extern void bcm2711_dma40_memcpy(dma_addr_t dst, dma_addr_t src, size_t size);
  67
  68  #ifdef STATS
  69  static ssize_t
  70 @@ -322,7 +322,7 @@ map_single(struct device *dev, struct sa
  71
  72         if ((dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL) &&
  73             !(attrs & DMA_ATTR_SKIP_CPU_SYNC))
  74 -               bcm2838_dma40_memcpy(buf->safe_dma_addr, buf->unsafe_dma_addr,
  75 +               bcm2711_dma40_memcpy(buf->safe_dma_addr, buf->unsafe_dma_addr,
  76                                      size);
  77
  78         return buf->safe_dma_addr;
  79 @@ -340,7 +340,7 @@ unmap_single(struct device *dev, struct
  80                 dev_dbg(dev, "unmap: %llx->%llx\n", (u64)buf->safe_dma_addr,
  81                         (u64)buf->unsafe_dma_addr);
  82
  83 -               bcm2838_dma40_memcpy(buf->unsafe_dma_addr, buf->safe_dma_addr,
  84 +               bcm2711_dma40_memcpy(buf->unsafe_dma_addr, buf->safe_dma_addr,
  85                                      size);
  86         }
  87         return buf->unsafe_dma_addr;
  88 @@ -483,7 +483,7 @@ int brcm_pcie_bounce_init(struct device
  89         if (g_dmabounce_device_info)
  90                 return -EBUSY;
  91
  92 -       ret = bcm2838_dma40_memcpy_init();
  93 +       ret = bcm2711_dma40_memcpy_init();
  94         if (ret)
  95                 return ret;
  96