2015-09-09 17:04:15

by Loic Poulain

Subject: Bluetooth: hci_intel: Enable IRQ wake capability

We need to explicitly enable the IRQ wakeup mode to let the controller
wake the system from sleep states (like suspend-to-ram).

Signed-off-by: Loic Poulain <[email protected]>
---
drivers/bluetooth/hci_intel.c | 34 +++++++++++++++++++++++++++++-----
1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/drivers/bluetooth/hci_intel.c b/drivers/bluetooth/hci_intel.c
index b17386b..3314823 100644
--- a/drivers/bluetooth/hci_intel.c
+++ b/drivers/bluetooth/hci_intel.c
@@ -1181,11 +1181,11 @@ static int intel_acpi_probe(struct intel_device *idev)
#endif

#ifdef CONFIG_PM
-static int intel_suspend(struct device *dev)
+static int intel_rt_suspend(struct device *dev)
{
struct intel_device *idev = dev_get_drvdata(dev);

- dev_dbg(dev, "intel_suspend");
+ dev_dbg(dev, "intel_rt_suspend");

mutex_lock(&idev->hu_lock);
if (idev->hu)
@@ -1195,11 +1195,11 @@ static int intel_suspend(struct device *dev)
return 0;
}

-static int intel_resume(struct device *dev)
+static int intel_rt_resume(struct device *dev)
{
struct intel_device *idev = dev_get_drvdata(dev);

- dev_dbg(dev, "intel_resume");
+ dev_dbg(dev, "intel_rt_resume");

mutex_lock(&idev->hu_lock);
if (idev->hu)
@@ -1208,11 +1208,35 @@ static int intel_resume(struct device *dev)

return 0;
}
+
+static int intel_suspend(struct device *dev)
+{
+ struct intel_device *idev = dev_get_drvdata(dev);
+
+ dev_dbg(dev, "intel_suspend");
+
+ if (device_may_wakeup(dev))
+ enable_irq_wake(idev->irq);
+
+ return intel_rt_suspend(dev);
+}
+
+static int intel_resume(struct device *dev)
+{
+ struct intel_device *idev = dev_get_drvdata(dev);
+
+ dev_dbg(dev, "intel_resume");
+
+ if (device_may_wakeup(dev))
+ disable_irq_wake(idev->irq);
+
+ return intel_rt_resume(dev);
+}
#endif

static const struct dev_pm_ops intel_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(intel_suspend, intel_resume)
- SET_RUNTIME_PM_OPS(intel_suspend, intel_resume, NULL)
+ SET_RUNTIME_PM_OPS(intel_rt_suspend, intel_rt_resume, NULL)
};

static int intel_probe(struct platform_device *pdev)
--
1.9.1

2015-09-09 17:47:38

by Marcel Holtmann

Subject: Re: Bluetooth: hci_intel: Enable IRQ wake capability

Hi Loic,

> We need to explicitly enable the IRQ wakeup mode to let the controller
> wake the system from sleep states (like suspend-to-ram).
>
> Signed-off-by: Loic Poulain <[email protected]>
> ---
> drivers/bluetooth/hci_intel.c | 34 +++++++++++++++++++++++++++++-----
> 1 file changed, 29 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/bluetooth/hci_intel.c b/drivers/bluetooth/hci_intel.c
> index b17386b..3314823 100644
> --- a/drivers/bluetooth/hci_intel.c
> +++ b/drivers/bluetooth/hci_intel.c
> @@ -1181,11 +1181,11 @@ static int intel_acpi_probe(struct intel_device *idev)
> #endif
>
> #ifdef CONFIG_PM
> -static int intel_suspend(struct device *dev)
> +static int intel_rt_suspend(struct device *dev)
> {
> struct intel_device *idev = dev_get_drvdata(dev);
>
> - dev_dbg(dev, "intel_suspend");
> + dev_dbg(dev, "intel_rt_suspend");

as mentioned to Fred, I rather the generic pieces summarized as intel_suspend_device and intel_resume_device functions.

Also instead of repeating the function name in the debug string, I rather have it say something useful. The function name can be enabled via dynamic debug easily. So no point in repeating it.

> mutex_lock(&idev->hu_lock);
> if (idev->hu)
> @@ -1195,11 +1195,11 @@ static int intel_suspend(struct device *dev)
> return 0;
> }
>
> -static int intel_resume(struct device *dev)
> +static int intel_rt_resume(struct device *dev)
> {
> struct intel_device *idev = dev_get_drvdata(dev);
>
> - dev_dbg(dev, "intel_resume");
> + dev_dbg(dev, "intel_rt_resume");
>
> mutex_lock(&idev->hu_lock);
> if (idev->hu)
> @@ -1208,11 +1208,35 @@ static int intel_resume(struct device *dev)
>
> return 0;
> }
> +
> +static int intel_suspend(struct device *dev)
> +{
> + struct intel_device *idev = dev_get_drvdata(dev);
> +
> + dev_dbg(dev, "intel_suspend");
> +
> + if (device_may_wakeup(dev))
> + enable_irq_wake(idev->irq);
> +
> + return intel_rt_suspend(dev);
> +}
> +
> +static int intel_resume(struct device *dev)
> +{
> + struct intel_device *idev = dev_get_drvdata(dev);
> +
> + dev_dbg(dev, "intel_resume");
> +
> + if (device_may_wakeup(dev))
> + disable_irq_wake(idev->irq);
> +
> + return intel_rt_resume(dev);
> +}
> #endif
>
> static const struct dev_pm_ops intel_pm_ops = {
> SET_SYSTEM_SLEEP_PM_OPS(intel_suspend, intel_resume)
> - SET_RUNTIME_PM_OPS(intel_suspend, intel_resume, NULL)
> + SET_RUNTIME_PM_OPS(intel_rt_suspend, intel_rt_resume, NULL)
> };

Regards

Marcel