diff options
| author | Zenghui Yu <yuzenghui@huawei.com> | 2020-06-05 07:23:45 +0200 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-06-21 16:13:11 +0200 |
| commit | 31dbb6b1d025506b3b8b8b74e9b697df47b9f696 (patch) | |
| tree | 671fe65d9fb684d300d3f44324e9a6b67c65ffa0 | |
| parent | irqchip/loongson-pci-msi: Fix a typo in Kconfig (diff) | |
| download | linux-31dbb6b1d025506b3b8b8b74e9b697df47b9f696.tar.xz linux-31dbb6b1d025506b3b8b8b74e9b697df47b9f696.zip | |
irqchip/gic-v4.1: Use readx_poll_timeout_atomic() to fix sleep in atomic
readx_poll_timeout() can sleep if @sleep_us is specified by the caller,
and is therefore unsafe to be used inside the atomic context, which is
this case when we use it to poll the GICR_VPENDBASER.Dirty bit in
irq_set_vcpu_affinity() callback.
Let's convert to its atomic version instead which helps to get the v4.1
board back to life!
Fixes: 96806229ca03 ("irqchip/gic-v4.1: Add support for VPENDBASER's Dirty+Valid signaling")
Signed-off-by: Zenghui Yu <yuzenghui@huawei.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200605052345.1494-1-yuzenghui@huawei.com
| -rw-r--r-- | drivers/irqchip/irq-gic-v3-its.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index cd685f521c77..6a5a87fc4601 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -3797,10 +3797,10 @@ static void its_wait_vpt_parse_complete(void) if (!gic_rdists->has_vpend_valid_dirty) return; - WARN_ON_ONCE(readq_relaxed_poll_timeout(vlpi_base + GICR_VPENDBASER, - val, - !(val & GICR_VPENDBASER_Dirty), - 10, 500)); + WARN_ON_ONCE(readq_relaxed_poll_timeout_atomic(vlpi_base + GICR_VPENDBASER, + val, + !(val & GICR_VPENDBASER_Dirty), + 10, 500)); } static void its_vpe_schedule(struct its_vpe *vpe) |