Commit 11277aab authored by Dou Liyang's avatar Dou Liyang Committed by Ingo Molnar
Browse files

x86/apic: Simplify enable_IR_x2apic(), remove try_to_enable_IR() 



The following commit:

  2e63ad4b ("x86/apic: Do not init irq remapping if ioapic is disabled")

... added a check for skipped IO-APIC setup to enable_IR_x2apic(), but this
check is also duplicated in try_to_enable_IR() - and it will never succeed in
calling irq_remapping_enable().

Remove the whole irq_remapping_enable() complication: if the IO-APIC is
disabled we cannot enable IRQ remapping.

Signed-off-by: default avatarDou Liyang <douly.fnst@cn.fujitsu.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: bp@alien8.de
Cc: nicstange@gmail.com
Cc: wanpeng.li@hotmail.com
Link: http://lkml.kernel.org/r/1487841401-1543-1-git-send-email-douly.fnst@cn.fujitsu.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent bb3f0a52

arch/x86/kernel/apic/apic.c

+4 −13
Original line number Original line Diff line number Diff line
@@ -1610,24 +1610,15 @@ static inline void try_to_enable_x2apic(int remap_mode) { } 
static inline void __x2apic_enable(void) { }

static inline void __x2apic_enable(void) { }

#endif /* !CONFIG_X86_X2APIC */

#endif /* !CONFIG_X86_X2APIC */





static int __init try_to_enable_IR(void)

{

#ifdef CONFIG_X86_IO_APIC

	if (!x2apic_enabled() && skip_ioapic_setup) {

		pr_info("Not enabling interrupt remapping due to skipped IO-APIC setup\n");

		return -1;

	}

#endif

	return irq_remapping_enable();

}



void __init enable_IR_x2apic(void)

void __init enable_IR_x2apic(void)

{

{

	unsigned long flags;

	unsigned long flags;

	int ret, ir_stat;

	int ret, ir_stat;





	if (skip_ioapic_setup)

	if (skip_ioapic_setup) {

		pr_info("Not enabling interrupt remapping due to skipped IO-APIC setup\n");

		return;

		return;

	}





	ir_stat = irq_remapping_prepare();

	ir_stat = irq_remapping_prepare();

	if (ir_stat < 0 && !x2apic_supported())

	if (ir_stat < 0 && !x2apic_supported())
@@ -1645,7 +1636,7 @@ void __init enable_IR_x2apic(void) 




	/* If irq_remapping_prepare() succeeded, try to enable it */

	/* If irq_remapping_prepare() succeeded, try to enable it */

	if (ir_stat >= 0)

	if (ir_stat >= 0)

		ir_stat = try_to_enable_IR();

		ir_stat = irq_remapping_enable();

	/* ir_stat contains the remap mode or an error code */

	/* ir_stat contains the remap mode or an error code */

	try_to_enable_x2apic(ir_stat);

	try_to_enable_x2apic(ir_stat);

CRA Git | Maintained and supported by SUSTech CRA and CCSE