[0/2] iommu/ipmmu-vmsa: Modify ipmmu_slave_whitelist()

Commit Message

Yoshihiro Shimoda Nov. 28, 2018, 9:23 a.m. UTC

This patch set is based on iommu.git / latest next branch
(commit id = f262283c224537962cba0f41b8823e3be9f7b0ff)

I talked with Geert-san about this topic on below:
https://patchwork.kernel.org/patch/10651375/

Also Simon-san suggests we should keep the whitelist.

So, not to change behavior of R-Car Gen2, this patch set adds
two conditions. After applied this patch set, we can add slave
devices easily like below:



Changes from v1:
 - Use "ES3.*" instead of "ES3.0" for r8a7795 in patch 1.
 - Use "unsigned int" instead of "int" in patch 2.
 - Add Geert-san's Reviewed-by.
 

Yoshihiro Shimoda (2):
  iommu/ipmmu-vmsa: Modify ipmmu_slave_whitelist() to check SoC
    revisions
  iommu/ipmmu-vmsa: add an array of slave devices whitelist

 drivers/iommu/ipmmu-vmsa.c | 45 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 8 deletions(-)

Comments

Joerg Roedel Dec. 3, 2018, 1:24 p.m. UTC | #1

On Wed, Nov 28, 2018 at 09:23:35AM +0000, Yoshihiro Shimoda wrote:
> Yoshihiro Shimoda (2):
>   iommu/ipmmu-vmsa: Modify ipmmu_slave_whitelist() to check SoC
>     revisions
>   iommu/ipmmu-vmsa: add an array of slave devices whitelist

Applied, thanks.

Patch

--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -774,6 +774,8 @@  static int ipmmu_init_platform_device(struct device *dev,
 };
 
 static const char * const rcar_gen3_slave_whitelist[] = {
+	"e6700000.dma-controller",
+	"e7300000.dma-controller"
 };
 
 static bool ipmmu_slave_whitelist(struct device *dev)