Skip to content
This repository was archived by the owner on Oct 30, 2021. It is now read-only.

Commit 7dd0051

Browse files
krzkgregkh
authored andcommitted
i2c: imx: Fix external abort on interrupt in exit paths
commit e50e4f0b85be308a01b830c5fbdffc657e1a6dd0 upstream If interrupt comes late, during probe error path or device remove (could be triggered with CONFIG_DEBUG_SHIRQ), the interrupt handler i2c_imx_isr() will access registers with the clock being disabled. This leads to external abort on non-linefetch on Toradex Colibri VF50 module (with Vybrid VF5xx): Unhandled fault: external abort on non-linefetch (0x1008) at 0x8882d003 Internal error: : 1008 [#1] ARM Modules linked in: CPU: 0 PID: 1 Comm: swapper Not tainted 5.7.0 #607 Hardware name: Freescale Vybrid VF5xx/VF6xx (Device Tree) (i2c_imx_isr) from [<8017009c>] (free_irq+0x25c/0x3b0) (free_irq) from [<805844ec>] (release_nodes+0x178/0x284) (release_nodes) from [<80580030>] (really_probe+0x10c/0x348) (really_probe) from [<80580380>] (driver_probe_device+0x60/0x170) (driver_probe_device) from [<80580630>] (device_driver_attach+0x58/0x60) (device_driver_attach) from [<805806bc>] (__driver_attach+0x84/0xc0) (__driver_attach) from [<8057e228>] (bus_for_each_dev+0x68/0xb4) (bus_for_each_dev) from [<8057f3ec>] (bus_add_driver+0x144/0x1ec) (bus_add_driver) from [<80581320>] (driver_register+0x78/0x110) (driver_register) from [<8010213c>] (do_one_initcall+0xa8/0x2f4) (do_one_initcall) from [<80c0100c>] (kernel_init_freeable+0x178/0x1dc) (kernel_init_freeable) from [<80807048>] (kernel_init+0x8/0x110) (kernel_init) from [<80100114>] (ret_from_fork+0x14/0x20) Additionally, the i2c_imx_isr() could wake up the wait queue (imx_i2c_struct->queue) before its initialization happens. The resource-managed framework should not be used for interrupt handling, because the resource will be released too late - after disabling clocks. The interrupt handler is not prepared for such case. Fixes: 1c4b6c3 ("i2c: imx: implement bus recovery") Cc: <stable@vger.kernel.org> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Acked-by: Oleksij Rempel <o.rempel@pengutronix.de> Signed-off-by: Wolfram Sang <wsa@kernel.org> Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 9d63ef7 commit 7dd0051

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

drivers/i2c/busses/i2c-imx.c

+13-11
Original file line numberDiff line numberDiff line change
@@ -1111,14 +1111,6 @@ static int i2c_imx_probe(struct platform_device *pdev)
11111111
return ret;
11121112
}
11131113

1114-
/* Request IRQ */
1115-
ret = devm_request_irq(&pdev->dev, irq, i2c_imx_isr, IRQF_SHARED,
1116-
pdev->name, i2c_imx);
1117-
if (ret) {
1118-
dev_err(&pdev->dev, "can't claim irq %d\n", irq);
1119-
goto clk_disable;
1120-
}
1121-
11221114
/* Init queue */
11231115
init_waitqueue_head(&i2c_imx->queue);
11241116

@@ -1137,6 +1129,14 @@ static int i2c_imx_probe(struct platform_device *pdev)
11371129
if (ret < 0)
11381130
goto rpm_disable;
11391131

1132+
/* Request IRQ */
1133+
ret = request_threaded_irq(irq, i2c_imx_isr, NULL, IRQF_SHARED,
1134+
pdev->name, i2c_imx);
1135+
if (ret) {
1136+
dev_err(&pdev->dev, "can't claim irq %d\n", irq);
1137+
goto rpm_disable;
1138+
}
1139+
11401140
/* Set up clock divider */
11411141
i2c_imx->bitrate = IMX_I2C_BIT_RATE;
11421142
ret = of_property_read_u32(pdev->dev.of_node,
@@ -1179,21 +1179,20 @@ static int i2c_imx_probe(struct platform_device *pdev)
11791179

11801180
clk_notifier_unregister:
11811181
clk_notifier_unregister(i2c_imx->clk, &i2c_imx->clk_change_nb);
1182+
free_irq(irq, i2c_imx);
11821183
rpm_disable:
11831184
pm_runtime_put_noidle(&pdev->dev);
11841185
pm_runtime_disable(&pdev->dev);
11851186
pm_runtime_set_suspended(&pdev->dev);
11861187
pm_runtime_dont_use_autosuspend(&pdev->dev);
1187-
1188-
clk_disable:
11891188
clk_disable_unprepare(i2c_imx->clk);
11901189
return ret;
11911190
}
11921191

11931192
static int i2c_imx_remove(struct platform_device *pdev)
11941193
{
11951194
struct imx_i2c_struct *i2c_imx = platform_get_drvdata(pdev);
1196-
int ret;
1195+
int irq, ret;
11971196

11981197
ret = pm_runtime_get_sync(&pdev->dev);
11991198
if (ret < 0)
@@ -1213,6 +1212,9 @@ static int i2c_imx_remove(struct platform_device *pdev)
12131212
imx_i2c_write_reg(0, i2c_imx, IMX_I2C_I2SR);
12141213

12151214
clk_notifier_unregister(i2c_imx->clk, &i2c_imx->clk_change_nb);
1215+
irq = platform_get_irq(pdev, 0);
1216+
if (irq >= 0)
1217+
free_irq(irq, i2c_imx);
12161218
clk_disable_unprepare(i2c_imx->clk);
12171219

12181220
pm_runtime_put_noidle(&pdev->dev);

0 commit comments

Comments
 (0)