Skip to content

Commit 19a72e0

Browse files
Robin GongShawn Guo
authored andcommitted
firmware: imx: scu-irq: fix RCU complaint after M4 partition reset
Use blocking_notifier_chain instead of atomic_notifier_chain, otherwise there will be RCU complaint, because unregister/register_virtio_device() will issue mbox message. mbox_send_message() is blocking again after received M4 partition reset. Actually, no need atomic notifier for scu irq notification since this notifier is called in worker instead of interrupt handler. [ 389.706645] i2c-rpmsg virtio0.rpmsg-i2c-channel.-1.2: i2c rpmsg driver is removed [ 389.767362] Wait for remote ready timeout, use first_notify. [ 389.774084] ------------[ cut here ]------------ [ 389.778729] WARNING: CPU: 0 PID: 397 at kernel/rcu/tree_plugin.h:293 rcu_note_context_switch+0x34/0x338 [ 389.788131] Modules linked in: [ 389.791195] CPU: 0 PID: 397 Comm: kworker/0:13 Not tainted 5.4.0-rc5-02977-g08f78722f07b #26 [ 389.799633] Hardware name: Freescale i.MX8DXL MEK (DT) [ 389.805481] Workqueue: events imx_scu_irq_work_handler Signed-off-by: Robin Gong <[email protected]> Reviewed-by: Dong Aisheng <[email protected]> Signed-off-by: Peng Fan <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
1 parent 8314aa8 commit 19a72e0

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/firmware/imx/imx-scu-irq.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,25 @@ struct imx_sc_msg_irq_enable {
4242

4343
static struct imx_sc_ipc *imx_sc_irq_ipc_handle;
4444
static struct work_struct imx_sc_irq_work;
45-
static ATOMIC_NOTIFIER_HEAD(imx_scu_irq_notifier_chain);
45+
static BLOCKING_NOTIFIER_HEAD(imx_scu_irq_notifier_chain);
4646

4747
int imx_scu_irq_register_notifier(struct notifier_block *nb)
4848
{
49-
return atomic_notifier_chain_register(
49+
return blocking_notifier_chain_register(
5050
&imx_scu_irq_notifier_chain, nb);
5151
}
5252
EXPORT_SYMBOL(imx_scu_irq_register_notifier);
5353

5454
int imx_scu_irq_unregister_notifier(struct notifier_block *nb)
5555
{
56-
return atomic_notifier_chain_unregister(
56+
return blocking_notifier_chain_unregister(
5757
&imx_scu_irq_notifier_chain, nb);
5858
}
5959
EXPORT_SYMBOL(imx_scu_irq_unregister_notifier);
6060

6161
static int imx_scu_irq_notifier_call_chain(unsigned long status, u8 *group)
6262
{
63-
return atomic_notifier_call_chain(&imx_scu_irq_notifier_chain,
63+
return blocking_notifier_call_chain(&imx_scu_irq_notifier_chain,
6464
status, (void *)group);
6565
}
6666

0 commit comments

Comments
 (0)