Commit eeff214d authored by Tetsuo Handa's avatar Tetsuo Handa Committed by Kalle Valo

wfx: avoid flush_workqueue(system_highpri_wq) usage

Flushing system-wide workqueues is dangerous and will be forbidden.
Replace system_highpri_wq with per "struct wfx_dev" bh_wq.
Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Acked-by: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/f15574a6-aba4-72bc-73af-26fdcdf9fb63@I-love.SAKURA.ne.jp
parent f43f0cd2
...@@ -267,7 +267,7 @@ void wfx_bh_request_rx(struct wfx_dev *wdev) ...@@ -267,7 +267,7 @@ void wfx_bh_request_rx(struct wfx_dev *wdev)
wfx_control_reg_read(wdev, &cur); wfx_control_reg_read(wdev, &cur);
prev = atomic_xchg(&wdev->hif.ctrl_reg, cur); prev = atomic_xchg(&wdev->hif.ctrl_reg, cur);
complete(&wdev->hif.ctrl_ready); complete(&wdev->hif.ctrl_ready);
queue_work(system_highpri_wq, &wdev->hif.bh); queue_work(wdev->bh_wq, &wdev->hif.bh);
if (!(cur & CTRL_NEXT_LEN_MASK)) if (!(cur & CTRL_NEXT_LEN_MASK))
dev_err(wdev->dev, "unexpected control register value: length field is 0: %04x\n", dev_err(wdev->dev, "unexpected control register value: length field is 0: %04x\n",
...@@ -280,7 +280,7 @@ void wfx_bh_request_rx(struct wfx_dev *wdev) ...@@ -280,7 +280,7 @@ void wfx_bh_request_rx(struct wfx_dev *wdev)
/* Driver want to send data */ /* Driver want to send data */
void wfx_bh_request_tx(struct wfx_dev *wdev) void wfx_bh_request_tx(struct wfx_dev *wdev)
{ {
queue_work(system_highpri_wq, &wdev->hif.bh); queue_work(wdev->bh_wq, &wdev->hif.bh);
} }
/* If IRQ is not available, this function allow to manually poll the control register and simulate /* If IRQ is not available, this function allow to manually poll the control register and simulate
...@@ -295,7 +295,7 @@ void wfx_bh_poll_irq(struct wfx_dev *wdev) ...@@ -295,7 +295,7 @@ void wfx_bh_poll_irq(struct wfx_dev *wdev)
u32 reg; u32 reg;
WARN(!wdev->poll_irq, "unexpected IRQ polling can mask IRQ"); WARN(!wdev->poll_irq, "unexpected IRQ polling can mask IRQ");
flush_workqueue(system_highpri_wq); flush_workqueue(wdev->bh_wq);
start = ktime_get(); start = ktime_get();
for (;;) { for (;;) {
wfx_control_reg_read(wdev, &reg); wfx_control_reg_read(wdev, &reg);
......
...@@ -73,7 +73,7 @@ int wfx_cmd_send(struct wfx_dev *wdev, struct wfx_hif_msg *request, ...@@ -73,7 +73,7 @@ int wfx_cmd_send(struct wfx_dev *wdev, struct wfx_hif_msg *request,
if (no_reply) { if (no_reply) {
/* Chip won't reply. Ensure the wq has send the buffer before to continue. */ /* Chip won't reply. Ensure the wq has send the buffer before to continue. */
flush_workqueue(system_highpri_wq); flush_workqueue(wdev->bh_wq);
ret = 0; ret = 0;
goto end; goto end;
} }
......
...@@ -345,6 +345,10 @@ int wfx_probe(struct wfx_dev *wdev) ...@@ -345,6 +345,10 @@ int wfx_probe(struct wfx_dev *wdev)
wdev->pdata.gpio_wakeup = NULL; wdev->pdata.gpio_wakeup = NULL;
wdev->poll_irq = true; wdev->poll_irq = true;
wdev->bh_wq = alloc_workqueue("wfx_bh_wq", WQ_HIGHPRI, 0);
if (!wdev->bh_wq)
return -ENOMEM;
wfx_bh_register(wdev); wfx_bh_register(wdev);
err = wfx_init_device(wdev); err = wfx_init_device(wdev);
...@@ -458,6 +462,7 @@ int wfx_probe(struct wfx_dev *wdev) ...@@ -458,6 +462,7 @@ int wfx_probe(struct wfx_dev *wdev)
wdev->hwbus_ops->irq_unsubscribe(wdev->hwbus_priv); wdev->hwbus_ops->irq_unsubscribe(wdev->hwbus_priv);
bh_unregister: bh_unregister:
wfx_bh_unregister(wdev); wfx_bh_unregister(wdev);
destroy_workqueue(wdev->bh_wq);
return err; return err;
} }
...@@ -467,6 +472,7 @@ void wfx_release(struct wfx_dev *wdev) ...@@ -467,6 +472,7 @@ void wfx_release(struct wfx_dev *wdev)
wfx_hif_shutdown(wdev); wfx_hif_shutdown(wdev);
wdev->hwbus_ops->irq_unsubscribe(wdev->hwbus_priv); wdev->hwbus_ops->irq_unsubscribe(wdev->hwbus_priv);
wfx_bh_unregister(wdev); wfx_bh_unregister(wdev);
destroy_workqueue(wdev->bh_wq);
} }
static int __init wfx_core_init(void) static int __init wfx_core_init(void)
......
...@@ -57,6 +57,7 @@ struct wfx_dev { ...@@ -57,6 +57,7 @@ struct wfx_dev {
struct mutex rx_stats_lock; struct mutex rx_stats_lock;
struct wfx_hif_tx_power_loop_info tx_power_loop_info; struct wfx_hif_tx_power_loop_info tx_power_loop_info;
struct mutex tx_power_loop_info_lock; struct mutex tx_power_loop_info_lock;
struct workqueue_struct *bh_wq;
}; };
struct wfx_vif { struct wfx_vif {
......
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