From beff299a4abfbc8fdc85316848d43794b056e63c Mon Sep 17 00:00:00 2001 From: Ksawlii Date: Sun, 24 Nov 2024 00:22:53 +0100 Subject: [PATCH] Revert "irqchip/gic-v3-its: Fix VSYNC referencing an unmapped VPE on GIC v4.1" This reverts commit c25cfe7ca9c1a3858be67aecdc4618d62f7e52ea. --- drivers/irqchip/irq-gic-v3-its.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index fdc998d58..6788e38f8 100755 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -779,7 +779,6 @@ static struct its_vpe *its_build_vmapp_cmd(struct its_node *its, struct its_cmd_block *cmd, struct its_cmd_desc *desc) { - struct its_vpe *vpe = valid_vpe(its, desc->its_vmapp_cmd.vpe); unsigned long vpt_addr, vconf_addr; u64 target; bool alloc; @@ -792,11 +791,6 @@ static struct its_vpe *its_build_vmapp_cmd(struct its_node *its, if (is_v4_1(its)) { alloc = !atomic_dec_return(&desc->its_vmapp_cmd.vpe->vmapp_count); its_encode_alloc(cmd, alloc); - /* - * Unmapping a VPE is self-synchronizing on GICv4.1, - * no need to issue a VSYNC. - */ - vpe = NULL; } goto out; @@ -826,7 +820,7 @@ static struct its_vpe *its_build_vmapp_cmd(struct its_node *its, out: its_fixup_cmd(cmd); - return vpe; + return valid_vpe(its, desc->its_vmapp_cmd.vpe); } static struct its_vpe *its_build_vmapti_cmd(struct its_node *its,