On Tue, Jun 08, 2021 at 01:01:29PM +0100, Will Deacon wrote: > Hi Krzysztof, Thierry, > > On Mon, Jun 07, 2021 at 10:49:10AM +0200, Krzysztof Kozlowski wrote: > > Hi Thierry and Will, > > > > This is the pull for you to base further SMMU aptches (prevent early SMMU > > faults). > > This is a tonne of code for me to pull into the SMMU tree given that I only > want one patch! > > Thierry, if I just stick: > > https://lore.kernel.org/r/20210603164632.1000458-4-thierry.reding@xxxxxxxxx > > on its own branch, can you stitch together whatever you need? I'm not sure I understand what you're proposing. For reference, here's the set of patches that I sent out: 1. memory: tegra: Implement SID override programming 2. dt-bindings: arm-smmu: Add Tegra186 compatible string 3. iommu/arm-smmu: Implement ->probe_finalize() 4. iommu/arm-smmu: tegra: Detect number of instances at runtime 5. iommu/arm-smmu: tegra: Implement SID override programming 6. iommu/arm-smmu: Use Tegra implementation on Tegra186 7. arm64: tegra: Use correct compatible string for Tegra186 SMMU 8. arm64: tegra: Hook up memory controller to SMMU on Tegra186 9. arm64: tegra: Enable SMMU support on Tegra194 Krzysztof already picked up patch 1 and I was assuming that you'd pick up 2-6 because they are to the ARM SMMU driver. However, if you're primarily interested in just patch 3, which is more "core" ARM SMMU than the rest, which are Tegra-specific, then I suppose what we could do is for you to give an Acked-by on the rest (2, 4-6) and then Krzysztof or I can pick them up and take them via ARM SoC, based on the stable branch from your tree that only has patch 3. Patch 6 touches arm-smmu-impl.c, though it's a two-line change that touches only the Tegra-specific matching bit in arm_smmu_impl_init(), so the likelihood of that conflicting with anything else is fairly small. Is that what you were proposing? Thierry
Attachment:
signature.asc
Description: PGP signature
