Commit 17e41ea6 authored by Jeffy Chen's avatar Jeffy Chen Committed by Marcel Holtmann

Bluetooth: btmrvl: wake system up when receives a wake irq

Currrently we are disabling this wake irq after receiving it. If this
happens before we finish suspend and the pm event check is disabled,
the system will continue suspending, and this irq would not work again.

We may need to abort system suspend to avoid that.
Signed-off-by: default avatarJeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 017789f3
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <linux/firmware.h> #include <linux/firmware.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/suspend.h>
#include <linux/mmc/sdio_ids.h> #include <linux/mmc/sdio_ids.h>
#include <linux/mmc/sdio_func.h> #include <linux/mmc/sdio_func.h>
...@@ -60,7 +61,8 @@ static const struct of_device_id btmrvl_sdio_of_match_table[] = { ...@@ -60,7 +61,8 @@ static const struct of_device_id btmrvl_sdio_of_match_table[] = {
static irqreturn_t btmrvl_wake_irq_bt(int irq, void *priv) static irqreturn_t btmrvl_wake_irq_bt(int irq, void *priv)
{ {
struct btmrvl_plt_wake_cfg *cfg = priv; struct btmrvl_sdio_card *card = priv;
struct btmrvl_plt_wake_cfg *cfg = card->plt_wake_cfg;
if (cfg->irq_bt >= 0) { if (cfg->irq_bt >= 0) {
pr_info("%s: wake by bt", __func__); pr_info("%s: wake by bt", __func__);
...@@ -68,6 +70,9 @@ static irqreturn_t btmrvl_wake_irq_bt(int irq, void *priv) ...@@ -68,6 +70,9 @@ static irqreturn_t btmrvl_wake_irq_bt(int irq, void *priv)
disable_irq_nosync(irq); disable_irq_nosync(irq);
} }
pm_wakeup_event(&card->func->dev, 0);
pm_system_wakeup();
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -101,7 +106,7 @@ static int btmrvl_sdio_probe_of(struct device *dev, ...@@ -101,7 +106,7 @@ static int btmrvl_sdio_probe_of(struct device *dev,
} else { } else {
ret = devm_request_irq(dev, cfg->irq_bt, ret = devm_request_irq(dev, cfg->irq_bt,
btmrvl_wake_irq_bt, btmrvl_wake_irq_bt,
0, "bt_wake", cfg); 0, "bt_wake", card);
if (ret) { if (ret) {
dev_err(dev, dev_err(dev,
"Failed to request irq_bt %d (%d)\n", "Failed to request irq_bt %d (%d)\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment