Commit 4f1c3f7b authored by Cédric Le Goater's avatar Cédric Le Goater Committed by Michael Ellerman
Browse files

powerpc/xive: Rename XIVE_IRQ_NO_EOI to show its a flag 



This is a simple cleanup to identify easily all flags of the XIVE
interrupt structure. The interrupts flagged with XIVE_IRQ_FLAG_NO_EOI
are the escalations used to wake up vCPUs in KVM. They are handled
very differently from the rest.

Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20201210171450.1933725-3-clg@kaod.org
parent 98983675

arch/powerpc/include/asm/xive.h

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ struct xive_irq_data { 
#define XIVE_IRQ_FLAG_H_INT_ESB	0x20



/* Special flag set by KVM for excalation interrupts */

#define XIVE_IRQ_NO_EOI		0x80

#define XIVE_IRQ_FLAG_NO_EOI	0x80



#define XIVE_INVALID_CHIP_ID	-1

arch/powerpc/kvm/book3s_xive.c

+2 −2
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ int kvmppc_xive_attach_escalation(struct kvm_vcpu *vcpu, u8 prio, 
	/* In single escalation mode, we grab the ESB MMIO of the

	 * interrupt and mask it. Also populate the VCPU v/raddr

	 * of the ESB page for use by asm entry/exit code. Finally

	 * set the XIVE_IRQ_NO_EOI flag which will prevent the

	 * set the XIVE_IRQ_FLAG_NO_EOI flag which will prevent the

	 * core code from performing an EOI on the escalation

	 * interrupt, thus leaving it effectively masked after

	 * it fires once.
@@ -231,7 +231,7 @@ int kvmppc_xive_attach_escalation(struct kvm_vcpu *vcpu, u8 prio, 
		xive_vm_esb_load(xd, XIVE_ESB_SET_PQ_01);

		vcpu->arch.xive_esc_raddr = xd->eoi_page;

		vcpu->arch.xive_esc_vaddr = (__force u64)xd->eoi_mmio;

		xd->flags |= XIVE_IRQ_NO_EOI;

		xd->flags |= XIVE_IRQ_FLAG_NO_EOI;

	}



	return 0;

arch/powerpc/sysdev/xive/common.c

+1 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ static void xive_irq_eoi(struct irq_data *d) 
	 * been passed-through to a KVM guest

	 */

	if (!irqd_irq_disabled(d) && !irqd_is_forwarded_to_vcpu(d) &&

	    !(xd->flags & XIVE_IRQ_NO_EOI))

	    !(xd->flags & XIVE_IRQ_FLAG_NO_EOI))

		xive_do_source_eoi(irqd_to_hwirq(d), xd);

	else

		xd->stale_p = true;

CRA Git | Maintained and supported by SUSTech CRA and CCSE