lkml.org 
[lkml]   [2023]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH -next] dma-debug: Use %pa to format phys_addr_t
On Wed, Mar 29, 2023 at 09:14:05AM +0200, Geert Uytterhoeven wrote:
> 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>
> ---
> kernel/dma/debug.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c
> index 676142072d997b6a..f190651bcaddc9e9 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=%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],

Won't this just print out the address of cln declared at the beginning of debug_dma_dump_mappings() each time, instead of the value
returned from to_cacheline_entry() ?

> 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],

same for dump_show()

> maperr2str[entry->map_err_type]);
> }
> spin_unlock_irqrestore(&bucket->lock, flags);
> --
> 2.34.1
>

\
 
 \ /
  Last update: 2023-03-29 17:04    [W:0.252 / U:0.048 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site