From nobody Mon Feb 9 10:24:07 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E791EC74A5B for ; Wed, 29 Mar 2023 08:00:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230140AbjC2IAH (ORCPT ); Wed, 29 Mar 2023 04:00:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229654AbjC2IAF (ORCPT ); Wed, 29 Mar 2023 04:00:05 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40A95210D for ; Wed, 29 Mar 2023 01:00:04 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id E37EDB820F8 for ; Wed, 29 Mar 2023 08:00:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 07077C433EF; Wed, 29 Mar 2023 07:59:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680076801; bh=cb8TYrkiBBY882Dfq3SS1IYxneIycjw3TPPS0/qy3XA=; h=From:To:Cc:Subject:Date:From; b=DleDmRxbClOx+h3mHP5GODFSfuEli5fv5t8Q2vcbMKoQI9MjTJ9fzIp5BgNp/HJTZ exDZo4GspE2+Y6SJiG0ZPBH6uc5mSIbj2lOnjCervq7VCmvtOCOE/iqiwk5hvPfL47 J0r/cfCz7uGkjRPD76MNB80P9EEn5XHgIcgExQvInorUlti6dc0MNlRqwHaCGJ7Rcd eFKrOSkAJuopD4reuWwlv3r18nHVqdAbOOW84BzNrDwHmiNrjisimkxwRLMTzjIWtM w4hub84S3uHD5oiq2G/3jhTpUELNq2w9rAZodiKIZBSVDCHDf5MHD+6MCICmDroZKp sZvaY7Srv89JA== From: Arnd Bergmann To: Christoph Hellwig , Marek Szyprowski , Desnes Nunes Cc: Arnd Bergmann , Robin Murphy , iommu@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH] dma-debug: use %pap format string for phys_addr_t Date: Wed, 29 Mar 2023 09:59:45 +0200 Message-Id: <20230329075956.2376819-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Arnd Bergmann 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 'l= ong long unsigned int', but argument 11 has type 'phys_addr_t' {aka 'unsign= ed int'} [-Werror=3Dformat=3D] 568 | "%s %s %s idx %d P=3D%llx N=3D%l= x D=3D%llx L=3D%llx cln=3D%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 me= ssages") Signed-off-by: Arnd Bergmann --- 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 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 =3D=3D entry->dev) { cln =3D to_cacheline_number(entry); dev_info(entry->dev, - "%s idx %d P=3D%llx N=3D%lx D=3D%llx L=3D%llx cln=3D%llx %s %s\n", + "%s idx %d P=3D%llx N=3D%lx D=3D%llx L=3D%llx cln=3D%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 =3D to_cacheline_number(entry); seq_printf(seq, - "%s %s %s idx %d P=3D%llx N=3D%lx D=3D%llx L=3D%llx cln=3D%llx %s %= s\n", + "%s %s %s idx %d P=3D%llx N=3D%lx D=3D%llx L=3D%llx cln=3D%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); --=20 2.39.2