Skip to content

Commit 21edbbf

Browse files
hoshinolinajannau
authored andcommitted
iommu: apple-dart: Power on device when handling IRQs
It's possible for an IRQ to fire and the device to be RPM suspended before we can handle it, which then causes device register accesses to fail in the IRQ handler. Since RPM is IRQ-safe for this device, just make sure we power on the DART in the IRQ handler too. Signed-off-by: Asahi Lina <lina@asahilina.net>
1 parent 29a4e55 commit 21edbbf

1 file changed

Lines changed: 12 additions & 1 deletion

File tree

drivers/iommu/apple-dart.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1228,6 +1228,17 @@ static irqreturn_t apple_dart_t8110_irq(int irq, void *dev)
12281228
return IRQ_HANDLED;
12291229
}
12301230

1231+
static irqreturn_t apple_dart_irq(int irq, void *dev)
1232+
{
1233+
irqreturn_t ret;
1234+
struct apple_dart *dart = dev;
1235+
1236+
WARN_ON(pm_runtime_get_sync(dart->dev) < 0);
1237+
ret = dart->hw->irq_handler(irq, dev);
1238+
pm_runtime_put(dart->dev);
1239+
return ret;
1240+
}
1241+
12311242
static bool apple_dart_is_locked(struct apple_dart *dart)
12321243
{
12331244
return !!(readl(dart->regs + dart->hw->lock) & dart->hw->lock_bit);
@@ -1307,7 +1318,7 @@ static int apple_dart_probe(struct platform_device *pdev)
13071318
goto err_clk_disable;
13081319
}
13091320

1310-
ret = request_irq(dart->irq, dart->hw->irq_handler, IRQF_SHARED,
1321+
ret = request_irq(dart->irq, apple_dart_irq, IRQF_SHARED,
13111322
"apple-dart fault handler", dart);
13121323
if (ret)
13131324
goto err_clk_disable;

0 commit comments

Comments
 (0)