Commit 670c04ad authored by Dave Hansen's avatar Dave Hansen
Browse files

x86/apic: Nuke ack_APIC_irq() 



Yet another wrapper of a wrapper gone along with the outdated comment
that this compiles to a single instruction.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Reviewed-by: default avatarWei Liu <wei.liu@kernel.org>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: default avatarMichael Kelley <mikelley@microsoft.com>
Tested-by: default avatarSohil Mehta <sohil.mehta@intel.com>
Tested-by: Juergen Gross <jgross@suse.com> # Xen PV (dom0 and unpriv. guest)
parent 185c8f33

arch/x86/hyperv/hv_init.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static inline bool hv_reenlightenment_available(void) 


DEFINE_IDTENTRY_SYSVEC(sysvec_hyperv_reenlightenment)

{

	ack_APIC_irq();

	apic_eoi();

	inc_irq_stat(irq_hv_reenlightenment_count);

	schedule_delayed_work(&hv_reenlightenment_work, HZ/10);

}

arch/x86/include/asm/apic.h

+0 −10
Original line number Diff line number Diff line
@@ -402,16 +402,6 @@ static inline void apic_set_eoi_cb(void (*eoi)(void)) {} 


extern void apic_ack_irq(struct irq_data *data);



static inline void ack_APIC_irq(void)

{

	/*

	 * ack_APIC_irq() actually gets compiled as a single instruction

	 * ... yummie.

	 */

	apic_eoi();

}





static inline bool lapic_vector_set_in_irr(unsigned int vector)

{

	u32 irr = apic_read(APIC_IRR + (vector / 32 * 0x10));

arch/x86/kernel/apic/apic.c

+5 −5
Original line number Diff line number Diff line
@@ -1076,7 +1076,7 @@ DEFINE_IDTENTRY_SYSVEC(sysvec_apic_timer_interrupt) 
{

	struct pt_regs *old_regs = set_irq_regs(regs);



	ack_APIC_irq();

	apic_eoi();

	trace_local_timer_entry(LOCAL_TIMER_VECTOR);

	local_apic_timer_interrupt();

	trace_local_timer_exit(LOCAL_TIMER_VECTOR);
@@ -1480,7 +1480,7 @@ static bool apic_check_and_ack(union apic_ir *irr, union apic_ir *isr) 
		 * per set bit.

		 */

		for_each_set_bit(bit, isr->map, APIC_IR_BITS)

			ack_APIC_irq();

			apic_eoi();

		return true;

	}
@@ -1492,7 +1492,7 @@ static bool apic_check_and_ack(union apic_ir *irr, union apic_ir *isr) 
 * interrupt from previous kernel might still have ISR bit set.

 *

 * Most probably by now the CPU has serviced that pending interrupt and it

 * might not have done the ack_APIC_irq() because it thought, interrupt

 * might not have done the apic_eoi() because it thought, interrupt

 * came from i8259 as ExtInt. LAPIC did not get EOI so it does not clear

 * the ISR bit and cpu thinks it has already serviced the interrupt. Hence

 * a vector might get locked. It was noticed for timer irq (vector
@@ -2147,7 +2147,7 @@ static noinline void handle_spurious_interrupt(u8 vector) 
	if (v & (1 << (vector & 0x1f))) {

		pr_info("Spurious interrupt (vector 0x%02x) on CPU#%d. Acked\n",

			vector, smp_processor_id());

		ack_APIC_irq();

		apic_eoi();

	} else {

		pr_info("Spurious interrupt (vector 0x%02x) on CPU#%d. Not pending!\n",

			vector, smp_processor_id());
@@ -2198,7 +2198,7 @@ DEFINE_IDTENTRY_SYSVEC(sysvec_error_interrupt) 
	if (lapic_get_maxlvt() > 3)	/* Due to the Pentium erratum 3AP. */

		apic_write(APIC_ESR, 0);

	v = apic_read(APIC_ESR);

	ack_APIC_irq();

	apic_eoi();

	atomic_inc(&irq_err_count);



	apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",

arch/x86/kernel/apic/io_apic.c

+2 −2
Original line number Diff line number Diff line
@@ -1823,7 +1823,7 @@ static void ioapic_ack_level(struct irq_data *irq_data) 
	 * We must acknowledge the irq before we move it or the acknowledge will

	 * not propagate properly.

	 */

	ack_APIC_irq();

	apic_eoi();



	/*

	 * Tail end of clearing remote IRR bit (either by delivering the EOI
@@ -2046,7 +2046,7 @@ static void unmask_lapic_irq(struct irq_data *data) 


static void ack_lapic_irq(struct irq_data *data)

{

	ack_APIC_irq();

	apic_eoi();

}



static struct irq_chip lapic_chip __read_mostly = {

arch/x86/kernel/apic/vector.c

+1 −1
Original line number Diff line number Diff line
@@ -907,7 +907,7 @@ static int apic_retrigger_irq(struct irq_data *irqd) 
void apic_ack_irq(struct irq_data *irqd)

{

	irq_move_irq(irqd);

	ack_APIC_irq();

	apic_eoi();

}



void apic_ack_edge(struct irq_data *irqd)