[PATCH 0/4] iommu: Small fixes and cleanups

[PATCH 0/4] iommu: Small fixes and cleanups

[Joerg Roedel]

Hi,

here are a couple of iommu fixes and cleanups to fix compile
errors and some warnings on ARM and PPC.

Regards,

	Joerg

Joerg Roedel (4):
  iommu: Make more drivers depend on COMPILE_TEST
  iommu/exynos: Make driver depend on REGULATOR
  iommu/omap: Print phys_addr_t using %pa
  iommu/fsl: Use %pa to print phys_addr_t

 drivers/iommu/Kconfig      | 11 +++++++----
 drivers/iommu/fsl_pamu.c   |  4 ++--
 drivers/iommu/omap-iommu.c |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

-- 
1.9.1

[PATCH 1/4] iommu: Make more drivers depend on COMPILE_TEST

[Joerg Roedel]

From: Joerg Roedel <jroedel@suse.de>

For easier compile testing of these iommu drivers.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
 drivers/iommu/Kconfig | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index 325188e..dfa6cf1 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -19,7 +19,8 @@ config OF_IOMMU
 
 config FSL_PAMU
 	bool "Freescale IOMMU support"
-	depends on PPC_E500MC
+	depends on PPC32
+	depends on PPC_E500MC || COMPILE_TEST
 	select IOMMU_API
 	select GENERIC_ALLOCATOR
 	help
@@ -30,7 +31,8 @@ config FSL_PAMU
 # MSM IOMMU support
 config MSM_IOMMU
 	bool "MSM IOMMU Support"
-	depends on ARCH_MSM8X60 || ARCH_MSM8960
+	depends on ARM
+	depends on ARCH_MSM8X60 || ARCH_MSM8960 || COMPILE_TEST
 	select IOMMU_API
 	help
 	  Support for the IOMMUs found on certain Qualcomm SOCs.
@@ -140,7 +142,8 @@ config IRQ_REMAP
 # OMAP IOMMU support
 config OMAP_IOMMU
 	bool "OMAP IOMMU Support"
-	depends on ARCH_OMAP2PLUS
+	depends on ARM
+	depends on ARCH_OMAP2PLUS || COMPILE_TEST
 	select IOMMU_API
 
 config OMAP_IOMMU_DEBUG
-- 
1.9.1

[PATCH 2/4] iommu/exynos: Make driver depend on REGULATOR

[Joerg Roedel]

From: Joerg Roedel <jroedel@suse.de>

When regulator is not selected during kconfig, linking of
the exynos iommu driver fails due to missing symbols.
Fix it!

Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
 drivers/iommu/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index dfa6cf1..2e6100d 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -190,7 +190,7 @@ config TEGRA_IOMMU_SMMU
 
 config EXYNOS_IOMMU
 	bool "Exynos IOMMU Support"
-	depends on ARCH_EXYNOS && ARM
+	depends on ARCH_EXYNOS && ARM && REGULATOR
 	select IOMMU_API
 	select ARM_DMA_USE_IOMMU
 	help
-- 
1.9.1

[PATCH 2/4] iommu/exynos: Make driver depend on REGULATOR

[Joerg Roedel]

From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>

When regulator is not selected during kconfig, linking of
the exynos iommu driver fails due to missing symbols.
Fix it!

Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
---
 drivers/iommu/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index dfa6cf1..2e6100d 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -190,7 +190,7 @@ config TEGRA_IOMMU_SMMU
 
 config EXYNOS_IOMMU
 	bool "Exynos IOMMU Support"
-	depends on ARCH_EXYNOS && ARM
+	depends on ARCH_EXYNOS && ARM && REGULATOR
 	select IOMMU_API
 	select ARM_DMA_USE_IOMMU
 	help
-- 
1.9.1

[PATCH 3/4] iommu/omap: Print phys_addr_t using %pa

[Joerg Roedel]

From: Joerg Roedel <jroedel@suse.de>

Fixes this compile warning:

drivers/iommu/omap-iommu.c: In function 'omap_iommu_map':
drivers/iommu/omap-iommu.c:1139:2: warning: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'phys_addr_t' [-Wformat=]
  dev_dbg(dev, "mapping da 0x%lx to pa 0x%x size 0x%x\n", da, pa, bytes);

Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
 drivers/iommu/omap-iommu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index bbb7dce..f59f857 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -1126,7 +1126,7 @@ static int omap_iommu_map(struct iommu_domain *domain, unsigned long da,
 		return -EINVAL;
 	}
 
-	dev_dbg(dev, "mapping da 0x%lx to pa 0x%x size 0x%x\n", da, pa, bytes);
+	dev_dbg(dev, "mapping da 0x%lx to pa %pa size 0x%x\n", da, &pa, bytes);
 
 	iotlb_init_entry(&e, da, pa, omap_pgsz);
 
-- 
1.9.1

[PATCH 3/4] iommu/omap: Print phys_addr_t using %pa

[Joerg Roedel]

From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>

Fixes this compile warning:

drivers/iommu/omap-iommu.c: In function 'omap_iommu_map':
drivers/iommu/omap-iommu.c:1139:2: warning: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'phys_addr_t' [-Wformat=]
  dev_dbg(dev, "mapping da 0x%lx to pa 0x%x size 0x%x\n", da, pa, bytes);

Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
---
 drivers/iommu/omap-iommu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index bbb7dce..f59f857 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -1126,7 +1126,7 @@ static int omap_iommu_map(struct iommu_domain *domain, unsigned long da,
 		return -EINVAL;
 	}
 
-	dev_dbg(dev, "mapping da 0x%lx to pa 0x%x size 0x%x\n", da, pa, bytes);
+	dev_dbg(dev, "mapping da 0x%lx to pa %pa size 0x%x\n", da, &pa, bytes);
 
 	iotlb_init_entry(&e, da, pa, omap_pgsz);
 
-- 
1.9.1

[PATCH 4/4] iommu/fsl: Use %pa to print phys_addr_t

[Joerg Roedel]

From: Joerg Roedel <jroedel@suse.de>

Fix two compile warnings.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
 drivers/iommu/fsl_pamu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c
index 80ac68d..e63904b 100644
--- a/drivers/iommu/fsl_pamu.c
+++ b/drivers/iommu/fsl_pamu.c
@@ -352,7 +352,7 @@ int pamu_config_ppaace(int liodn, phys_addr_t win_addr, phys_addr_t win_size,
 	unsigned long fspi;
 
 	if ((win_size & (win_size - 1)) || win_size < PAMU_PAGE_SIZE) {
-		pr_debug("window size too small or not a power of two %llx\n", win_size);
+		pr_debug("window size too small or not a power of two %pa\n", &win_size);
 		return -EINVAL;
 	}
 
@@ -1138,7 +1138,7 @@ static int __init fsl_pamu_probe(struct platform_device *pdev)
 
 	if (csd_port_id) {
 		dev_dbg(&pdev->dev, "creating coherency subdomain at address "
-			"0x%llx, size %zu, port id 0x%08x", ppaact_phys,
+			"%pa, size %zu, port id 0x%08x", &ppaact_phys,
 			mem_size, csd_port_id);
 
 		ret = create_csd(ppaact_phys, mem_size, csd_port_id);
-- 
1.9.1

[PATCH 4/4] iommu/fsl: Use %pa to print phys_addr_t

[Joerg Roedel]

From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>

Fix two compile warnings.

Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
---
 drivers/iommu/fsl_pamu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c
index 80ac68d..e63904b 100644
--- a/drivers/iommu/fsl_pamu.c
+++ b/drivers/iommu/fsl_pamu.c
@@ -352,7 +352,7 @@ int pamu_config_ppaace(int liodn, phys_addr_t win_addr, phys_addr_t win_size,
 	unsigned long fspi;
 
 	if ((win_size & (win_size - 1)) || win_size < PAMU_PAGE_SIZE) {
-		pr_debug("window size too small or not a power of two %llx\n", win_size);
+		pr_debug("window size too small or not a power of two %pa\n", &win_size);
 		return -EINVAL;
 	}
 
@@ -1138,7 +1138,7 @@ static int __init fsl_pamu_probe(struct platform_device *pdev)
 
 	if (csd_port_id) {
 		dev_dbg(&pdev->dev, "creating coherency subdomain at address "
-			"0x%llx, size %zu, port id 0x%08x", ppaact_phys,
+			"%pa, size %zu, port id 0x%08x", &ppaact_phys,
 			mem_size, csd_port_id);
 
 		ret = create_csd(ppaact_phys, mem_size, csd_port_id);
-- 
1.9.1

Re: [PATCH 0/4] iommu: Small fixes and cleanups

[Laurent Pinchart]

Hi Joerg,

Thank you for the patches.

On Tuesday 27 January 2015 00:50:26 Joerg Roedel wrote:
> Hi,
> 
> here are a couple of iommu fixes and cleanups to fix compile
> errors and some warnings on ARM and PPC.

For the whole series,

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> Regards,
> 
> 	Joerg
> 
> Joerg Roedel (4):
>   iommu: Make more drivers depend on COMPILE_TEST
>   iommu/exynos: Make driver depend on REGULATOR
>   iommu/omap: Print phys_addr_t using %pa
>   iommu/fsl: Use %pa to print phys_addr_t
> 
>  drivers/iommu/Kconfig      | 11 +++++++----
>  drivers/iommu/fsl_pamu.c   |  4 ++--
>  drivers/iommu/omap-iommu.c |  2 +-
>  3 files changed, 10 insertions(+), 7 deletions(-)

-- 
Regards,

Laurent Pinchart

Re: [PATCH 4/4] iommu/fsl: Use %pa to print phys_addr_t

[Emil Medve]

Hello Joerg,


On 01/26/2015 05:50 PM, Joerg Roedel wrote:
> From: Joerg Roedel <jroedel-l3A5Bk7waGM-XMD5yJDbdMReXY1tMh2IBg@public.gmane.org>
> 
> Fix two compile warnings.
> 
> Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM-XMD5yJDbdMReXY1tMh2IBg@public.gmane.org>
> ---
>  drivers/iommu/fsl_pamu.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c
> index 80ac68d..e63904b 100644
> --- a/drivers/iommu/fsl_pamu.c
> +++ b/drivers/iommu/fsl_pamu.c
> @@ -352,7 +352,7 @@ int pamu_config_ppaace(int liodn, phys_addr_t win_addr, phys_addr_t win_size,
>  	unsigned long fspi;
>  
>  	if ((win_size & (win_size - 1)) || win_size < PAMU_PAGE_SIZE) {
> -		pr_debug("window size too small or not a power of two %llx\n", win_size);
> +		pr_debug("window size too small or not a power of two %pa\n", &win_size);
>  		return -EINVAL;
>  	}

Somewhere around line 1124 there another opportunity for this fix:

>    1124         dev_dbg(&pdev->dev, "ppaact virt=%p phys=0x%llx\n", ppaact,
>    1125                 (unsigned long long) ppaact_phys);


Cheers,


> @@ -1138,7 +1138,7 @@ static int __init fsl_pamu_probe(struct platform_device *pdev)
>  
>  	if (csd_port_id) {
>  		dev_dbg(&pdev->dev, "creating coherency subdomain at address "
> -			"0x%llx, size %zu, port id 0x%08x", ppaact_phys,
> +			"%pa, size %zu, port id 0x%08x", &ppaact_phys,
>  			mem_size, csd_port_id);
>  
>  		ret = create_csd(ppaact_phys, mem_size, csd_port_id);

Re: [PATCH 4/4] iommu/fsl: Use %pa to print phys_addr_t

[Joerg Roedel]

On Tue, Jan 27, 2015 at 04:40:35AM -0600, Emil Medve wrote:
> Hello Joerg,
> 
> 
> On 01/26/2015 05:50 PM, Joerg Roedel wrote:
> > From: Joerg Roedel <jroedel-l3A5Bk7waGM-XMD5yJDbdMReXY1tMh2IBg@public.gmane.org>
> > 
> > Fix two compile warnings.
> > 
> > Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM-XMD5yJDbdMReXY1tMh2IBg@public.gmane.org>
> > ---
> >  drivers/iommu/fsl_pamu.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c
> > index 80ac68d..e63904b 100644
> > --- a/drivers/iommu/fsl_pamu.c
> > +++ b/drivers/iommu/fsl_pamu.c
> > @@ -352,7 +352,7 @@ int pamu_config_ppaace(int liodn, phys_addr_t win_addr, phys_addr_t win_size,
> >  	unsigned long fspi;
> >  
> >  	if ((win_size & (win_size - 1)) || win_size < PAMU_PAGE_SIZE) {
> > -		pr_debug("window size too small or not a power of two %llx\n", win_size);
> > +		pr_debug("window size too small or not a power of two %pa\n", &win_size);
> >  		return -EINVAL;
> >  	}
> 
> Somewhere around line 1124 there another opportunity for this fix:

Thanks, I updated the patch.


	Joerg

Re: [PATCH 0/4] iommu: Small fixes and cleanups

[Joerg Roedel]

On Tue, Jan 27, 2015 at 12:50:26AM +0100, Joerg Roedel wrote:
> Hi,
> 
> here are a couple of iommu fixes and cleanups to fix compile
> errors and some warnings on ARM and PPC.
> 
> Regards,
> 
> 	Joerg
> 
> Joerg Roedel (4):
>   iommu: Make more drivers depend on COMPILE_TEST
>   iommu/exynos: Make driver depend on REGULATOR
>   iommu/omap: Print phys_addr_t using %pa
>   iommu/fsl: Use %pa to print phys_addr_t
> 
>  drivers/iommu/Kconfig      | 11 +++++++----
>  drivers/iommu/fsl_pamu.c   |  4 ++--
>  drivers/iommu/omap-iommu.c |  2 +-
>  3 files changed, 10 insertions(+), 7 deletions(-)

Applied these patches to their respective branches.

Re: [PATCH 0/4] iommu: Small fixes and cleanups

[Joerg Roedel]

On Tue, Jan 27, 2015 at 12:50:26AM +0100, Joerg Roedel wrote:
> Hi,
> 
> here are a couple of iommu fixes and cleanups to fix compile
> errors and some warnings on ARM and PPC.
> 
> Regards,
> 
> 	Joerg
> 
> Joerg Roedel (4):
>   iommu: Make more drivers depend on COMPILE_TEST
>   iommu/exynos: Make driver depend on REGULATOR
>   iommu/omap: Print phys_addr_t using %pa
>   iommu/fsl: Use %pa to print phys_addr_t
> 
>  drivers/iommu/Kconfig      | 11 +++++++----
>  drivers/iommu/fsl_pamu.c   |  4 ++--
>  drivers/iommu/omap-iommu.c |  2 +-
>  3 files changed, 10 insertions(+), 7 deletions(-)

Applied these patches to their respective branches.

Re: [PATCH 2/4] iommu/exynos: Make driver depend on REGULATOR

[Marek Szyprowski]

Hello,

On 2015-01-27 00:50, Joerg Roedel wrote:
> From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
>
> When regulator is not selected during kconfig, linking of
> the exynos iommu driver fails due to missing symbols.
> Fix it!

Frankly, I never observed such issue. Could you provide the .config for 
such case? I know that existing exynos iommu driver is broken, but 
please, don't break it even more...

> Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
> ---
>   drivers/iommu/Kconfig | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
> index dfa6cf1..2e6100d 100644
> --- a/drivers/iommu/Kconfig
> +++ b/drivers/iommu/Kconfig
> @@ -190,7 +190,7 @@ config TEGRA_IOMMU_SMMU
>   
>   config EXYNOS_IOMMU
>   	bool "Exynos IOMMU Support"
> -	depends on ARCH_EXYNOS && ARM
> +	depends on ARCH_EXYNOS && ARM && REGULATOR
>   	select IOMMU_API
>   	select ARM_DMA_USE_IOMMU
>   	help

Best regards
-- 
Marek Szyprowski, PhD
Samsung R&D Institute Poland

Re: [PATCH 2/4] iommu/exynos: Make driver depend on REGULATOR

[Joerg Roedel]

On Tue, Jan 27, 2015 at 12:50:28AM +0100, Joerg Roedel wrote:
> From: Joerg Roedel <jroedel@suse.de>
> 
> When regulator is not selected during kconfig, linking of
> the exynos iommu driver fails due to missing symbols.
> Fix it!

Removed this patch from my tree, as the issue was somewhere else.

Re: [PATCH 2/4] iommu/exynos: Make driver depend on REGULATOR

[Joerg Roedel]

On Tue, Jan 27, 2015 at 12:50:28AM +0100, Joerg Roedel wrote:
> From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
> 
> When regulator is not selected during kconfig, linking of
> the exynos iommu driver fails due to missing symbols.
> Fix it!

Removed this patch from my tree, as the issue was somewhere else.