Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a2b7d14 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

irq_remapping: Use apic_ack_irq() 



To address the EBUSY fail of interrupt affinity settings in case that the
previous setting has not been cleaned up yet, use the new apic_ack_irq()
function instead of the special ir_ack_apic_edge() implementation which is
merily a wrapper around ack_APIC_irq().

Preparatory change for the real fix

Fixes: dccfe314 ("x86/vector: Simplify vector move cleanup")
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarSong Liu <songliubraving@fb.com>
Cc: Joerg Roedel <jroedel@suse.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Song Liu <liu.song.a23@gmail.com>
Cc: Dmitry Safonov <0x7f454c46@gmail.com>
Cc: stable@vger.kernel.org
Cc: Mike Travis <mike.travis@hpe.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Tariq Toukan <tariqt@mellanox.com>
Link: https://lkml.kernel.org/r/20180604162224.555716895@linutronix.de
parent c0255770

drivers/iommu/amd_iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -4379,7 +4379,7 @@ static void ir_compose_msi_msg(struct irq_data *irq_data, struct msi_msg *msg) 


static struct irq_chip amd_ir_chip = {

	.name			= "AMD-IR",

	.irq_ack		= ir_ack_apic_edge,

	.irq_ack		= apic_ack_irq,

	.irq_set_affinity	= amd_ir_set_affinity,

	.irq_set_vcpu_affinity	= amd_ir_set_vcpu_affinity,

	.irq_compose_msi_msg	= ir_compose_msi_msg,

drivers/iommu/intel_irq_remapping.c

+1 −1
Original line number Diff line number Diff line
@@ -1223,7 +1223,7 @@ static int intel_ir_set_vcpu_affinity(struct irq_data *data, void *info) 


static struct irq_chip intel_ir_chip = {

	.name			= "INTEL-IR",

	.irq_ack		= ir_ack_apic_edge,

	.irq_ack		= apic_ack_irq,

	.irq_set_affinity	= intel_ir_set_affinity,

	.irq_compose_msi_msg	= intel_ir_compose_msi_msg,

	.irq_set_vcpu_affinity	= intel_ir_set_vcpu_affinity,

drivers/iommu/irq_remapping.c

+0 −5
Original line number Diff line number Diff line
@@ -156,11 +156,6 @@ void panic_if_irq_remap(const char *msg) 
		panic(msg);

}



void ir_ack_apic_edge(struct irq_data *data)

{

	ack_APIC_irq();

}



/**

 * irq_remapping_get_ir_irq_domain - Get the irqdomain associated with the IOMMU

 *				     device serving request @info

drivers/iommu/irq_remapping.h

+0 −2
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ struct irq_remap_ops { 
extern struct irq_remap_ops intel_irq_remap_ops;

extern struct irq_remap_ops amd_iommu_irq_ops;



extern void ir_ack_apic_edge(struct irq_data *data);



#else  /* CONFIG_IRQ_REMAP */



#define irq_remapping_enabled 0