| Message ID | 20210325130332.778208-8-thierry.reding@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: tegra: Prevent early SMMU faults | expand |
On 2021-03-25 13:03, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > Tegra186 requires the same SID override programming as Tegra194 in order > to seamlessly transition from the firmware framebuffer to the Linux > framebuffer, so the Tegra implementation needs to be used on Tegra186 > devices as well. > > Signed-off-by: Thierry Reding <treding@nvidia.com> > --- > drivers/iommu/arm/arm-smmu/arm-smmu-impl.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-impl.c b/drivers/iommu/arm/arm-smmu/arm-smmu-impl.c > index 136872e77195..9f465e146799 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,tegra194-smmu") || > + of_device_is_compatible(np, "nvidia,tegra186-smmu")) Binding update? Robin. > return nvidia_smmu_impl_init(smmu); > > smmu = qcom_smmu_impl_init(smmu); >
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-impl.c b/drivers/iommu/arm/arm-smmu/arm-smmu-impl.c index 136872e77195..9f465e146799 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,tegra194-smmu") || + of_device_is_compatible(np, "nvidia,tegra186-smmu")) return nvidia_smmu_impl_init(smmu); smmu = qcom_smmu_impl_init(smmu);