| Message ID | 20220329044436.27732-1-amhetre@nvidia.com |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [v1] iommu: arm-smmu: Use arm-smmu-nvidia impl for Tegra234 | expand |
On Tue, Mar 29, 2022 at 10:14:36AM +0530, Ashish Mhetre wrote: > Tegra234 has 2 pairs of ARM MMU-500 instances. Each pair is used > together and should be programmed identically. > Add compatible string of Tegra234 iommu nodes in arm_smmu_impl_init() > so that arm-smmu-nvidia implementation will be used for programming > these SMMU instances. > > Signed-off-by: Ashish Mhetre <amhetre@nvidia.com> > --- > drivers/iommu/arm/arm-smmu/arm-smmu-impl.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) I already sent out this patch a couple of months ago, though I realize that it still hasn't been applied: http://patchwork.ozlabs.org/project/linux-tegra/list/?series=276030 Joerg, any chance we can still get that series into v5.18? I've already applied patch 4 given that Rob had acked the DT bindings changes. I know it's a bit late, but this has been on the list for a couple of months and has Rob's Reviewed-by on the bindings and Will's Acked-by on the ARM SMMU driver patches. If it's too late for v5.18, is there anything else you're waiting for so that this can go into v5.19? Thanks, Thierry
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-impl.c b/drivers/iommu/arm/arm-smmu/arm-smmu-impl.c index 2c25cce38060..658f3cc83278 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu-impl.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-impl.c @@ -211,7 +211,8 @@ struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu) if (of_property_read_bool(np, "calxeda,smmu-secure-config-access")) smmu->impl = &calxeda_impl; - if (of_device_is_compatible(np, "nvidia,tegra194-smmu") || + if (of_device_is_compatible(np, "nvidia,tegra234-smmu") || + of_device_is_compatible(np, "nvidia,tegra194-smmu") || of_device_is_compatible(np, "nvidia,tegra186-smmu")) return nvidia_smmu_impl_init(smmu);
Tegra234 has 2 pairs of ARM MMU-500 instances. Each pair is used together and should be programmed identically. Add compatible string of Tegra234 iommu nodes in arm_smmu_impl_init() so that arm-smmu-nvidia implementation will be used for programming these SMMU instances. Signed-off-by: Ashish Mhetre <amhetre@nvidia.com> --- drivers/iommu/arm/arm-smmu/arm-smmu-impl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)