From cc87971363634338442c14d6787d01dbeb130df5 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 22 Jan 2024 12:04:29 -0800 Subject: [PATCH] 6.6-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 soundwire-fix-initializing-sysfs-for-same-devices-on-different-buses.patch --- ...add-missing-gmu-entry-to-match-table.patch | 40 +++++++++ ...ce-buffer-usage-when-mapping-buffers.patch | 50 +++++++++++ queue-6.6/series | 3 + ...-for-same-devices-on-different-buses.patch | 82 +++++++++++++++++++ 4 files changed, 175 insertions(+) create mode 100644 queue-6.6/iommu-arm-smmu-qcom-add-missing-gmu-entry-to-match-table.patch create mode 100644 queue-6.6/iommu-dma-trace-bounce-buffer-usage-when-mapping-buffers.patch create mode 100644 queue-6.6/soundwire-fix-initializing-sysfs-for-same-devices-on-different-buses.patch diff --git a/queue-6.6/iommu-arm-smmu-qcom-add-missing-gmu-entry-to-match-table.patch b/queue-6.6/iommu-arm-smmu-qcom-add-missing-gmu-entry-to-match-table.patch new file mode 100644 index 00000000000..1694677befc --- /dev/null +++ b/queue-6.6/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 +Date: Sun, 10 Dec 2023 10:06:53 -0800 +Subject: iommu/arm-smmu-qcom: Add missing GMU entry to match table + +From: Rob Clark + +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 +Tested-by: Johan Hovold +Reviewed-by: Robin Murphy +Link: https://lore.kernel.org/r/20231210180655.75542-1-robdclark@gmail.com +Signed-off-by: Will Deacon +Signed-off-by: Greg Kroah-Hartman +--- + 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.6/iommu-dma-trace-bounce-buffer-usage-when-mapping-buffers.patch b/queue-6.6/iommu-dma-trace-bounce-buffer-usage-when-mapping-buffers.patch new file mode 100644 index 00000000000..69459fb12ba --- /dev/null +++ b/queue-6.6/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" +Date: Fri, 8 Dec 2023 15:41:40 -0800 +Subject: iommu/dma: Trace bounce buffer usage when mapping buffers + +From: Isaac J. Manjarres + +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 +Cc: Lu Baolu +Cc: Saravana Kannan +Signed-off-by: Isaac J. Manjarres +Link: https://lore.kernel.org/r/20231208234141.2356157-1-isaacmanjarres@google.com +Signed-off-by: Joerg Roedel +Signed-off-by: Greg Kroah-Hartman +--- + drivers/iommu/dma-iommu.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/iommu/dma-iommu.c ++++ b/drivers/iommu/dma-iommu.c +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + #include "dma-iommu.h" + +@@ -1052,6 +1053,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.6/series b/queue-6.6/series index 313f15a375b..0c27c2dcc7e 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -408,3 +408,6 @@ md-raid1-use-blk_opf_t-for-read-and-write-operations.patch 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 +iommu-arm-smmu-qcom-add-missing-gmu-entry-to-match-table.patch +iommu-dma-trace-bounce-buffer-usage-when-mapping-buffers.patch +soundwire-fix-initializing-sysfs-for-same-devices-on-different-buses.patch diff --git a/queue-6.6/soundwire-fix-initializing-sysfs-for-same-devices-on-different-buses.patch b/queue-6.6/soundwire-fix-initializing-sysfs-for-same-devices-on-different-buses.patch new file mode 100644 index 00000000000..0c29417811a --- /dev/null +++ b/queue-6.6/soundwire-fix-initializing-sysfs-for-same-devices-on-different-buses.patch @@ -0,0 +1,82 @@ +From 8a8a9ac8a4972ee69d3dd3d1ae43963ae39cee18 Mon Sep 17 00:00:00 2001 +From: Krzysztof Kozlowski +Date: Tue, 17 Oct 2023 11:09:33 -0500 +Subject: soundwire: fix initializing sysfs for same devices on different buses + +From: Krzysztof Kozlowski + +commit 8a8a9ac8a4972ee69d3dd3d1ae43963ae39cee18 upstream. + +If same devices with same device IDs are present on different soundwire +buses, the probe fails due to conflicting device names and sysfs +entries: + + sysfs: cannot create duplicate filename '/bus/soundwire/devices/sdw:0:0217:0204:00:0' + +The link ID is 0 for both devices, so they should be differentiated by +the controller ID. Add the controller ID so, the device names and sysfs entries look +like: + + sdw:1:0:0217:0204:00:0 -> ../../../devices/platform/soc@0/6ab0000.soundwire-controller/sdw-master-1-0/sdw:1:0:0217:0204:00:0 + sdw:3:0:0217:0204:00:0 -> ../../../devices/platform/soc@0/6b10000.soundwire-controller/sdw-master-3-0/sdw:3:0:0217:0204:00:0 + +[PLB changes: use bus->controller_id instead of bus->id] + +Fixes: 7c3cd189b86d ("soundwire: Add Master registration") +Cc: stable@vger.kernel.org +Reviewed-by: Bard Liao +Reviewed-by: Vijendar Mukunda +Co-developed-by: Pierre-Louis Bossart +Signed-off-by: Pierre-Louis Bossart +Signed-off-by: Krzysztof Kozlowski +Reviewed-by: Krzysztof Kozlowski +Tested-by: Krzysztof Kozlowski +Acked-by: Mark Brown +Tested-by: Srinivas Kandagatla +Link: https://lore.kernel.org/r/20231017160933.12624-3-pierre-louis.bossart@linux.intel.com +Signed-off-by: Vinod Koul +Signed-off-by: Greg Kroah-Hartman +--- + drivers/soundwire/slave.c | 12 ++++++------ + sound/soc/intel/boards/sof_sdw.c | 4 ++-- + 2 files changed, 8 insertions(+), 8 deletions(-) + +--- a/drivers/soundwire/slave.c ++++ b/drivers/soundwire/slave.c +@@ -39,14 +39,14 @@ int sdw_slave_add(struct sdw_bus *bus, + slave->dev.fwnode = fwnode; + + if (id->unique_id == SDW_IGNORED_UNIQUE_ID) { +- /* name shall be sdw:link:mfg:part:class */ +- dev_set_name(&slave->dev, "sdw:%01x:%04x:%04x:%02x", +- bus->link_id, id->mfg_id, id->part_id, ++ /* name shall be sdw:ctrl:link:mfg:part:class */ ++ dev_set_name(&slave->dev, "sdw:%01x:%01x:%04x:%04x:%02x", ++ bus->controller_id, bus->link_id, id->mfg_id, id->part_id, + id->class_id); + } else { +- /* name shall be sdw:link:mfg:part:class:unique */ +- dev_set_name(&slave->dev, "sdw:%01x:%04x:%04x:%02x:%01x", +- bus->link_id, id->mfg_id, id->part_id, ++ /* name shall be sdw:ctrl:link:mfg:part:class:unique */ ++ dev_set_name(&slave->dev, "sdw:%01x:%01x:%04x:%04x:%02x:%01x", ++ bus->controller_id, bus->link_id, id->mfg_id, id->part_id, + id->class_id, id->unique_id); + } + +--- a/sound/soc/intel/boards/sof_sdw.c ++++ b/sound/soc/intel/boards/sof_sdw.c +@@ -1197,11 +1197,11 @@ static int fill_sdw_codec_dlc(struct dev + else if (is_unique_device(adr_link, sdw_version, mfg_id, part_id, + class_id, adr_index)) + codec->name = devm_kasprintf(dev, GFP_KERNEL, +- "sdw:%01x:%04x:%04x:%02x", link_id, ++ "sdw:0:%01x:%04x:%04x:%02x", link_id, + mfg_id, part_id, class_id); + else + codec->name = devm_kasprintf(dev, GFP_KERNEL, +- "sdw:%01x:%04x:%04x:%02x:%01x", link_id, ++ "sdw:0:%01x:%04x:%04x:%02x:%01x", link_id, + mfg_id, part_id, class_id, unique_id); + + if (!codec->name) -- 2.47.3