* [PATCH v2 1/3] btmrvl: avoid double-disable_irq() race
@ 2017-01-23 4:18 Jeffy Chen
2017-01-23 4:18 ` [PATCH v2 2/3] btmrvl: set irq_bt to -1 when failed to parse it Jeffy Chen
2017-01-23 4:18 ` [PATCH v2 3/3] btmrvl: use dt's irqflags for wakeup pin Jeffy Chen
0 siblings, 2 replies; 4+ messages in thread
From: Jeffy Chen @ 2017-01-23 4:18 UTC (permalink / raw)
To: linux-bluetooth
Cc: Amitkumar Karwar, Marcel Holtmann, Brian Norris, Jeffy Chen,
Johan Hedberg, Gustavo Padovan, linux-kernel
It's much the same as what we did for mwifiex in:
b9da4d2 mwifiex: avoid double-disable_irq() race
"We have a race where the wakeup IRQ might be in flight while we're
calling mwifiex_disable_wake() from resume(). This can leave us
disabling the IRQ twice.
Let's disable the IRQ and enable it in case if we have double-disabled
it."
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Reviewed-by: Brian Norris <briannorris@chromium.org>
---
Changes in v2:
Update commit message.
drivers/bluetooth/btmrvl_sdio.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index d02f2c1..c738bae 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -1682,8 +1682,12 @@ static int btmrvl_sdio_resume(struct device *dev)
/* Disable platform specific wakeup interrupt */
if (card->plt_wake_cfg && card->plt_wake_cfg->irq_bt >= 0) {
disable_irq_wake(card->plt_wake_cfg->irq_bt);
- if (!card->plt_wake_cfg->wake_by_bt)
- disable_irq(card->plt_wake_cfg->irq_bt);
+ disable_irq(card->plt_wake_cfg->irq_bt);
+ if (card->plt_wake_cfg->wake_by_bt)
+ /* Undo our disable, since interrupt handler already
+ * did this.
+ */
+ enable_irq(card->plt_wake_cfg->irq_bt);
}
return 0;
--
2.1.4
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH v2 2/3] btmrvl: set irq_bt to -1 when failed to parse it
2017-01-23 4:18 [PATCH v2 1/3] btmrvl: avoid double-disable_irq() race Jeffy Chen
@ 2017-01-23 4:18 ` Jeffy Chen
2017-01-23 4:18 ` [PATCH v2 3/3] btmrvl: use dt's irqflags for wakeup pin Jeffy Chen
1 sibling, 0 replies; 4+ messages in thread
From: Jeffy Chen @ 2017-01-23 4:18 UTC (permalink / raw)
To: linux-bluetooth
Cc: Amitkumar Karwar, Marcel Holtmann, Brian Norris, Jeffy Chen,
Johan Hedberg, Gustavo Padovan, linux-kernel
The irq_of_parse_and_map will return 0 as a invalid irq.
Set irq_bt to -1 in this case, so that the btmrvl resume/suspend code
would not try to enable/disable it.
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Reviewed-by: Brian Norris <briannorris@chromium.org>
---
Changes in v2:
Update commit message.
drivers/bluetooth/btmrvl_sdio.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index c738bae..796f719 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -97,6 +97,7 @@ static int btmrvl_sdio_probe_of(struct device *dev,
cfg->irq_bt = irq_of_parse_and_map(card->plt_of_node, 0);
if (!cfg->irq_bt) {
dev_err(dev, "fail to parse irq_bt from device tree");
+ cfg->irq_bt = -1;
} else {
ret = devm_request_irq(dev, cfg->irq_bt,
btmrvl_wake_irq_bt,
--
2.1.4
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH v2 3/3] btmrvl: use dt's irqflags for wakeup pin
2017-01-23 4:18 [PATCH v2 1/3] btmrvl: avoid double-disable_irq() race Jeffy Chen
2017-01-23 4:18 ` [PATCH v2 2/3] btmrvl: set irq_bt to -1 when failed to parse it Jeffy Chen
@ 2017-01-23 4:18 ` Jeffy Chen
2017-02-16 16:26 ` Marcel Holtmann
1 sibling, 1 reply; 4+ messages in thread
From: Jeffy Chen @ 2017-01-23 4:18 UTC (permalink / raw)
To: linux-bluetooth
Cc: Amitkumar Karwar, Marcel Holtmann, Brian Norris, Jeffy Chen,
Johan Hedberg, Gustavo Padovan, linux-kernel
Use irqflags parsed from dt.
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Reviewed-by: Brian Norris <briannorris@chromium.org>
---
Changes in v2: None
drivers/bluetooth/btmrvl_sdio.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index 796f719..23711fe 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -101,8 +101,7 @@ static int btmrvl_sdio_probe_of(struct device *dev,
} else {
ret = devm_request_irq(dev, cfg->irq_bt,
btmrvl_wake_irq_bt,
- IRQF_TRIGGER_LOW,
- "bt_wake", cfg);
+ 0, "bt_wake", cfg);
if (ret) {
dev_err(dev,
"Failed to request irq_bt %d (%d)\n",
--
2.1.4
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2 3/3] btmrvl: use dt's irqflags for wakeup pin
2017-01-23 4:18 ` [PATCH v2 3/3] btmrvl: use dt's irqflags for wakeup pin Jeffy Chen
@ 2017-02-16 16:26 ` Marcel Holtmann
0 siblings, 0 replies; 4+ messages in thread
From: Marcel Holtmann @ 2017-02-16 16:26 UTC (permalink / raw)
To: Jeffy Chen
Cc: linux-bluetooth, Amitkumar Karwar, Brian Norris, Johan Hedberg,
Gustavo F. Padovan, linux-kernel
Hi Jeffy,
> Use irqflags parsed from dt.
>
> Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
> Reviewed-by: Brian Norris <briannorris@chromium.org>
> ---
>
> Changes in v2: None
>
> drivers/bluetooth/btmrvl_sdio.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
all 3 patches have been applied to bluetooth-next tree.
Regards
Marcel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-02-16 16:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-23 4:18 [PATCH v2 1/3] btmrvl: avoid double-disable_irq() race Jeffy Chen
2017-01-23 4:18 ` [PATCH v2 2/3] btmrvl: set irq_bt to -1 when failed to parse it Jeffy Chen
2017-01-23 4:18 ` [PATCH v2 3/3] btmrvl: use dt's irqflags for wakeup pin Jeffy Chen
2017-02-16 16:26 ` Marcel Holtmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®