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

Commit 8299608f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'irq/sparseirq', 'x86/quirks' and 'x86/reboot' into cpus4096 

We merge the irq/sparseirq, x86/quirks and x86/reboot trees into the
cpus4096 tree because the io-apic changes in the sparseirq change
conflict with the cpumask changes in the cpumask tree, and we
want to resolve those.
parents 45ab6b0c 30cb367e 69b88afa 8daa1905

arch/x86/Kconfig

+10 −11
Original line number Diff line number Diff line
@@ -241,6 +241,16 @@ config X86_HAS_BOOT_CPU_ID 
	def_bool y

	depends on X86_VOYAGER



config SPARSE_IRQ

	bool "Support sparse irq numbering"

	depends on (PCI_MSI || HT_IRQ) && SMP

	default y

	help

	  This enables support for sparse irq, esp for msi/msi-x. You may need

	  if you have lots of cards supports msi-x installed.



	  If you don't know what to do here, say Y.



config X86_FIND_SMP_CONFIG

	def_bool y

	depends on X86_MPPARSE || X86_VOYAGER
@@ -468,10 +478,6 @@ config X86_CYCLONE_TIMER 
	def_bool y

	depends on X86_GENERICARCH



config ES7000_CLUSTERED_APIC

	def_bool y

	depends on SMP && X86_ES7000 && MPENTIUMIII



source "arch/x86/Kconfig.cpu"



config HPET_TIMER
@@ -1635,13 +1641,6 @@ config APM_ALLOW_INTS 
	  many of the newer IBM Thinkpads.  If you experience hangs when you

	  suspend, try setting this to Y.  Otherwise, say N.



config APM_REAL_MODE_POWER_OFF

	bool "Use real mode APM BIOS call to power off"

	help

	  Use real mode APM BIOS calls to switch off the computer. This is

	  a work-around for a number of buggy BIOSes. Switch this option on if

	  your computer crashes instead of powering off properly.



endif # APM



source "arch/x86/kernel/cpu/cpufreq/Kconfig"

arch/x86/include/asm/apic.h

+1 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ extern u8 setup_APIC_eilvt_ibs(u8 vector, u8 msg_type, u8 mask); 
static inline void lapic_shutdown(void) { }

#define local_apic_timer_c2_ok		1

static inline void init_apic_mappings(void) { }

static inline void disable_local_APIC(void) { }



#endif /* !CONFIG_X86_LOCAL_APIC */

arch/x86/include/asm/bigsmp/apic.h

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ static inline cpumask_t target_cpus(void) 
#define INT_DELIVERY_MODE	(dest_Fixed)

#define INT_DEST_MODE		(0)    /* phys delivery to target proc */

#define NO_BALANCE_IRQ		(0)

#define WAKE_SECONDARY_VIA_INIT





static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)

{

arch/x86/include/asm/emergency-restart.h

+3 −1
Original line number Diff line number Diff line
@@ -8,7 +8,9 @@ enum reboot_type { 
	BOOT_BIOS = 'b',

#endif

	BOOT_ACPI = 'a',

	BOOT_EFI = 'e'

	BOOT_EFI = 'e',

	BOOT_CF9 = 'p',

	BOOT_CF9_COND = 'q',

};



extern enum reboot_type reboot_type;

arch/x86/include/asm/es7000/apic.h

+53 −26
Original line number Diff line number Diff line
@@ -9,31 +9,27 @@ static inline int apic_id_registered(void) 
	        return (1);

}



static inline cpumask_t target_cpus(void)

static inline cpumask_t target_cpus_cluster(void)

{

#if defined CONFIG_ES7000_CLUSTERED_APIC

	return CPU_MASK_ALL;

#else

}



static inline cpumask_t target_cpus(void)

{

	return cpumask_of_cpu(smp_processor_id());

#endif

}



#if defined CONFIG_ES7000_CLUSTERED_APIC

#define APIC_DFR_VALUE		(APIC_DFR_CLUSTER)

#define INT_DELIVERY_MODE	(dest_LowestPrio)

#define INT_DEST_MODE		(1)    /* logical delivery broadcast to all procs */

#define NO_BALANCE_IRQ		(1)

#undef  WAKE_SECONDARY_VIA_INIT

#define WAKE_SECONDARY_VIA_MIP

#else

#define APIC_DFR_VALUE_CLUSTER		(APIC_DFR_CLUSTER)

#define INT_DELIVERY_MODE_CLUSTER	(dest_LowestPrio)

#define INT_DEST_MODE_CLUSTER		(1) /* logical delivery broadcast to all procs */

#define NO_BALANCE_IRQ_CLUSTER		(1)



#define APIC_DFR_VALUE		(APIC_DFR_FLAT)

#define INT_DELIVERY_MODE	(dest_Fixed)

#define INT_DEST_MODE		(0)    /* phys delivery to target procs */

#define NO_BALANCE_IRQ		(0)

#undef  APIC_DEST_LOGICAL

#define APIC_DEST_LOGICAL	0x0

#define WAKE_SECONDARY_VIA_INIT

#endif



static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)

{
@@ -60,6 +56,16 @@ static inline unsigned long calculate_ldr(int cpu) 
 * an APIC.  See e.g. "AP-388 82489DX User's Manual" (Intel

 * document number 292116).  So here it goes...

 */

static inline void init_apic_ldr_cluster(void)

{

	unsigned long val;

	int cpu = smp_processor_id();



	apic_write(APIC_DFR, APIC_DFR_VALUE_CLUSTER);

	val = calculate_ldr(cpu);

	apic_write(APIC_LDR, val);

}



static inline void init_apic_ldr(void)

{

	unsigned long val;
@@ -70,10 +76,6 @@ static inline void init_apic_ldr(void) 
	apic_write(APIC_LDR, val);

}



#ifndef CONFIG_X86_GENERICARCH

extern void enable_apic_mode(void);

#endif



extern int apic_version [MAX_APICS];

static inline void setup_apic_routing(void)

{
@@ -144,7 +146,7 @@ static inline int check_phys_apicid_present(int cpu_physical_apicid) 
	return (1);

}



static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask)

static inline unsigned int cpu_mask_to_apicid_cluster(cpumask_t cpumask)

{

	int num_bits_set;

	int cpus_found = 0;
@@ -154,11 +156,7 @@ static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask) 
	num_bits_set = cpus_weight(cpumask);

	/* Return id to all */

	if (num_bits_set == NR_CPUS)

#if defined CONFIG_ES7000_CLUSTERED_APIC

		return 0xFF;

#else

		return cpu_to_logical_apicid(0);

#endif

	/*

	 * The cpus in the mask must all be on the apic cluster.  If are not

	 * on the same apicid cluster return default value of TARGET_CPUS.
@@ -171,11 +169,40 @@ static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask) 
			if (apicid_cluster(apicid) !=

					apicid_cluster(new_apicid)){

				printk ("%s: Not a valid mask!\n", __func__);

#if defined CONFIG_ES7000_CLUSTERED_APIC

				return 0xFF;

#else

			}

			apicid = new_apicid;

			cpus_found++;

		}

		cpu++;

	}

	return apicid;

}



static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask)

{

	int num_bits_set;

	int cpus_found = 0;

	int cpu;

	int apicid;



	num_bits_set = cpus_weight(cpumask);

	/* Return id to all */

	if (num_bits_set == NR_CPUS)

		return cpu_to_logical_apicid(0);

	/*

	 * The cpus in the mask must all be on the apic cluster.  If are not

	 * on the same apicid cluster return default value of TARGET_CPUS.

	 */

	cpu = first_cpu(cpumask);

	apicid = cpu_to_logical_apicid(cpu);

	while (cpus_found < num_bits_set) {

		if (cpu_isset(cpu, cpumask)) {

			int new_apicid = cpu_to_logical_apicid(cpu);

			if (apicid_cluster(apicid) !=

					apicid_cluster(new_apicid)){

				printk ("%s: Not a valid mask!\n", __func__);

				return cpu_to_logical_apicid(0);

#endif

			}

			apicid = new_apicid;

			cpus_found++;