From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 12 Jul 2021 07:34:13 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v5.4.132~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4509e9bef64041215e55ca6a9feceef1a5a1b9d;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	iommu-dma-fix-compile-warning-in-32-bit-builds.patch
---

diff --git a/queue-5.4/iommu-dma-fix-compile-warning-in-32-bit-builds.patch b/queue-5.4/iommu-dma-fix-compile-warning-in-32-bit-builds.patch
new file mode 100644
index 00000000000..51cf0d6c182
--- /dev/null
+++ b/queue-5.4/iommu-dma-fix-compile-warning-in-32-bit-builds.patch
@@ -0,0 +1,46 @@
+From 7154cbd31c2069726cf730b0ed94e2e79a221602 Mon Sep 17 00:00:00 2001
+From: Joerg Roedel <jroedel@suse.de>
+Date: Mon, 7 Jun 2021 14:49:05 +0200
+Subject: iommu/dma: Fix compile warning in 32-bit builds
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Joerg Roedel <jroedel@suse.de>
+
+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>
+
+---
+ drivers/iommu/dma-iommu.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/iommu/dma-iommu.c
++++ b/drivers/iommu/dma-iommu.c
+@@ -219,8 +219,8 @@ resv_iova:
+ 		} 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;
+ 		}
+ 
diff --git a/queue-5.4/series b/queue-5.4/series
index 8d419545b71..b6050d64741 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -346,3 +346,4 @@ block-return-the-correct-bvec-when-checking-for-gaps.patch
 mmc-block-disable-cmdq-on-the-ioctl-path.patch
 mmc-vub3000-fix-control-request-direction.patch
 scsi-core-retry-i-o-for-notify-enable-spinup-required-error.patch
+iommu-dma-fix-compile-warning-in-32-bit-builds.patch