Skip to content

Commit de5a7da

Browse files
dtorgregkh
authored andcommitted
i2c: core: Disable client irq on reboot/shutdown
[ Upstream commit b64210f2f7c11c757432ba3701d88241b2b98fb1 ] If an i2c client receives an interrupt during reboot or shutdown it may be too late to service it by making an i2c transaction on the bus because the i2c controller has already been shutdown. This can lead to system hangs if the i2c controller tries to make a transfer that is doomed to fail because the access to the i2c pins is already shut down, or an iommu translation has been torn down so i2c controller register access doesn't work. Let's simply disable the irq if there isn't a shutdown callback for an i2c client when there is an irq associated with the device. This will make sure that irqs don't come in later than the time that we can handle it. We don't do this if the i2c client device already has a shutdown callback because presumably they're doing the right thing and quieting the device so irqs don't come in after the shutdown callback returns. Reported-by: kernel test robot <lkp@intel.com> [swboyd@chromium.org: Dropped newline, added commit text, added interrupt.h for robot build error] Signed-off-by: Stephen Boyd <swboyd@chromium.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Wolfram Sang <wsa@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 524449a commit de5a7da

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

drivers/i2c/i2c-core-base.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include <linux/i2c.h>
3232
#include <linux/idr.h>
3333
#include <linux/init.h>
34+
#include <linux/interrupt.h>
3435
#include <linux/irqflags.h>
3536
#include <linux/jump_label.h>
3637
#include <linux/kernel.h>
@@ -452,6 +453,8 @@ static void i2c_device_shutdown(struct device *dev)
452453
driver = to_i2c_driver(dev->driver);
453454
if (driver->shutdown)
454455
driver->shutdown(client);
456+
else if (client->irq > 0)
457+
disable_irq(client->irq);
455458
}
456459

457460
static void i2c_client_dev_release(struct device *dev)

0 commit comments

Comments
 (0)