pwm: lpss: add PM support for LPSS PWM
Subsystems (2)
PATCH 1/1 pwm: lpss: add PM support for LPSS PWM
Add runtime PM and use autosuspend feature with default timeout of 5ms.
PWM support D3 and DevIdle/D0i3 on Broxton, if PWM is in D0, then SOC will not enter S0ix.
--- drivers/pwm/pwm-lpss-pci.c | 11 +++++++++++ drivers/pwm/pwm-lpss-platform.c | 11 +++++++++++ drivers/pwm/pwm-lpss.c | 41 +++++++++++++++++++++++++++++++++++++++++ drivers/pwm/pwm-lpss.h | 1 + 4 files changed, 64 insertions(+)
drivers/pwm/pwm-lpss-pci.c +11 -0
@@ -13,6 +13,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/pci.h> +#include <linux/pm_runtime.h> #include "pwm-lpss.h"
@@ -33,6 +34,12 @@ static int pwm_lpss_probe_pci(struct pci_dev *pdev,return PTR_ERR (lpwm);pci_set_drvdata (pdev, lpwm); + +pm_runtime_set_autosuspend_delay (&pdev->dev,5 ); +pm_runtime_use_autosuspend (&pdev->dev); +pm_runtime_put_noidle (&pdev->dev); +pm_runtime_allow (&pdev->dev); +return 0 ; }
@@ -40,6 +47,7 @@ static void pwm_lpss_remove_pci(struct pci_dev *pdev) {struct pwm_lpss_chip *lpwm =pci_get_drvdata (pdev); +pm_runtime_forbid (&pdev->dev);pwm_lpss_remove (lpwm); }
@@ -59,6 +67,9 @@ static struct pci_driver pwm_lpss_driver_pci = { .id_table = pwm_lpss_pci_ids, .probe = pwm_lpss_probe_pci, .remove = pwm_lpss_remove_pci, + .driver = { + .pm = &pwm_lpss_pm, + }, };module_pci_driver (pwm_lpss_driver_pci);
drivers/pwm/pwm-lpss-platform.c +11 -0
@@ -14,6 +14,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/pm_runtime.h> #include "pwm-lpss.h"
@@ -36,6 +37,12 @@ static int pwm_lpss_probe_platform(struct platform_device *pdev)return PTR_ERR (lpwm);platform_set_drvdata (pdev, lpwm); + +pm_runtime_set_autosuspend_delay (&pdev->dev,5 ); +pm_runtime_use_autosuspend (&pdev->dev); +pm_runtime_put_noidle (&pdev->dev); +pm_runtime_allow (&pdev->dev); +return 0 ; }
@@ -43,6 +50,7 @@ static int pwm_lpss_remove_platform(struct platform_device *pdev) {struct pwm_lpss_chip *lpwm =platform_get_drvdata (pdev); +pm_runtime_forbid (&pdev->dev);return pwm_lpss_remove (lpwm); }
@@ -60,6 +68,9 @@ static struct platform_driver pwm_lpss_driver_platform = { }, .probe = pwm_lpss_probe_platform, .remove = pwm_lpss_remove_platform, + .driver = { + .pm = &pwm_lpss_pm, + }, };module_platform_driver (pwm_lpss_driver_platform);
drivers/pwm/pwm-lpss.c +41 -0
82 lines not on this page · raw message
drivers/pwm/pwm-lpss.h +1 -0
@@ -28,5 +28,6 @@ extern const struct pwm_lpss_boardinfo pwm_lpss_bsw_info;struct pwm_lpss_chip *pwm_lpss_probe (struct device *dev,struct resource *r,const struct pwm_lpss_boardinfo *info);int pwm_lpss_remove (struct pwm_lpss_chip *lpwm); +extern const struct dev_pm_ops pwm_lpss_pm;#endif /* __PWM_LPSS_H */
Signature · 1 line
1.8.3.2
Quoted 4 lines · Qipeng Zha
Add runtime PM and use autosuspend feature with default timeout of 5ms.
PWM support D3 and DevIdle/D0i3 on Broxton, if PWM is in D0, then SOC will not enter S0ix.
This is much better, thanks.
Quoted 65 lines
Signed-off-by Huiquan Zhong <[email protected]>Signed-off-by Qipeng Zha <[email protected]>--- drivers/pwm/pwm-lpss-pci.c | 11 +++++++++++ drivers/pwm/pwm-lpss-platform.c | 11 +++++++++++ drivers/pwm/pwm-lpss.c | 41 +++++++++++++++++++++++++++++++++++++++++ drivers/pwm/pwm-lpss.h | 1 + 4 files changed, 64 insertions(+)drivers/pwm/pwm-lpss-pci.c +11
-0@@ -13,6 +13,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/pci.h> +#include <linux/pm_runtime.h> #include "pwm-lpss.h" @@ -33,6 +34,12 @@ static int pwm_lpss_probe_pci(struct pci_dev *pdev,return PTR_ERR (lpwm);pci_set_drvdata (pdev, lpwm); + +pm_runtime_set_autosuspend_delay (&pdev->dev,5 ); +pm_runtime_use_autosuspend (&pdev->dev); +pm_runtime_put_noidle (&pdev->dev); +pm_runtime_allow (&pdev->dev); +return 0 ; }@@ -40,6 +47,7 @@ static void pwm_lpss_remove_pci(struct pci_dev *pdev) {struct pwm_lpss_chip *lpwm =pci_get_drvdata (pdev); +pm_runtime_forbid (&pdev->dev);pwm_lpss_remove (lpwm); }@@ -59,6 +67,9 @@ static struct pci_driver pwm_lpss_driver_pci = { .id_table = pwm_lpss_pci_ids, .probe = pwm_lpss_probe_pci, .remove = pwm_lpss_remove_pci, + .driver = { + .pm = &pwm_lpss_pm, + }, };module_pci_driver (pwm_lpss_driver_pci);drivers/pwm/pwm-lpss-platform.c +1
-0@@ -14,6 +14,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/pm_runtime.h> #include "pwm-lpss.h"
drivers/pwm/pwm-lpss-platform.c static int pwm_lpss_probe_platform(struct platform_device *pdev) · line 44
Quoted 8 lines
drivers/pwm/pwm-lpss-platform.c +5
-0@@ -36,6 +37,12 @@ static int pwm_lpss_probe_platform(struct platform_device *pdev)return PTR_ERR (lpwm);platform_set_drvdata (pdev, lpwm); + +pm_runtime_set_autosuspend_delay (&pdev->dev,5 ); +pm_runtime_use_autosuspend (&pdev->dev); +pm_runtime_put_noidle (&pdev->dev); +pm_runtime_allow (&pdev->dev);
For platform drivers runtime PM works differently than PCI. In PCI case the bus prepares you everything and you are required to call _put() (and possibly _allow()). However, for platform drivers you need to enable runtime PM yourself here and _allow() is not needed.
Did you test this?
Quoted 54 lines
drivers/pwm/pwm-lpss-platform.c +5
-0+return 0 ; }@@ -43,6 +50,7 @@ static int pwm_lpss_remove_platform(struct platform_device *pdev) {struct pwm_lpss_chip *lpwm =platform_get_drvdata (pdev); +pm_runtime_forbid (&pdev->dev);return pwm_lpss_remove (lpwm); }@@ -60,6 +68,9 @@ static struct platform_driver pwm_lpss_driver_platform = { }, .probe = pwm_lpss_probe_platform, .remove = pwm_lpss_remove_platform, + .driver = { + .pm = &pwm_lpss_pm, + }, };module_platform_driver (pwm_lpss_driver_platform);drivers/pwm/pwm-lpss.c +6
-0@@ -16,6 +16,7 @@#include <linux/io.h> #include <linux/kernel.h> #include <linux/module.h> +#include <linux/pm_runtime.h> #include "pwm-lpss.h" @@ -75,6 +76,8 @@ static int pwm_lpss_config(struct pwm_chip *chip, struct pwm_device *pwm,if (base_unit >PWM_LIMIT )return -EINVAL ; +pm_runtime_get_sync (lpwm->chip.dev); +if (duty_ns <=0 ) duty_ns =1 ; on_time_div =255 - (255 * duty_ns / period_ns);@@ -87,6 +90,9 @@ static int pwm_lpss_config(struct pwm_chip *chip, struct pwm_device *pwm, ctrl |=PWM_SW_UPDATE ;writel (ctrl, lpwm->regs +PWM ); +pm_runtime_mark_last_busy (lpwm->chip.dev); +pm_runtime_put_autosuspend (lpwm->chip.dev); +return 0 ; }
drivers/pwm/pwm-lpss.c static int pwm_lpss_enable(struct pwm_chip *chip, struct pwm_device *pwm) · line 110
Quoted 10 lines
drivers/pwm/pwm-lpss.c +4
-0@@ -95,9 +101,14 @@ static int pwm_lpss_enable(struct pwm_chip *chip, struct pwm_device *pwm)struct pwm_lpss_chip *lpwm =to_lpwm (chip);u32 ctrl; +pm_runtime_get_sync (lpwm->chip.dev); + ctrl =readl (lpwm->regs +PWM );writel (ctrl |PWM_ENABLE , lpwm->regs +PWM ); +pm_runtime_mark_last_busy (lpwm->chip.dev); +pm_runtime_put_autosuspend (lpwm->chip.dev);
So if I enable PWM it will only work ~5ms until it gets autosuspended and put to D3. Probably not what you intented.
The whole autosuspend thing in PWM does not feel right.
I think better is to do _get() here and _put() in disable. Then the device will stay alive as long as it is being used.
Quoted 28 lines
drivers/pwm/pwm-lpss.c +12
-0+return 0 ; }@@ -106,8 +117,13 @@ static void pwm_lpss_disable(struct pwm_chip *chip, struct pwm_device *pwm)struct pwm_lpss_chip *lpwm =to_lpwm (chip);u32 ctrl; +pm_runtime_get_sync (lpwm->chip.dev); + ctrl =readl (lpwm->regs +PWM );writel (ctrl & ~PWM_ENABLE , lpwm->regs +PWM ); + +pm_runtime_mark_last_busy (lpwm->chip.dev); +pm_runtime_put_autosuspend (lpwm->chip.dev); }static const struct pwm_ops pwm_lpss_ops = {@@ -158,6 +174,31 @@ int pwm_lpss_remove(struct pwm_lpss_chip *lpwm) }EXPORT_SYMBOL_GPL (pwm_lpss_remove); +static int pwm_lpss_suspend (struct device *dev) +{ +struct pwm_lpss_chip *lpwm =dev_get_drvdata (dev); +u32 ctrl; +int ret; +
drivers/pwm/pwm-lpss.c int pwm_lpss_remove(struct pwm_lpss_chip *lpwm) · line 192
Quoted 10 lines
drivers/pwm/pwm-lpss.c +10
-0+ ctrl =readl (lpwm->regs +PWM ); + ret = (ctrl &PWM_ENABLE ) ? -EAGAIN :0 ; + +return ret; +} + +static int pwm_lpss_resume (struct device *dev) +{ +return 0 ; +}
You don't need to provide empty stub, just pass NULL with the ops.
Also have you compiled this with !CONFIG_PM?
Quoted 25 lines
drivers/pwm/pwm-lpss.c +9
-0+ +const struct dev_pm_ops pwm_lpss_pm = { + .suspend_late = pwm_lpss_suspend, + .resume_early = pwm_lpss_resume, +SET_RUNTIME_PM_OPS (pwm_lpss_suspend, + pwm_lpss_resume,NULL ) +}; +EXPORT_SYMBOL (pwm_lpss_pm); +MODULE_DESCRIPTION ("PWM driver for Intel LPSS" );MODULE_AUTHOR ("Mika Westerberg <[email protected]>" );MODULE_LICENSE ("GPL v2" );drivers/pwm/pwm-lpss.h +1
-0@@ -28,5 +28,6 @@ extern const struct pwm_lpss_boardinfo pwm_lpss_bsw_info;struct pwm_lpss_chip *pwm_lpss_probe (struct device *dev,struct resource *r,const struct pwm_lpss_boardinfo *info);int pwm_lpss_remove (struct pwm_lpss_chip *lpwm); +extern const struct dev_pm_ops pwm_lpss_pm;#endif /* __PWM_LPSS_H */ Signature · 1 line
1.8.3.2