Re: [PATCH v11 19/27] iommu/exynos: add support for power management subsystems.
On Tue, 18 Mar 2014 16:33:04 +0100, Tomasz Figa wrote: On 18.03.2014 12:23, Cho KyongHo wrote: On Fri, 14 Mar 2014 17:07:53 +0100, Tomasz Figa wrote: Hi KyongHo, On 14.03.2014 06:10, Cho KyongHo wrote: [snip] @@ -677,11 +679,40 @@ static int __init exynos_sysmmu_probe(struct platform_device *pdev) platform_set_drvdata(pdev, data); pm_runtime_enable(dev); + data-runtime_active = !pm_runtime_enabled(dev); Hmm, this seems to be a bit misleading. The field is named runtime_active, but the assignment makes it true if PM runtime is _not_ enabled (i.e. inactive). Is this correct? I agree that it may lead misunderstood. data-runtime_active actually indicates if electric power is asserted to the System MMU. pm_runtime_enable() call must enable runtime pm for the given device. If runtime pm is not enabled although pm_runtime_enable() is called, CONFIG_PM_RUNTIME is not configured. Actually, it is replacible with if (IS_ENABLED(CONFIG_PM_RUNTIME)) data-runtime_active = true; I would keep it as !pm_runtime_enabled(dev), but rename the field to something more meaningful, like data-is_powered_on. That is good idea. thanks for advice. KyongHo. -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v11 19/27] iommu/exynos: add support for power management subsystems.
On Fri, 14 Mar 2014 17:07:53 +0100, Tomasz Figa wrote: Hi KyongHo, On 14.03.2014 06:10, Cho KyongHo wrote: This adds support for Suspend to RAM and Runtime Power Management. Since System MMU is located in the same local power domain of its master H/W, System MMU must be initialized before it is working if its power domain was ever turned off. TLB invalidation according to unmapping on page tables must also be performed while power domain is turned on. This patch ensures that resume and runtime_resume(restore_state) functions in this driver is called before the calls to resume and runtime_resume callback functions in the drivers of master H/Ws. Likewise, suspend and runtime_suspend(save_state) functions in this driver is called after the calls to suspend and runtime_suspend in the drivers of master H/Ws. In order to get benefit of this support, the master H/W and its System MMU must resides in the same power domain in terms of Linux kernel. If a master H/W does not use generic I/O power domain, its driver must call iommu_attach_device() after its local power domain is turned on, iommu_detach_device before turned off. Signed-off-by: Cho KyongHo pullip@samsung.com --- drivers/iommu/exynos-iommu.c | 220 ++ 1 file changed, 201 insertions(+), 19 deletions(-) diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index 9037da0..84ba29a 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -28,6 +28,7 @@ #include linux/export.h #include linux/of.h #include linux/of_platform.h +#include linux/pm_domain.h #include linux/notifier.h #include asm/cacheflush.h @@ -203,6 +204,7 @@ struct sysmmu_drvdata { int activations; rwlock_t lock; struct iommu_domain *domain; + bool runtime_active; unsigned long pgtable; }; @@ -388,7 +390,8 @@ static bool __sysmmu_disable(struct sysmmu_drvdata *data) data-pgtable = 0; data-domain = NULL; - __sysmmu_disable_nocount(data); + if (data-runtime_active) + __sysmmu_disable_nocount(data); dev_dbg(data-sysmmu, Disabled\n); } else { @@ -449,7 +452,8 @@ static int __sysmmu_enable(struct sysmmu_drvdata *data, data-pgtable = pgtable; data-domain = domain; - __sysmmu_enable_nocount(data); + if (data-runtime_active) + __sysmmu_enable_nocount(data); dev_dbg(data-sysmmu, Enabled\n); } else { @@ -534,13 +538,11 @@ static void sysmmu_tlb_invalidate_entry(struct device *dev, unsigned long iova, data = dev_get_drvdata(owner-sysmmu); read_lock_irqsave(data-lock, flags); - if (is_sysmmu_active(data)) { - unsigned int maj; + if (is_sysmmu_active(data) data-runtime_active) { unsigned int num_inv = 1; __master_clk_enable(data); - maj = __raw_readl(data-sfrbase + REG_MMU_VERSION); /* * L2TLB invalidation required * 4KB page: 1 invalidation @@ -551,7 +553,7 @@ static void sysmmu_tlb_invalidate_entry(struct device *dev, unsigned long iova, * 1MB page can be cached in one of all sets. * 64KB page can be one of 16 consecutive sets. */ - if ((maj 28) == 2) /* major version number */ + if (__sysmmu_version(data, NULL) == 2) /* major version number */ num_inv = min_t(unsigned int, size / PAGE_SIZE, 64); if (sysmmu_block(data-sfrbase)) { @@ -576,7 +578,7 @@ void exynos_sysmmu_tlb_invalidate(struct device *dev) data = dev_get_drvdata(owner-sysmmu); read_lock_irqsave(data-lock, flags); - if (is_sysmmu_active(data)) { + if (is_sysmmu_active(data) data-runtime_active) { __master_clk_enable(data); if (sysmmu_block(data-sfrbase)) { __sysmmu_tlb_invalidate(data-sfrbase); @@ -677,11 +679,40 @@ static int __init exynos_sysmmu_probe(struct platform_device *pdev) platform_set_drvdata(pdev, data); pm_runtime_enable(dev); + data-runtime_active = !pm_runtime_enabled(dev); Hmm, this seems to be a bit misleading. The field is named runtime_active, but the assignment makes it true if PM runtime is _not_ enabled (i.e. inactive). Is this correct? I agree that it may lead misunderstood. data-runtime_active actually indicates if electric power is asserted to the System MMU. pm_runtime_enable() call must enable runtime pm for the given device. If runtime pm is not enabled although pm_runtime_enable() is called, CONFIG_PM_RUNTIME is not configured. Actually, it is replacible with if (IS_ENABLED(CONFIG_PM_RUNTIME)) data-runtime_active = true; dev_dbg(dev, Probed
Re: [PATCH v11 19/27] iommu/exynos: add support for power management subsystems.
On 18.03.2014 12:23, Cho KyongHo wrote: On Fri, 14 Mar 2014 17:07:53 +0100, Tomasz Figa wrote: Hi KyongHo, On 14.03.2014 06:10, Cho KyongHo wrote: [snip] @@ -677,11 +679,40 @@ static int __init exynos_sysmmu_probe(struct platform_device *pdev) platform_set_drvdata(pdev, data); pm_runtime_enable(dev); + data-runtime_active = !pm_runtime_enabled(dev); Hmm, this seems to be a bit misleading. The field is named runtime_active, but the assignment makes it true if PM runtime is _not_ enabled (i.e. inactive). Is this correct? I agree that it may lead misunderstood. data-runtime_active actually indicates if electric power is asserted to the System MMU. pm_runtime_enable() call must enable runtime pm for the given device. If runtime pm is not enabled although pm_runtime_enable() is called, CONFIG_PM_RUNTIME is not configured. Actually, it is replacible with if (IS_ENABLED(CONFIG_PM_RUNTIME)) data-runtime_active = true; I would keep it as !pm_runtime_enabled(dev), but rename the field to something more meaningful, like data-is_powered_on. Best regards, Tomasz -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v11 19/27] iommu/exynos: add support for power management subsystems.
Hi KyongHo, On 14.03.2014 06:10, Cho KyongHo wrote: This adds support for Suspend to RAM and Runtime Power Management. Since System MMU is located in the same local power domain of its master H/W, System MMU must be initialized before it is working if its power domain was ever turned off. TLB invalidation according to unmapping on page tables must also be performed while power domain is turned on. This patch ensures that resume and runtime_resume(restore_state) functions in this driver is called before the calls to resume and runtime_resume callback functions in the drivers of master H/Ws. Likewise, suspend and runtime_suspend(save_state) functions in this driver is called after the calls to suspend and runtime_suspend in the drivers of master H/Ws. In order to get benefit of this support, the master H/W and its System MMU must resides in the same power domain in terms of Linux kernel. If a master H/W does not use generic I/O power domain, its driver must call iommu_attach_device() after its local power domain is turned on, iommu_detach_device before turned off. Signed-off-by: Cho KyongHo pullip@samsung.com --- drivers/iommu/exynos-iommu.c | 220 ++ 1 file changed, 201 insertions(+), 19 deletions(-) diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index 9037da0..84ba29a 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -28,6 +28,7 @@ #include linux/export.h #include linux/of.h #include linux/of_platform.h +#include linux/pm_domain.h #include linux/notifier.h #include asm/cacheflush.h @@ -203,6 +204,7 @@ struct sysmmu_drvdata { int activations; rwlock_t lock; struct iommu_domain *domain; + bool runtime_active; unsigned long pgtable; }; @@ -388,7 +390,8 @@ static bool __sysmmu_disable(struct sysmmu_drvdata *data) data-pgtable = 0; data-domain = NULL; - __sysmmu_disable_nocount(data); + if (data-runtime_active) + __sysmmu_disable_nocount(data); dev_dbg(data-sysmmu, Disabled\n); } else { @@ -449,7 +452,8 @@ static int __sysmmu_enable(struct sysmmu_drvdata *data, data-pgtable = pgtable; data-domain = domain; - __sysmmu_enable_nocount(data); + if (data-runtime_active) + __sysmmu_enable_nocount(data); dev_dbg(data-sysmmu, Enabled\n); } else { @@ -534,13 +538,11 @@ static void sysmmu_tlb_invalidate_entry(struct device *dev, unsigned long iova, data = dev_get_drvdata(owner-sysmmu); read_lock_irqsave(data-lock, flags); - if (is_sysmmu_active(data)) { - unsigned int maj; + if (is_sysmmu_active(data) data-runtime_active) { unsigned int num_inv = 1; __master_clk_enable(data); - maj = __raw_readl(data-sfrbase + REG_MMU_VERSION); /* * L2TLB invalidation required * 4KB page: 1 invalidation @@ -551,7 +553,7 @@ static void sysmmu_tlb_invalidate_entry(struct device *dev, unsigned long iova, * 1MB page can be cached in one of all sets. * 64KB page can be one of 16 consecutive sets. */ - if ((maj 28) == 2) /* major version number */ + if (__sysmmu_version(data, NULL) == 2) /* major version number */ num_inv = min_t(unsigned int, size / PAGE_SIZE, 64); if (sysmmu_block(data-sfrbase)) { @@ -576,7 +578,7 @@ void exynos_sysmmu_tlb_invalidate(struct device *dev) data = dev_get_drvdata(owner-sysmmu); read_lock_irqsave(data-lock, flags); - if (is_sysmmu_active(data)) { + if (is_sysmmu_active(data) data-runtime_active) { __master_clk_enable(data); if (sysmmu_block(data-sfrbase)) { __sysmmu_tlb_invalidate(data-sfrbase); @@ -677,11 +679,40 @@ static int __init exynos_sysmmu_probe(struct platform_device *pdev) platform_set_drvdata(pdev, data); pm_runtime_enable(dev); + data-runtime_active = !pm_runtime_enabled(dev); Hmm, this seems to be a bit misleading. The field is named runtime_active, but the assignment makes it true if PM runtime is _not_ enabled (i.e. inactive). Is this correct? dev_dbg(dev, Probed and initialized\n); return 0; } +#ifdef CONFIG_PM_SLEEP +static int sysmmu_suspend(struct device *dev) +{ + struct sysmmu_drvdata *data = dev_get_drvdata(dev); + unsigned long flags; + read_lock_irqsave(data-lock, flags); + if (is_sysmmu_active(data) + (!pm_runtime_enabled(dev) || data-runtime_active)) + __sysmmu_disable_nocount(data); + read_unlock_irqrestore(data-lock, flags); + return 0; +} + +static
[PATCH v11 19/27] iommu/exynos: add support for power management subsystems.
This adds support for Suspend to RAM and Runtime Power Management. Since System MMU is located in the same local power domain of its master H/W, System MMU must be initialized before it is working if its power domain was ever turned off. TLB invalidation according to unmapping on page tables must also be performed while power domain is turned on. This patch ensures that resume and runtime_resume(restore_state) functions in this driver is called before the calls to resume and runtime_resume callback functions in the drivers of master H/Ws. Likewise, suspend and runtime_suspend(save_state) functions in this driver is called after the calls to suspend and runtime_suspend in the drivers of master H/Ws. In order to get benefit of this support, the master H/W and its System MMU must resides in the same power domain in terms of Linux kernel. If a master H/W does not use generic I/O power domain, its driver must call iommu_attach_device() after its local power domain is turned on, iommu_detach_device before turned off. Signed-off-by: Cho KyongHo pullip@samsung.com --- drivers/iommu/exynos-iommu.c | 220 ++ 1 file changed, 201 insertions(+), 19 deletions(-) diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index 9037da0..84ba29a 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -28,6 +28,7 @@ #include linux/export.h #include linux/of.h #include linux/of_platform.h +#include linux/pm_domain.h #include linux/notifier.h #include asm/cacheflush.h @@ -203,6 +204,7 @@ struct sysmmu_drvdata { int activations; rwlock_t lock; struct iommu_domain *domain; + bool runtime_active; unsigned long pgtable; }; @@ -388,7 +390,8 @@ static bool __sysmmu_disable(struct sysmmu_drvdata *data) data-pgtable = 0; data-domain = NULL; - __sysmmu_disable_nocount(data); + if (data-runtime_active) + __sysmmu_disable_nocount(data); dev_dbg(data-sysmmu, Disabled\n); } else { @@ -449,7 +452,8 @@ static int __sysmmu_enable(struct sysmmu_drvdata *data, data-pgtable = pgtable; data-domain = domain; - __sysmmu_enable_nocount(data); + if (data-runtime_active) + __sysmmu_enable_nocount(data); dev_dbg(data-sysmmu, Enabled\n); } else { @@ -534,13 +538,11 @@ static void sysmmu_tlb_invalidate_entry(struct device *dev, unsigned long iova, data = dev_get_drvdata(owner-sysmmu); read_lock_irqsave(data-lock, flags); - if (is_sysmmu_active(data)) { - unsigned int maj; + if (is_sysmmu_active(data) data-runtime_active) { unsigned int num_inv = 1; __master_clk_enable(data); - maj = __raw_readl(data-sfrbase + REG_MMU_VERSION); /* * L2TLB invalidation required * 4KB page: 1 invalidation @@ -551,7 +553,7 @@ static void sysmmu_tlb_invalidate_entry(struct device *dev, unsigned long iova, * 1MB page can be cached in one of all sets. * 64KB page can be one of 16 consecutive sets. */ - if ((maj 28) == 2) /* major version number */ + if (__sysmmu_version(data, NULL) == 2) /* major version number */ num_inv = min_t(unsigned int, size / PAGE_SIZE, 64); if (sysmmu_block(data-sfrbase)) { @@ -576,7 +578,7 @@ void exynos_sysmmu_tlb_invalidate(struct device *dev) data = dev_get_drvdata(owner-sysmmu); read_lock_irqsave(data-lock, flags); - if (is_sysmmu_active(data)) { + if (is_sysmmu_active(data) data-runtime_active) { __master_clk_enable(data); if (sysmmu_block(data-sfrbase)) { __sysmmu_tlb_invalidate(data-sfrbase); @@ -677,11 +679,40 @@ static int __init exynos_sysmmu_probe(struct platform_device *pdev) platform_set_drvdata(pdev, data); pm_runtime_enable(dev); + data-runtime_active = !pm_runtime_enabled(dev); dev_dbg(dev, Probed and initialized\n); return 0; } +#ifdef CONFIG_PM_SLEEP +static int sysmmu_suspend(struct device *dev) +{ + struct sysmmu_drvdata *data = dev_get_drvdata(dev); + unsigned long flags; + read_lock_irqsave(data-lock, flags); + if (is_sysmmu_active(data) + (!pm_runtime_enabled(dev) || data-runtime_active)) + __sysmmu_disable_nocount(data); + read_unlock_irqrestore(data-lock, flags); + return 0; +} + +static int sysmmu_resume(struct device *dev) +{ + struct sysmmu_drvdata *data = dev_get_drvdata(dev); + unsigned long flags; + read_lock_irqsave(data-lock, flags); + if (is_sysmmu_active(data) +