dma-debug: Use %pa to format phys_addr_t
authorGeert Uytterhoeven <geert+renesas@glider.be>
Wed, 29 Mar 2023 07:14:05 +0000 (09:14 +0200)
committerChristoph Hellwig <hch@lst.de>
Wed, 29 Mar 2023 23:51:52 +0000 (08:51 +0900)
On 32-bit without LPAE:

    kernel/dma/debug.c: In function ‘debug_dma_dump_mappings’:
    kernel/dma/debug.c:537:7: warning: format ‘%llx’ expects argument of type ‘long long unsigned int’, but argument 9 has type ‘phys_addr_t’ {aka ‘unsigned int’} [-Wformat=]
    kernel/dma/debug.c: In function ‘dump_show’:
    kernel/dma/debug.c:568:59: warning: format ‘%llx’ expects argument of type ‘long long unsigned int’, but argument 11 has type ‘phys_addr_t’ {aka ‘unsigned int’} [-Wformat=]

Fixes: bd89d69a529fbef3 ("dma-debug: add cacheline to user/kernel space dump messages")
Reported-by: kernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/r/202303160548.ReyuTsGD-lkp@intel.com
Reported-by: noreply@ellerman.id.au
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Christoph Hellwig <hch@lst.de>
kernel/dma/debug.c

index 676142072d997b6a328a395b06de8f1b32f0c6e0..f190651bcaddc9e9f0df4e5d88ab282aafd75aca 100644 (file)
@@ -534,11 +534,11 @@ void debug_dma_dump_mappings(struct device *dev)
                        if (!dev || dev == entry->dev) {
                                cln = to_cacheline_number(entry);
                                dev_info(entry->dev,
-                                        "%s idx %d P=%llx N=%lx D=%llx L=%llx cln=%llx %s %s\n",
+                                        "%s idx %d P=%llx N=%lx D=%llx L=%llx cln=%pa %s %s\n",
                                         type2name[entry->type], idx,
                                         phys_addr(entry), entry->pfn,
                                         entry->dev_addr, entry->size,
-                                        cln, dir2name[entry->direction],
+                                        &cln, dir2name[entry->direction],
                                         maperr2str[entry->map_err_type]);
                        }
                }
@@ -565,13 +565,13 @@ static int dump_show(struct seq_file *seq, void *v)
                list_for_each_entry(entry, &bucket->list, list) {
                        cln = to_cacheline_number(entry);
                        seq_printf(seq,
-                                  "%s %s %s idx %d P=%llx N=%lx D=%llx L=%llx cln=%llx %s %s\n",
+                                  "%s %s %s idx %d P=%llx N=%lx D=%llx L=%llx cln=%pa %s %s\n",
                                   dev_driver_string(entry->dev),
                                   dev_name(entry->dev),
                                   type2name[entry->type], idx,
                                   phys_addr(entry), entry->pfn,
                                   entry->dev_addr, entry->size,
-                                  cln, dir2name[entry->direction],
+                                  &cln, dir2name[entry->direction],
                                   maperr2str[entry->map_err_type]);
                }
                spin_unlock_irqrestore(&bucket->lock, flags);