From: Joerg Roedel jroedel@suse.de
stable inclusion from stable-5.10.50 commit 9b07d817f7999745cca4c10c523ccc8b8536c6d5 bugzilla: 174522 https://gitee.com/openeuler/kernel/issues/I4DNFY
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=...
--------------------------------
commit 7154cbd31c2069726cf730b0ed94e2e79a221602 upstream.
Compiling the recent dma-iommu changes under 32-bit x86 triggers this compile warning:
drivers/iommu/dma-iommu.c:249:5: warning: format ‘%llx’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘phys_addr_t’ {aka ‘unsigned int’} [-Wformat=]
The reason is that %llx is used to print a variable of type phys_addr_t. Fix it by using the correct %pa format specifier for phys_addr_t.
Cc: Srinath Mannam srinath.mannam@broadcom.com Cc: Robin Murphy robin.murphy@arm.com Cc: Oza Pawandeep poza@codeaurora.org Fixes: 571f316074a20 ("iommu/dma: Fix IOVA reserve dma ranges") Signed-off-by: Joerg Roedel jroedel@suse.de Link: https://lore.kernel.org/r/20210607124905.27525-1-joro@8bytes.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
Signed-off-by: Chen Jun chenjun102@huawei.com Acked-by: Weilong Chen chenweilong@huawei.com Signed-off-by: Chen Jun chenjun102@huawei.com --- drivers/iommu/dma-iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index ffb2db3952b4..50b3e3a72a00 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -335,8 +335,8 @@ static int iova_reserve_pci_windows(struct pci_dev *dev, } else if (end < start) { /* dma_ranges list should be sorted */ dev_err(&dev->dev, - "Failed to reserve IOVA [%#010llx-%#010llx]\n", - start, end); + "Failed to reserve IOVA [%pa-%pa]\n", + &start, &end); return -EINVAL; }