diff options
author | Dmitry Osipenko <digetx@gmail.com> | 2018-07-26 17:19:16 -0400 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2018-07-27 03:50:57 -0400 |
commit | 5c5c87411488af3cd082221e567498d813d0fe83 (patch) | |
tree | 3d44f6ac09eddfdbb69c7dbc62df2a98deb6aac8 | |
parent | 15021d364d17b658f489aa654d96a4c81a71f386 (diff) |
iommu/ipmmu-vmsa: Don't register as BUS IOMMU if machine doesn't have IPMMU-VMSA
This fixes kernel crashing on NVIDIA Tegra if kernel is compiled in
a multiplatform configuration and IPMMU-VMSA driver is enabled.
Cc: <stable@vger.kernel.org> # v3.20+
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
-rw-r--r-- | drivers/iommu/ipmmu-vmsa.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c index 41eee3401f05..51af2c528a31 100644 --- a/drivers/iommu/ipmmu-vmsa.c +++ b/drivers/iommu/ipmmu-vmsa.c | |||
@@ -1108,12 +1108,19 @@ static struct platform_driver ipmmu_driver = { | |||
1108 | 1108 | ||
1109 | static int __init ipmmu_init(void) | 1109 | static int __init ipmmu_init(void) |
1110 | { | 1110 | { |
1111 | struct device_node *np; | ||
1111 | static bool setup_done; | 1112 | static bool setup_done; |
1112 | int ret; | 1113 | int ret; |
1113 | 1114 | ||
1114 | if (setup_done) | 1115 | if (setup_done) |
1115 | return 0; | 1116 | return 0; |
1116 | 1117 | ||
1118 | np = of_find_matching_node(NULL, ipmmu_of_ids); | ||
1119 | if (!np) | ||
1120 | return 0; | ||
1121 | |||
1122 | of_node_put(np); | ||
1123 | |||
1117 | ret = platform_driver_register(&ipmmu_driver); | 1124 | ret = platform_driver_register(&ipmmu_driver); |
1118 | if (ret < 0) | 1125 | if (ret < 0) |
1119 | return ret; | 1126 | return ret; |