[PATCH v2] dma-debug: fix displaying of dma allocation type

[PATCH v2] dma-debug: fix displaying of dma allocation type

[Grygorii Strashko via iommu]

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>
---
v2:
 - witch to use named initializers.

 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 2031ed1ad7fa..21dc002eff13 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[5] = {
+	[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.17.1

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Re: [PATCH v2] dma-debug: fix displaying of dma allocation type

[Christoph Hellwig]

On Wed, Apr 08, 2020 at 10:43:00PM +0300, Grygorii Strashko wrote:
> +static const char *type2name[5] = {
> +	[dma_debug_single] = "single",
> +	[dma_debug_sg] = "scather-gather",
> +	[dma_debug_coherent] = "coherent",
> +	[dma_debug_resource] = "resource",
> +};

We actually only have 4, not 5 elements now (and don't really
need the sizing anyway).  But I can fix that when applying, thanks!
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Re: [PATCH v2] dma-debug: fix displaying of dma allocation type

[Grygorii Strashko via iommu]

On 08/04/2020 22:45, Christoph Hellwig wrote:
> On Wed, Apr 08, 2020 at 10:43:00PM +0300, Grygorii Strashko wrote:
>> +static const char *type2name[5] = {
>> +	[dma_debug_single] = "single",
>> +	[dma_debug_sg] = "scather-gather",
>> +	[dma_debug_coherent] = "coherent",
>> +	[dma_debug_resource] = "resource",
>> +};
> 
> We actually only have 4, not 5 elements now (and don't really
> need the sizing anyway).  But I can fix that when applying, thanks!
  
Yeah. Sorry and thank you.

-- 
Best regards,
grygorii
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu