Skip to content

Commit 9bb50ed

Browse files
grygoriySChristoph Hellwig
authored andcommitted
dma-debug: fix displaying of dma allocation type
The commit 2e05ea5 ("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: 2e05ea5 ("dma-mapping: implement dma_map_single_attrs using dma_map_page_attrs") Signed-off-by: Grygorii Strashko <[email protected]> Signed-off-by: Christoph Hellwig <[email protected]>
1 parent cdcda0d commit 9bb50ed

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

kernel/dma/debug.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,12 @@ static const char *const maperr2str[] = {
137137
[MAP_ERR_CHECKED] = "dma map error checked",
138138
};
139139

140-
static const char *type2name[5] = { "single", "page",
141-
"scather-gather", "coherent",
142-
"resource" };
140+
static const char *type2name[] = {
141+
[dma_debug_single] = "single",
142+
[dma_debug_sg] = "scather-gather",
143+
[dma_debug_coherent] = "coherent",
144+
[dma_debug_resource] = "resource",
145+
};
143146

144147
static const char *dir2name[4] = { "DMA_BIDIRECTIONAL", "DMA_TO_DEVICE",
145148
"DMA_FROM_DEVICE", "DMA_NONE" };

0 commit comments

Comments
 (0)