Commit 9bb50ed7 authored Apr 08, 2020 by Grygorii Strashko Committed by Christoph Hellwig Apr 08, 2020

dma-debug: fix displaying of dma allocation type

The commit 2e05ea5c ("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: 2e05ea5c ("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>

parent cdcda0d1

kernel/dma/debug.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -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" };

Admin message