Commit dfdbf16c authored by Jonathan Hunter's avatar Jonathan Hunter Committed by Thierry Reding

arm64: tegra: Fix insecure SMMU users for Tegra186

Commit 954a03be ("iommu/arm-smmu: Break insecure users by disabling
bypass by default") intentionally breaks all devices using the SMMU in
bypass mode. This is breaking various devices on Tegra186 which include
the ethernet, BPMP and HDA device. Fix this by populating the iommus
property for these devices with their stream ID.

Fixes: 954a03be ("iommu/arm-smmu: Break insecure users by disabling bypass by default")
Signed-off-by: default avatarJonathan Hunter <jonathanh@nvidia.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 2f03e39b
...@@ -60,6 +60,7 @@ ethernet@2490000 { ...@@ -60,6 +60,7 @@ ethernet@2490000 {
clock-names = "master_bus", "slave_bus", "rx", "tx", "ptp_ref"; clock-names = "master_bus", "slave_bus", "rx", "tx", "ptp_ref";
resets = <&bpmp TEGRA186_RESET_EQOS>; resets = <&bpmp TEGRA186_RESET_EQOS>;
reset-names = "eqos"; reset-names = "eqos";
iommus = <&smmu TEGRA186_SID_EQOS>;
status = "disabled"; status = "disabled";
snps,write-requests = <1>; snps,write-requests = <1>;
...@@ -338,6 +339,7 @@ hda@3510000 { ...@@ -338,6 +339,7 @@ hda@3510000 {
<&bpmp TEGRA186_RESET_HDA2CODEC_2X>; <&bpmp TEGRA186_RESET_HDA2CODEC_2X>;
reset-names = "hda", "hda2hdmi", "hda2codec_2x"; reset-names = "hda", "hda2hdmi", "hda2codec_2x";
power-domains = <&bpmp TEGRA186_POWER_DOMAIN_DISP>; power-domains = <&bpmp TEGRA186_POWER_DOMAIN_DISP>;
iommus = <&smmu TEGRA186_SID_HDA>;
status = "disabled"; status = "disabled";
}; };
...@@ -1158,6 +1160,7 @@ cpu@5 { ...@@ -1158,6 +1160,7 @@ cpu@5 {
bpmp: bpmp { bpmp: bpmp {
compatible = "nvidia,tegra186-bpmp"; compatible = "nvidia,tegra186-bpmp";
iommus = <&smmu TEGRA186_SID_BPMP>;
mboxes = <&hsp_top0 TEGRA_HSP_MBOX_TYPE_DB mboxes = <&hsp_top0 TEGRA_HSP_MBOX_TYPE_DB
TEGRA_HSP_DB_MASTER_BPMP>; TEGRA_HSP_DB_MASTER_BPMP>;
shmem = <&cpu_bpmp_tx &cpu_bpmp_rx>; shmem = <&cpu_bpmp_tx &cpu_bpmp_rx>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment