iommu/ipmmu-vmsa: Modify ipmmu_slave_whitelist() to check SoC revisions

Some R-Car Gen3 SoCs has hardware restrictions on the IPMMU. So,
to check whether this R-Car Gen3 SoC can use the IPMMU correctly,
this patch modifies the ipmmu_slave_whitelist().

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
index aa0de59..46906a7 100644 (file)
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -751,12 +751,6 @@ static int ipmmu_init_platform_device(struct device *dev,
        return 0;
 }
 
-static bool ipmmu_slave_whitelist(struct device *dev)
-{
-       /* By default, do not allow use of IPMMU */
-       return false;
-}
-
 static const struct soc_device_attribute soc_rcar_gen3[] = {
        { .soc_id = "r8a774a1", },
        { .soc_id = "r8a7795", },
@@ -768,11 +762,35 @@ static const struct soc_device_attribute soc_rcar_gen3[] = {
        { /* sentinel */ }
 };
 
+static const struct soc_device_attribute soc_rcar_gen3_whitelist[] = {
+       { .soc_id = "r8a7795", .revision = "ES3.*" },
+       { .soc_id = "r8a77965", },
+       { .soc_id = "r8a77990", },
+       { .soc_id = "r8a77995", },
+       { /* sentinel */ }
+};
+
+static bool ipmmu_slave_whitelist(struct device *dev)
+{
+       /*
+        * For R-Car Gen3 use a white list to opt-in slave devices.
+        * For Other SoCs, this returns true anyway.
+        */
+       if (!soc_device_match(soc_rcar_gen3))
+               return true;
+
+       /* Check whether this R-Car Gen3 can use the IPMMU correctly or not */
+       if (!soc_device_match(soc_rcar_gen3_whitelist))
+               return false;
+
+       /* By default, do not allow use of IPMMU */
+       return false;
+}
+
 static int ipmmu_of_xlate(struct device *dev,
                          struct of_phandle_args *spec)
 {
-       /* For R-Car Gen3 use a white list to opt-in slave devices */
-       if (soc_device_match(soc_rcar_gen3) && !ipmmu_slave_whitelist(dev))
+       if (!ipmmu_slave_whitelist(dev))
                return -ENODEV;
 
        iommu_fwspec_add_ids(dev, spec->args, 1);