lkml.org 
[lkml]   [2019]   [May]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.0 081/122] ARM: orion: dont use using 64-bit DMA masks
    Date
    [ Upstream commit cd92d74d67c811dc22544430b9ac3029f5bd64c5 ]

    clang warns about statically defined DMA masks from the DMA_BIT_MASK
    macro with length 64:

    arch/arm/plat-orion/common.c:625:29: error: shift count >= width of type [-Werror,-Wshift-count-overflow]
    .coherent_dma_mask = DMA_BIT_MASK(64),
    ^~~~~~~~~~~~~~~~
    include/linux/dma-mapping.h:141:54: note: expanded from macro 'DMA_BIT_MASK'
    #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))

    The ones in orion shouldn't really be 64 bit masks, so changing them
    to what the driver can support avoids the warning.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Olof Johansson <olof@lixom.net>
    Signed-off-by: Sasha Levin (Microsoft) <sashal@kernel.org>
    ---
    arch/arm/plat-orion/common.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
    index a2399fd66e97..1e970873439c 100644
    --- a/arch/arm/plat-orion/common.c
    +++ b/arch/arm/plat-orion/common.c
    @@ -622,7 +622,7 @@ static struct platform_device orion_xor0_shared = {
    .resource = orion_xor0_shared_resources,
    .dev = {
    .dma_mask = &orion_xor_dmamask,
    - .coherent_dma_mask = DMA_BIT_MASK(64),
    + .coherent_dma_mask = DMA_BIT_MASK(32),
    .platform_data = &orion_xor0_pdata,
    },
    };
    @@ -683,7 +683,7 @@ static struct platform_device orion_xor1_shared = {
    .resource = orion_xor1_shared_resources,
    .dev = {
    .dma_mask = &orion_xor_dmamask,
    - .coherent_dma_mask = DMA_BIT_MASK(64),
    + .coherent_dma_mask = DMA_BIT_MASK(32),
    .platform_data = &orion_xor1_pdata,
    },
    };
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-05-06 17:07    [W:2.312 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site