[PATCH 1/3] iommu/tegra: smmu: Remove unnecessary PTC/TLB flush all

[PATCH 1/3] iommu/tegra: smmu: Remove unnecessary PTC/TLB flush all

[Hiroshi Doyu]

smmu_flush_regs() does TLB/PTC flush all when freeing a second level
page table. This isn't necessay at all since each pte entry has been
already maintained by address in the above flush_ptc_and_tlb().

Signed-off-by: Hiroshi Doyu <hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 drivers/iommu/tegra-smmu.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
index 4167863..46f5712 100644
--- a/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@ -694,10 +694,8 @@ static void __smmu_iommu_unmap(struct smmu_as *as, dma_addr_t iova)
 	*pte = _PTE_VACANT(iova);
 	FLUSH_CPU_DCACHE(pte, page, sizeof(*pte));
 	flush_ptc_and_tlb(as->smmu, as, iova, pte, page, 0);
-	if (!--(*count)) {
+	if (!--(*count))
 		free_ptbl(as, iova);
-		smmu_flush_regs(as->smmu, 0);
-	}
 }
 
 static void __smmu_iommu_map_pfn(struct smmu_as *as, dma_addr_t iova,
-- 
1.7.9.5

[PATCH 2/3] iommu/tegra: gart: Move bus_set_iommu after probe for multi arch

[Hiroshi Doyu]

For a single image to support multiple SoCs(GART/SMMU).

Reported-by: Arto Merilainen <amerilainen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Hiroshi Doyu <hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 drivers/iommu/tegra-gart.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iommu/tegra-gart.c b/drivers/iommu/tegra-gart.c
index c16e8fc..4c9db62 100644
--- a/drivers/iommu/tegra-gart.c
+++ b/drivers/iommu/tegra-gart.c
@@ -398,6 +398,7 @@ static int tegra_gart_probe(struct platform_device *pdev)
 	do_gart_setup(gart, NULL);
 
 	gart_handle = gart;
+	bus_set_iommu(&platform_bus_type, &gart_iommu_ops);
 	return 0;
 
 fail:
@@ -450,7 +451,6 @@ static struct platform_driver tegra_gart_driver = {
 
 static int __devinit tegra_gart_init(void)
 {
-	bus_set_iommu(&platform_bus_type, &gart_iommu_ops);
 	return platform_driver_register(&tegra_gart_driver);
 }
 
-- 
1.7.9.5

[PATCH 3/3] iommu/tegra: smmu: Move bus_set_iommu after probe for multi arch

[Hiroshi Doyu]

For a single image to support multiple SoCs(GART/SMMU).

Reported-by: Arto Merilainen <amerilainen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Hiroshi Doyu <hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 drivers/iommu/tegra-smmu.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
index 46f5712..608185b 100644
--- a/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@ -1229,6 +1229,7 @@ static int tegra_smmu_probe(struct platform_device *pdev)
 
 	smmu_debugfs_create(smmu);
 	smmu_handle = smmu;
+	bus_set_iommu(&platform_bus_type, &smmu_iommu_ops);
 	return 0;
 }
 
@@ -1273,7 +1274,6 @@ static struct platform_driver tegra_smmu_driver = {
 
 static int __devinit tegra_smmu_init(void)
 {
-	bus_set_iommu(&platform_bus_type, &smmu_iommu_ops);
 	return platform_driver_register(&tegra_smmu_driver);
 }
 
-- 
1.7.9.5

Re: [PATCH 1/3] iommu/tegra: smmu: Remove unnecessary PTC/TLB flush all

[Joerg Roedel]

On Wed, Nov 28, 2012 at 03:52:53PM +0200, Hiroshi Doyu wrote:
> smmu_flush_regs() does TLB/PTC flush all when freeing a second level
> page table. This isn't necessay at all since each pte entry has been
> already maintained by address in the above flush_ptc_and_tlb().
> 
> Signed-off-by: Hiroshi Doyu <hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

Applied, thanks.

Re: [PATCH 3/3] iommu/tegra: smmu: Move bus_set_iommu after probe for multi arch

[Mark Zhang]

On 11/28/2012 09:52 PM, Hiroshi Doyu wrote:
> For a single image to support multiple SoCs(GART/SMMU).
>

To be honest, I didn't get why we need to move "bus_set_iommu" to probe
func. So could you add more words in the commit message?
Same with tegra-gart.c.

Mark
> Reported-by: Arto Merilainen <amerilainen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> Signed-off-by: Hiroshi Doyu <hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> ---
>  drivers/iommu/tegra-smmu.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
> index 46f5712..608185b 100644
> --- a/drivers/iommu/tegra-smmu.c
> +++ b/drivers/iommu/tegra-smmu.c
> @@ -1229,6 +1229,7 @@ static int tegra_smmu_probe(struct platform_device *pdev)
>  
>  	smmu_debugfs_create(smmu);
>  	smmu_handle = smmu;
> +	bus_set_iommu(&platform_bus_type, &smmu_iommu_ops);
>  	return 0;
>  }
>  
> @@ -1273,7 +1274,6 @@ static struct platform_driver tegra_smmu_driver = {
>  
>  static int __devinit tegra_smmu_init(void)
>  {
> -	bus_set_iommu(&platform_bus_type, &smmu_iommu_ops);
>  	return platform_driver_register(&tegra_smmu_driver);
>  }
>  
>