releases/5.0.14/arm-orion-don-t-use-using-64-bit-dma-masks.patch

   1 From 583df96e44b8ff96dc138f508bcf612eca24aae3 Mon Sep 17 00:00:00 2001
   2 From: Arnd Bergmann <arnd@arndb.de>
   3 Date: Mon, 25 Mar 2019 16:50:42 +0100
   4 Subject: ARM: orion: don't use using 64-bit DMA masks
   5
   6 [ Upstream commit cd92d74d67c811dc22544430b9ac3029f5bd64c5 ]
   7
   8 clang warns about statically defined DMA masks from the DMA_BIT_MASK
   9 macro with length 64:
  10
  11 arch/arm/plat-orion/common.c:625:29: error: shift count >= width of type [-Werror,-Wshift-count-overflow]
  12                 .coherent_dma_mask      = DMA_BIT_MASK(64),
  13                                           ^~~~~~~~~~~~~~~~
  14 include/linux/dma-mapping.h:141:54: note: expanded from macro 'DMA_BIT_MASK'
  15  #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
  16
  17 The ones in orion shouldn't really be 64 bit masks, so changing them
  18 to what the driver can support avoids the warning.
  19
  20 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  21 Signed-off-by: Olof Johansson <olof@lixom.net>
  22 Signed-off-by: Sasha Levin (Microsoft) <sashal@kernel.org>
  23 ---
  24  arch/arm/plat-orion/common.c | 4 ++--
  25  1 file changed, 2 insertions(+), 2 deletions(-)
  26
  27 diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
  28 index a2399fd66e97..1e970873439c 100644
  29 --- a/arch/arm/plat-orion/common.c
  30 +++ b/arch/arm/plat-orion/common.c
  31 @@ -622,7 +622,7 @@ static struct platform_device orion_xor0_shared = {
  32         .resource       = orion_xor0_shared_resources,
  33         .dev            = {
  34                 .dma_mask               = &orion_xor_dmamask,
  35 -               .coherent_dma_mask      = DMA_BIT_MASK(64),
  36 +               .coherent_dma_mask      = DMA_BIT_MASK(32),
  37                 .platform_data          = &orion_xor0_pdata,
  38         },
  39  };
  40 @@ -683,7 +683,7 @@ static struct platform_device orion_xor1_shared = {
  41         .resource       = orion_xor1_shared_resources,
  42         .dev            = {
  43                 .dma_mask               = &orion_xor_dmamask,
  44 -               .coherent_dma_mask      = DMA_BIT_MASK(64),
  45 +               .coherent_dma_mask      = DMA_BIT_MASK(32),
  46                 .platform_data          = &orion_xor1_pdata,
  47         },
  48  };
  49 --
  50 2.20.1
  51