| From 4707922ac03469db9181e82bf0f3500f05f7f5a8 Mon Sep 17 00:00:00 2001 |
| From: Grygorii Strashko <grygorii.strashko@ti.com> |
| Date: Wed, 8 Apr 2020 22:43:00 +0300 |
| Subject: [PATCH] dma-debug: fix displaying of dma allocation type |
| |
| commit 9bb50ed7470944238ec8e30a94ef096caf9056ee upstream. |
| |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c |
| index 4ad74f5987ea..cb6425e52bf7 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.7.4 |
| |