aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHai Nguyen Pham <hai.pham.ud@renesas.com>2019-03-07 13:11:25 +0700
committerRyo Kataoka <ryo.kataoka.wt@renesas.com>2019-03-22 20:50:34 +0900
commitadc2d8f520e43ae9345d68363087bbd1149f4623 (patch)
tree41a8efc2102a3c7260b83f4e5232f4295360d851
parent53043d1897d2f75cbdb428c40e452df110d9eeba (diff)
downloadrenesas-bsp-adc2d8f520e43ae9345d68363087bbd1149f4623.tar.gz
iommu/ipmmu-vmsa: Bypass whitelist check for unsupported SoCs
Whitelist check is specific for Renesas R-Car Gen3 SoCs only. Bypass the check for other SoCs. Signed-off-by: Hai Nguyen Pham <hai.pham.ud@renesas.com>
-rw-r--r--drivers/iommu/ipmmu-vmsa.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
index ccfec5873fc4b..47de9c5ec188d 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -1080,6 +1080,13 @@ static bool ipmmu_slave_whitelist(struct device *dev, u32 *ids)
goto exit;
}
+ /*
+ * For R-Car Gen3 SoCs, use a white list to check the uTLB set up
+ * For other SoCs, return true
+ */
+ if (!mmu->features->whitelist)
+ return true;
+
if (!mmu->whitelist[0]) {
pr_debug("%s Whitelist not found on %s!!!\n",
__func__, dev_name(mmu->dev));