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

Commit f3845f3f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, amd: Restrict usage of c1e_idle()
  x86: Fix placement of FIX_OHCI1394_BASE
  x86: Handle legacy PIC interrupts on all the cpu's
parents 054319b5 035a02c1

arch/x86/include/asm/fixmap.h

+3 −3
Original line number Diff line number Diff line
@@ -82,6 +82,9 @@ enum fixed_addresses { 
#endif

	FIX_DBGP_BASE,

	FIX_EARLYCON_MEM_BASE,

#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT

	FIX_OHCI1394_BASE,

#endif

#ifdef CONFIG_X86_LOCAL_APIC

	FIX_APIC_BASE,	/* local (CPU) APIC) -- required for SMP or not */

#endif
@@ -132,9 +135,6 @@ enum fixed_addresses { 
	   (__end_of_permanent_fixed_addresses & (TOTAL_FIX_BTMAPS - 1))

	 : __end_of_permanent_fixed_addresses,

	FIX_BTMAP_BEGIN = FIX_BTMAP_END + TOTAL_FIX_BTMAPS - 1,

#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT

	FIX_OHCI1394_BASE,

#endif

#ifdef CONFIG_X86_32

	FIX_WP_TEST,

#endif

arch/x86/include/asm/hw_irq.h

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ extern void (*__initconst interrupt[NR_VECTORS-FIRST_EXTERNAL_VECTOR])(void); 


typedef int vector_irq_t[NR_VECTORS];

DECLARE_PER_CPU(vector_irq_t, vector_irq);

extern void setup_vector_irq(int cpu);



#ifdef CONFIG_X86_IO_APIC

extern void lock_vector_lock(void);

arch/x86/include/asm/msr-index.h

+2 −0
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ 
#define MSR_AMD64_PATCH_LEVEL		0x0000008b

#define MSR_AMD64_NB_CFG		0xc001001f

#define MSR_AMD64_PATCH_LOADER		0xc0010020

#define MSR_AMD64_OSVW_ID_LENGTH	0xc0010140

#define MSR_AMD64_OSVW_STATUS		0xc0010141

#define MSR_AMD64_IBSFETCHCTL		0xc0011030

#define MSR_AMD64_IBSFETCHLINAD		0xc0011031

#define MSR_AMD64_IBSFETCHPHYSAD	0xc0011032

arch/x86/kernel/apic/io_apic.c

+8 −0
Original line number Diff line number Diff line
@@ -1268,6 +1268,14 @@ void __setup_vector_irq(int cpu) 
	/* Mark the inuse vectors */

	for_each_irq_desc(irq, desc) {

		cfg = desc->chip_data;



		/*

		 * If it is a legacy IRQ handled by the legacy PIC, this cpu

		 * will be part of the irq_cfg's domain.

		 */

		if (irq < legacy_pic->nr_legacy_irqs && !IO_APIC_IRQ(irq))

			cpumask_set_cpu(cpu, cfg->domain);



		if (!cpumask_test_cpu(cpu, cfg->domain))

			continue;

		vector = cfg->vector;

arch/x86/kernel/irqinit.c

+22 −0
Original line number Diff line number Diff line
@@ -141,6 +141,28 @@ void __init init_IRQ(void) 
	x86_init.irqs.intr_init();

}



/*

 * Setup the vector to irq mappings.

 */

void setup_vector_irq(int cpu)

{

#ifndef CONFIG_X86_IO_APIC

	int irq;



	/*

	 * On most of the platforms, legacy PIC delivers the interrupts on the

	 * boot cpu. But there are certain platforms where PIC interrupts are

	 * delivered to multiple cpu's. If the legacy IRQ is handled by the

	 * legacy PIC, for the new cpu that is coming online, setup the static

	 * legacy vector to irq mapping:

	 */

	for (irq = 0; irq < legacy_pic->nr_legacy_irqs; irq++)

		per_cpu(vector_irq, cpu)[IRQ0_VECTOR + irq] = irq;

#endif



	__setup_vector_irq(cpu);

}



static void __init smp_intr_init(void)

{

#ifdef CONFIG_SMP