lkml.org 
[lkml]   [2020]   [Apr]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 23/78] dma-debug: fix displaying of dma allocation type
    Date
    From: Grygorii Strashko <grygorii.strashko@ti.com>

    [ Upstream commit 9bb50ed7470944238ec8e30a94ef096caf9056ee ]

    The commit 2e05ea5cdc1a ("dma-mapping: implement dma_map_single_attrs using
    dma_map_page_attrs") removed "dma_debug_page" enum, but missed to update
    type2name string table. This causes incorrect displaying of dma allocation
    type.
    Fix it by removing "page" string from type2name string table and switch to
    use named initializers.

    Before (dma_alloc_coherent()):
    k3-ringacc 4b800000.ringacc: scather-gather idx 2208 P=d1140000 N=d114 D=d1140000 L=40 DMA_BIDIRECTIONAL dma map error check not applicable
    k3-ringacc 4b800000.ringacc: scather-gather idx 2216 P=d1150000 N=d115 D=d1150000 L=40 DMA_BIDIRECTIONAL dma map error check not applicable

    After:
    k3-ringacc 4b800000.ringacc: coherent idx 2208 P=d1140000 N=d114 D=d1140000 L=40 DMA_BIDIRECTIONAL dma map error check not applicable
    k3-ringacc 4b800000.ringacc: coherent idx 2216 P=d1150000 N=d115 D=d1150000 L=40 DMA_BIDIRECTIONAL dma map error check not applicable

    Fixes: 2e05ea5cdc1a ("dma-mapping: implement dma_map_single_attrs using dma_map_page_attrs")
    Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    kernel/dma/debug.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c
    index 4ad74f5987ea9..cb6425e52bf7a 100644
    --- a/kernel/dma/debug.c
    +++ b/kernel/dma/debug.c
    @@ -137,9 +137,12 @@ static const char *const maperr2str[] = {
    [MAP_ERR_CHECKED] = "dma map error checked",
    };

    -static const char *type2name[5] = { "single", "page",
    - "scather-gather", "coherent",
    - "resource" };
    +static const char *type2name[] = {
    + [dma_debug_single] = "single",
    + [dma_debug_sg] = "scather-gather",
    + [dma_debug_coherent] = "coherent",
    + [dma_debug_resource] = "resource",
    +};

    static const char *dir2name[4] = { "DMA_BIDIRECTIONAL", "DMA_TO_DEVICE",
    "DMA_FROM_DEVICE", "DMA_NONE" };
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-04-18 16:42    [W:4.030 / U:1.768 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site