From patchwork Thu Apr 25 17:28:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2489581 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id 5C3DA3FD85 for ; Thu, 25 Apr 2013 18:33:38 +0000 (UTC) Received: from merlin.infradead.org ([205.233.59.134]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UVQ5L-0005Gp-Nn; Thu, 25 Apr 2013 17:35:56 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UVPzR-0007AX-86; Thu, 25 Apr 2013 17:29:49 +0000 Received: from moutng.kundenserver.de ([212.227.126.171]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UVPyl-00071J-Vc for linux-arm-kernel@lists.infradead.org; Thu, 25 Apr 2013 17:29:10 +0000 Received: from wuerfel.lan (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mrbap4) with ESMTP (Nemesis) id 0Lsi1h-1Ubme30q8f-012Kff; Thu, 25 Apr 2013 19:29:06 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 13/21] iommu: tegra: print dma_addr_t using %lld Date: Thu, 25 Apr 2013 19:28:56 +0200 Message-Id: <1366910944-3033663-14-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1366910944-3033663-1-git-send-email-arnd@arndb.de> References: <1366910944-3033663-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:V8qJVYpzOmjVFYNDUjj8i5uNE8H+bDOcOg/cuKH8KXK Li8oCX3psn8tb72cZSUDao8e+G7eluKAfDd9R4iNU8d2ntCPWV keyxt0C3eeNk2S7WrZ2nOV5cfzHwWAGKKhR2g4sIrhW3MPGDLM jCGL+2kR3Pi5jm+oaZF4/qr6+In54pw1hueew0xsVEoP47rjJD fu8RoAS2e418wluheANfu0v688todIakXxgRVuRMNupF41K0CB CcQIJ0dWAn/5sZhxyboghAyIG2Wn4lH6pr99g4t2zqQmnS+wa9 9nXFqKGPCq3NiNcBZnDJEz/Q2wPnbkeB4ElNEvosC2NTPHdzmt xfOiCHlpilDqa75Lih2gXHQMd8LWuPSFvUkJE1Vd3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130425_132908_328078_9AF45146 X-CRM114-Status: GOOD ( 10.43 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.171 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Varun Sethi , Joerg Roedel , linux-kernel@vger.kernel.org, Arnd Bergmann X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The code was recently changed to work for builds with a 64 bit dma_addr_t, but the printk unconditionally uses a format string for an "long" variable, which is always wrong as the dma_add_t is now either 'unsigned int' or 'unsigned long long' depending on configuration. The easiest solution is to cast the variable to u64 and print it as a 64 bit value. Signed-off-by: Arnd Bergmann Cc: Varun Sethi Cc: Joerg Roedel --- drivers/iommu/tegra-gart.c | 3 ++- drivers/iommu/tegra-smmu.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/tegra-gart.c b/drivers/iommu/tegra-gart.c index 4aec8be..ebbdd82 100644 --- a/drivers/iommu/tegra-gart.c +++ b/drivers/iommu/tegra-gart.c @@ -295,7 +295,8 @@ static phys_addr_t gart_iommu_iova_to_phys(struct iommu_domain *domain, pa = (pte & GART_PAGE_MASK); if (!pfn_valid(__phys_to_pfn(pa))) { - dev_err(gart->dev, "No entry for %08lx:%08x\n", iova, pa); + dev_err(gart->dev, "No entry for %08llx:%pa\n", + (u64)iova, &pa); gart_dump_table(gart); return -EINVAL; } diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c index bc9b599..ef2a120 100644 --- a/drivers/iommu/tegra-smmu.c +++ b/drivers/iommu/tegra-smmu.c @@ -772,7 +772,7 @@ static phys_addr_t smmu_iommu_iova_to_phys(struct iommu_domain *domain, pfn = *pte & SMMU_PFN_MASK; WARN_ON(!pfn_valid(pfn)); dev_dbg(as->smmu->dev, - "iova:%08lx pfn:%08lx asid:%d\n", iova, pfn, as->asid); + "iova:%08llx pfn:%08lx asid:%d\n", (u64)iova, pfn, as->asid); spin_unlock_irqrestore(&as->lock, flags); return PFN_PHYS(pfn);