diff mbox series

dma-debug: use %pap format string for phys_addr_t

Message ID 20230329075956.2376819-1-arnd@kernel.org
State New
Headers
Series dma-debug: use %pap format string for phys_addr_t |

Commit Message

Arnd Bergmann March 29, 2023, 7:59 a.m. UTC 
  From: Arnd Bergmann <arnd@arndb.de>

On 32-bit architectures with 64-bit physical addresses, the
debug print is broken:

kernel/dma/debug.c: In function 'dump_show':
kernel/dma/debug.c:568:87: error: format '%llx' expects argument of type 'long long unsigned int', but argument 11 has type 'phys_addr_t' {aka 'unsigned int'} [-Werror=format=]
  568 |                                    "%s %s %s idx %d P=%llx N=%lx D=%llx L=%llx cln=%llx %s %s\n",
      |                                                                                    ~~~^
      |                                                                                       |
      |                                                                                       long long unsigned int
      |                                                                                    %x
......
  574 |                                    cln, dir2name[entry->direction],
      |                                    ~~~
      |                                    |
      |                                    phys_addr_t {aka unsigned int}

Use the special %pap format modifier for printing physical addresses.

Fixes: bd89d69a529f ("dma-debug: add cacheline to user/kernel space dump messages")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 kernel/dma/debug.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c
index 676142072d99..d8b233683a8c 100644
--- a/kernel/dma/debug.c
+++ b/kernel/dma/debug.c
@@ -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=%pap %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=%pap %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);