]> www.infradead.org Git - nvme.git/commitdiff
iommu/ipmmu-vmsa: Add an array of slave devices whitelist
authorYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Wed, 28 Nov 2018 09:23:36 +0000 (09:23 +0000)
committerJoerg Roedel <jroedel@suse.de>
Mon, 3 Dec 2018 13:24:02 +0000 (14:24 +0100)
To avoid adding copy and pasted strcmp codes in the future,
this patch adds an array "rcar_gen3_slave_whitelist" to check
whether the device can work with the IPMMU or not.

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>
drivers/iommu/ipmmu-vmsa.c

index 46906a763d69b9d5b17351dabc291e3818868a4f..331e86839a8c3e617c7bbce421d85c349c35dac5 100644 (file)
@@ -770,8 +770,13 @@ static const struct soc_device_attribute soc_rcar_gen3_whitelist[] = {
        { /* sentinel */ }
 };
 
+static const char * const rcar_gen3_slave_whitelist[] = {
+};
+
 static bool ipmmu_slave_whitelist(struct device *dev)
 {
+       unsigned int i;
+
        /*
         * For R-Car Gen3 use a white list to opt-in slave devices.
         * For Other SoCs, this returns true anyway.
@@ -783,7 +788,13 @@ static bool ipmmu_slave_whitelist(struct device *dev)
        if (!soc_device_match(soc_rcar_gen3_whitelist))
                return false;
 
-       /* By default, do not allow use of IPMMU */
+       /* Check whether this slave device can work with the IPMMU */
+       for (i = 0; i < ARRAY_SIZE(rcar_gen3_slave_whitelist); i++) {
+               if (!strcmp(dev_name(dev), rcar_gen3_slave_whitelist[i]))
+                       return true;
+       }
+
+       /* Otherwise, do not allow use of IPMMU */
        return false;
 }