6.1-stable patches

added patches:
	iommu-arm-smmu-qcom-add-missing-gmu-entry-to-match-table.patch
	iommu-dma-trace-bounce-buffer-usage-when-mapping-buffers.patch

diff --git a/queue-6.1/iommu-arm-smmu-qcom-add-missing-gmu-entry-to-match-table.patch b/queue-6.1/iommu-arm-smmu-qcom-add-missing-gmu-entry-to-match-table.patch
new file mode 100644 (file)
index 0000000..1694677
--- /dev/null
+++ b/queue-6.1/iommu-arm-smmu-qcom-add-missing-gmu-entry-to-match-table.patch
@@ -0,0 +1,40 @@
+From afc95681c3068956fed1241a1ff1612c066c75ac Mon Sep 17 00:00:00 2001
+From: Rob Clark <robdclark@chromium.org>
+Date: Sun, 10 Dec 2023 10:06:53 -0800
+Subject: iommu/arm-smmu-qcom: Add missing GMU entry to match table
+
+From: Rob Clark <robdclark@chromium.org>
+
+commit afc95681c3068956fed1241a1ff1612c066c75ac upstream.
+
+In some cases the firmware expects cbndx 1 to be assigned to the GMU,
+so we also want the default domain for the GMU to be an identy domain.
+This way it does not get a context bank assigned.  Without this, both
+of_dma_configure() and drm/msm's iommu_domain_attach() will trigger
+allocating and configuring a context bank.  So GMU ends up attached to
+both cbndx 1 and later cbndx 2.  This arrangement seemingly confounds
+and surprises the firmware if the GPU later triggers a translation
+fault, resulting (on sc8280xp / lenovo x13s, at least) in the SMMU
+getting wedged and the GPU stuck without memory access.
+
+Cc: stable@vger.kernel.org
+Signed-off-by: Rob Clark <robdclark@chromium.org>
+Tested-by: Johan Hovold <johan+linaro@kernel.org>
+Reviewed-by: Robin Murphy <robin.murphy@arm.com>
+Link: https://lore.kernel.org/r/20231210180655.75542-1-robdclark@gmail.com
+Signed-off-by: Will Deacon <will@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
++++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
+@@ -243,6 +243,7 @@ static int qcom_adreno_smmu_init_context
+ 
+ static const struct of_device_id qcom_smmu_client_of_match[] __maybe_unused = {
+       { .compatible = "qcom,adreno" },
++      { .compatible = "qcom,adreno-gmu" },
+       { .compatible = "qcom,mdp4" },
+       { .compatible = "qcom,mdss" },
+       { .compatible = "qcom,sc7180-mdss" },

diff --git a/queue-6.1/iommu-dma-trace-bounce-buffer-usage-when-mapping-buffers.patch b/queue-6.1/iommu-dma-trace-bounce-buffer-usage-when-mapping-buffers.patch
new file mode 100644 (file)
index 0000000..a91827a
--- /dev/null
+++ b/queue-6.1/iommu-dma-trace-bounce-buffer-usage-when-mapping-buffers.patch
@@ -0,0 +1,50 @@
+From a63c357b9fd56ad5fe64616f5b22835252c6a76a Mon Sep 17 00:00:00 2001
+From: "Isaac J. Manjarres" <isaacmanjarres@google.com>
+Date: Fri, 8 Dec 2023 15:41:40 -0800
+Subject: iommu/dma: Trace bounce buffer usage when mapping buffers
+
+From: Isaac J. Manjarres <isaacmanjarres@google.com>
+
+commit a63c357b9fd56ad5fe64616f5b22835252c6a76a upstream.
+
+When commit 82612d66d51d ("iommu: Allow the dma-iommu api to
+use bounce buffers") was introduced, it did not add the logic
+for tracing the bounce buffer usage from iommu_dma_map_page().
+
+All of the users of swiotlb_tbl_map_single() trace their bounce
+buffer usage, except iommu_dma_map_page(). This makes it difficult
+to track SWIOTLB usage from that function. Thus, trace bounce buffer
+usage from iommu_dma_map_page().
+
+Fixes: 82612d66d51d ("iommu: Allow the dma-iommu api to use bounce buffers")
+Cc: stable@vger.kernel.org # v5.15+
+Cc: Tom Murphy <murphyt7@tcd.ie>
+Cc: Lu Baolu <baolu.lu@linux.intel.com>
+Cc: Saravana Kannan <saravanak@google.com>
+Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com>
+Link: https://lore.kernel.org/r/20231208234141.2356157-1-isaacmanjarres@google.com
+Signed-off-by: Joerg Roedel <jroedel@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/iommu/dma-iommu.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/iommu/dma-iommu.c
++++ b/drivers/iommu/dma-iommu.c
+@@ -28,6 +28,7 @@
+ #include <linux/spinlock.h>
+ #include <linux/swiotlb.h>
+ #include <linux/vmalloc.h>
++#include <trace/events/swiotlb.h>
+ 
+ #include "dma-iommu.h"
+ 
+@@ -999,6 +1000,8 @@ static dma_addr_t iommu_dma_map_page(str
+                       return DMA_MAPPING_ERROR;
+               }
+ 
++              trace_swiotlb_bounced(dev, phys, size);
++
+               aligned_size = iova_align(iovad, size);
+               phys = swiotlb_tbl_map_single(dev, phys, size, aligned_size,
+                                             iova_mask(iovad), dir, attrs);

diff --git a/queue-6.1/series b/queue-6.1/series
index 04d37bbbb8ff7710f56b0c642f1bea2c8b8e0e89..9cb55a277d48ce34e5fcac163c265321b7d1f159 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -302,3 +302,5 @@ rootfs-fix-support-for-rootfstype-when-root-is-given.patch
 bluetooth-fix-atomicity-violation-in-min-max-_key_size_set.patch
 bpf-fix-re-attachment-branch-in-bpf_tracing_prog_attach.patch
 loongarch-fix-and-simplify-fcsr-initialization-on-execve.patch
+iommu-arm-smmu-qcom-add-missing-gmu-entry-to-match-table.patch
+iommu-dma-trace-bounce-buffer-usage-when-mapping-buffers.patch