Commit 1980105e authored by Maxim Levitsky's avatar Maxim Levitsky Committed by Joerg Roedel
Browse files

iommu/amd: X2apic mode: mask/unmask interrupts on suspend/resume 



Use IRQCHIP_MASK_ON_SUSPEND to make the core irq code to
mask the iommu interrupt on suspend and unmask it on the resume.

Since now the unmask function updates the INTX settings,
that will restore them on resume from s3/s4.

Since IRQCHIP_MASK_ON_SUSPEND is only effective for interrupts
which are not wakeup sources, remove IRQCHIP_SKIP_SET_WAKE flag
and instead implement a dummy .irq_set_wake which doesn't allow
the interrupt to become a wakeup source.

Fixes: 66929812 ("iommu/amd: Add support for X2APIC IOMMU interrupts")

Signed-off-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Link: https://lore.kernel.org/r/20211123161038.48009-5-mlevitsk@redhat.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 4691f79d

drivers/iommu/amd/init.c

+7 −1
Original line number Diff line number Diff line
@@ -2104,6 +2104,11 @@ static int intcapxt_set_affinity(struct irq_data *irqd, 
	return 0;

}



static int intcapxt_set_wake(struct irq_data *irqd, unsigned int on)

{

	return on ? -EOPNOTSUPP : 0;

}



static struct irq_chip intcapxt_controller = {

	.name			= "IOMMU-MSI",

	.irq_unmask		= intcapxt_unmask_irq,
@@ -2111,7 +2116,8 @@ static struct irq_chip intcapxt_controller = { 
	.irq_ack		= irq_chip_ack_parent,

	.irq_retrigger		= irq_chip_retrigger_hierarchy,

	.irq_set_affinity       = intcapxt_set_affinity,

	.flags			= IRQCHIP_SKIP_SET_WAKE,

	.irq_set_wake		= intcapxt_set_wake,

	.flags			= IRQCHIP_MASK_ON_SUSPEND,

};



static const struct irq_domain_ops intcapxt_domain_ops = {