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

Commit bb3f0b59 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: make irqinit_32.c more like irqinit_64.c, v2 



Impact: cleanup

1. add smp_intr_init and apic_intr_init for 32bit, the same as 64bit
2. move the apic_intr_init() call before set gate with interrupt[i]
3. for 64bit, if ia32_emulation is not used, will make per_cpu to use 0x80 vector.

[ v2: should use !test_bit() instead of test_bit() with 32bit ]

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3415dd91

arch/x86/kernel/irqinit_32.c

+33 −23
Original line number Original line Diff line number Diff line
@@ -120,28 +120,8 @@ int vector_used_by_percpu_irq(unsigned int vector) 
	return 0;

	return 0;

}

}





/* Overridden in paravirt.c */

static void __init smp_intr_init(void)

void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ")));



void __init native_init_IRQ(void)

{

{

	int i;



	/* all the set up before the call gates are initialised */

	pre_intr_init_hook();



	/*

	 * Cover the whole vector space, no vector can escape

	 * us. (some of these will be overridden and become

	 * 'special' SMP interrupts)

	 */

	for (i =  FIRST_EXTERNAL_VECTOR; i < NR_VECTORS; i++) {

		/* SYSCALL_VECTOR was reserved in trap_init. */

		if (i != SYSCALL_VECTOR)

			set_intr_gate(i, interrupt[i-FIRST_EXTERNAL_VECTOR]);

	}





#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_SMP)

#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_SMP)

	/*

	/*

	 * The reschedule interrupt is a CPU-to-CPU reschedule-helper

	 * The reschedule interrupt is a CPU-to-CPU reschedule-helper
@@ -170,8 +150,13 @@ void __init native_init_IRQ(void) 
	set_intr_gate(IRQ_MOVE_CLEANUP_VECTOR, irq_move_cleanup_interrupt);

	set_intr_gate(IRQ_MOVE_CLEANUP_VECTOR, irq_move_cleanup_interrupt);

	set_bit(IRQ_MOVE_CLEANUP_VECTOR, used_vectors);

	set_bit(IRQ_MOVE_CLEANUP_VECTOR, used_vectors);

#endif

#endif

}





static void __init apic_intr_init(void)

{

#ifdef CONFIG_X86_LOCAL_APIC

#ifdef CONFIG_X86_LOCAL_APIC

	smp_intr_init();



	/* self generated IPI for local APIC timer */

	/* self generated IPI for local APIC timer */

	alloc_intr_gate(LOCAL_TIMER_VECTOR, apic_timer_interrupt);

	alloc_intr_gate(LOCAL_TIMER_VECTOR, apic_timer_interrupt);
@@ -181,12 +166,37 @@ void __init native_init_IRQ(void) 
# ifdef CONFIG_PERF_COUNTERS

# ifdef CONFIG_PERF_COUNTERS

	alloc_intr_gate(LOCAL_PERF_VECTOR, perf_counter_interrupt);

	alloc_intr_gate(LOCAL_PERF_VECTOR, perf_counter_interrupt);

# endif

# endif

#endif





#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_MCE_P4THERMAL)

# ifdef CONFIG_X86_MCE_P4THERMAL

	/* thermal monitor LVT interrupt */

	/* thermal monitor LVT interrupt */

	alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt);

	alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt);

# endif

# endif

#endif

}



/* Overridden in paravirt.c */

void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ")));



void __init native_init_IRQ(void)

{

	int i;



	/* all the set up before the call gates are initialised */

	pre_intr_init_hook();



	apic_intr_init();



	/*

	 * Cover the whole vector space, no vector can escape

	 * us. (some of these will be overridden and become

	 * 'special' SMP interrupts)

	 */

	for (i = 0; i < (NR_VECTORS - FIRST_EXTERNAL_VECTOR); i++) {

		int vector = FIRST_EXTERNAL_VECTOR + i;

		/* SYSCALL_VECTOR was reserved in trap_init. */

		if (!test_bit(vector, used_vectors))

			set_intr_gate(vector, interrupt[i]);

	}





	if (!acpi_ioapic)

	if (!acpi_ioapic)

		setup_irq(2, &irq2);

		setup_irq(2, &irq2);

arch/x86/kernel/irqinit_64.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -162,6 +162,9 @@ void __init native_init_IRQ(void) 
	int i;

	int i;





	init_ISA_irqs();

	init_ISA_irqs();



	apic_intr_init();



	/*

	/*

	 * Cover the whole vector space, no vector can escape

	 * Cover the whole vector space, no vector can escape

	 * us. (some of these will be overridden and become

	 * us. (some of these will be overridden and become
@@ -169,12 +172,10 @@ void __init native_init_IRQ(void) 
	 */

	 */

	for (i = 0; i < (NR_VECTORS - FIRST_EXTERNAL_VECTOR); i++) {

	for (i = 0; i < (NR_VECTORS - FIRST_EXTERNAL_VECTOR); i++) {

		int vector = FIRST_EXTERNAL_VECTOR + i;

		int vector = FIRST_EXTERNAL_VECTOR + i;

		if (vector != IA32_SYSCALL_VECTOR)

		if (!test_bit(vector, used_vectors))

			set_intr_gate(vector, interrupt[i]);

			set_intr_gate(vector, interrupt[i]);

	}

	}





	apic_intr_init();



	if (!acpi_ioapic)

	if (!acpi_ioapic)

		setup_irq(2, &irq2);

		setup_irq(2, &irq2);

}
 
}

arch/x86/kernel/traps.c

+6 −9
Original line number Original line Diff line number Diff line
@@ -979,8 +979,13 @@ void __init trap_init(void) 
#endif

#endif

	set_intr_gate(19, &simd_coprocessor_error);

	set_intr_gate(19, &simd_coprocessor_error);





	/* Reserve all the builtin and the syscall vector: */

	for (i = 0; i < FIRST_EXTERNAL_VECTOR; i++)

		set_bit(i, used_vectors);



#ifdef CONFIG_IA32_EMULATION

#ifdef CONFIG_IA32_EMULATION

	set_system_intr_gate(IA32_SYSCALL_VECTOR, ia32_syscall);

	set_system_intr_gate(IA32_SYSCALL_VECTOR, ia32_syscall);

	set_bit(IA32_SYSCALL_VECTOR, used_vectors);

#endif

#endif





#ifdef CONFIG_X86_32

#ifdef CONFIG_X86_32
@@ -997,17 +1002,9 @@ void __init trap_init(void) 
	}

	}





	set_system_trap_gate(SYSCALL_VECTOR, &system_call);

	set_system_trap_gate(SYSCALL_VECTOR, &system_call);

#endif



	/* Reserve all the builtin and the syscall vector: */

	for (i = 0; i < FIRST_EXTERNAL_VECTOR; i++)

		set_bit(i, used_vectors);



#ifdef CONFIG_X86_64

	set_bit(IA32_SYSCALL_VECTOR, used_vectors);

#else

	set_bit(SYSCALL_VECTOR, used_vectors);

	set_bit(SYSCALL_VECTOR, used_vectors);

#endif

#endif



	/*

	/*

	 * Should be a barrier for any external CPU state:

	 * Should be a barrier for any external CPU state:

	 */

	 */