On 2020-06-23 11:29, Thierry Reding wrote:
[...]
diff --git a/drivers/iommu/arm-smmu-impl.c b/drivers/iommu/arm-smmu-impl.c
index c75b9d957b702..52c84c30f83e4 100644
--- a/drivers/iommu/arm-smmu-impl.c
+++ b/drivers/iommu/arm-smmu-impl.c
@@ -160,6 +160,9 @@ struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu)
*/
switch (smmu->model) {
case ARM_MMU500:
+ if (of_device_is_compatible(smmu->dev->of_node,
+ "nvidia,tegra194-smmu-500"))
+ return nvidia_smmu_impl_init(smmu);
Should NVIDIA_TEGRA194_SMMU be a separate value for smmu->model,
perhaps? That way we avoid this somewhat odd check here.
No, this is simply in the wrong place. The design here is that we pick
up anything related to the basic SMMU IP (model) first, then make any
platform-specific integration checks. That way a platform-specific init
function can see the model impl set and subclass it if necessary
(although nobody's actually done that yet). The setup for Cavium is just
a short-cut since their model is unique to their integration, so the
lines get a bit blurred and there's little benefit to trying to separate
it out.
In short, put this down below with the other of_device_is_compatible()
checks.
smmu->impl = &arm_mmu500_impl;
break;
case CAVIUM_SMMUV2:
diff --git a/drivers/iommu/arm-smmu-nvidia.c b/drivers/iommu/arm-smmu-nvidia.c
I wonder if it would be better to name this arm-smmu-tegra.c to make it
clearer that this is for a Tegra chip. We do have regular expressions in
MAINTAINERS that catch anything with "tegra" in it to make this easier.
There was a notion that these would be grouped by vendor, but if there's
a strong preference for all NVIDIA-SoC-related stuff to be named "Tegra"
then I'm not going to complain too much.
new file mode 100644
index 0000000000000..dafc293a45217
--- /dev/null
+++ b/drivers/iommu/arm-smmu-nvidia.c
@@ -0,0 +1,161 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// Nvidia ARM SMMU v2 implementation quirks
s/Nvidia/NVIDIA/
+// Copyright (C) 2019 NVIDIA CORPORATION. All rights reserved.
I suppose this should now also include 2020.
+
+#define pr_fmt(fmt) "nvidia-smmu: " fmt
Same here. Might be worth making this "tegra-smmu: " for consistency.
On the other hand, a log prefix that is literally the name of a
completely unrelated driver seems more confusing to users than useful.
Same for the function naming - the tegra_smmu_* namespace is already
owned by that driver.
Robin.
