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

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

Merge branches 'x86-efi-for-linus', 'x86-gart-for-linus', 'x86-irq-for-linus'... 

Merge branches 'x86-efi-for-linus', 'x86-gart-for-linus', 'x86-irq-for-linus' and 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, efi: Ensure that the entirity of a region is mapped
  x86, efi: Pass a minimal map to SetVirtualAddressMap()
  x86, efi: Merge contiguous memory regions of the same type and attribute
  x86, efi: Consolidate EFI nx control
  x86, efi: Remove virtual-mode SetVirtualAddressMap call

* 'x86-gart-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, gart: Don't enforce GART aperture lower-bound by alignment

* 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Don't unmask disabled irqs when migrating them
  x86: Skip migrating IRQF_PER_CPU irqs in fixup_irqs()

* 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, mce: Drop the default decoding notifier
  x86, MCE: Do not taint when handling correctable errors
parents 01628188 935a6382 c387aa3a 983bbf1a dffa4b2f

arch/x86/include/asm/efi.h

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size, 
#endif /* CONFIG_X86_32 */



extern int add_efi_memmap;

extern void efi_set_executable(efi_memory_desc_t *md, bool executable);

extern void efi_memblock_x86_reserve_range(void);

extern void efi_call_phys_prelog(void);

extern void efi_call_phys_epilog(void);

arch/x86/include/asm/mce.h

+0 −2
Original line number Diff line number Diff line
@@ -142,8 +142,6 @@ static inline void winchip_mcheck_init(struct cpuinfo_x86 *c) {} 
static inline void enable_p5_mce(void) {}

#endif



extern void (*x86_mce_decode_callback)(struct mce *m);



void mce_setup(struct mce *m);

void mce_log(struct mce *m);

DECLARE_PER_CPU(struct sys_device, mce_dev);

arch/x86/kernel/aperture_64.c

+19 −15
Original line number Diff line number Diff line
@@ -30,6 +30,22 @@ 
#include <asm/amd_nb.h>

#include <asm/x86_init.h>



/*

 * Using 512M as goal, in case kexec will load kernel_big

 * that will do the on-position decompress, and could overlap with

 * with the gart aperture that is used.

 * Sequence:

 * kernel_small

 * ==> kexec (with kdump trigger path or gart still enabled)

 * ==> kernel_small (gart area become e820_reserved)

 * ==> kexec (with kdump trigger path or gart still enabled)

 * ==> kerne_big (uncompressed size will be big than 64M or 128M)

 * So don't use 512M below as gart iommu, leave the space for kernel

 * code for safe.

 */

#define GART_MIN_ADDR	(512ULL << 20)

#define GART_MAX_ADDR	(1ULL   << 32)



int gart_iommu_aperture;

int gart_iommu_aperture_disabled __initdata;

int gart_iommu_aperture_allowed __initdata;
@@ -70,21 +86,9 @@ static u32 __init allocate_aperture(void) 
	 * memory. Unfortunately we cannot move it up because that would

	 * make the IOMMU useless.

	 */

	/*

	 * using 512M as goal, in case kexec will load kernel_big

	 * that will do the on position decompress, and  could overlap with

	 * that position with gart that is used.

	 * sequende:

	 * kernel_small

	 * ==> kexec (with kdump trigger path or previous doesn't shutdown gart)

	 * ==> kernel_small(gart area become e820_reserved)

	 * ==> kexec (with kdump trigger path or previous doesn't shutdown gart)

	 * ==> kerne_big (uncompressed size will be big than 64M or 128M)

	 * so don't use 512M below as gart iommu, leave the space for kernel

	 * code for safe

	 */

	addr = memblock_find_in_range(0, 1ULL<<32, aper_size, 512ULL<<20);

	if (addr == MEMBLOCK_ERROR || addr + aper_size > 0xffffffff) {

	addr = memblock_find_in_range(GART_MIN_ADDR, GART_MAX_ADDR,

				      aper_size, aper_size);

	if (addr == MEMBLOCK_ERROR || addr + aper_size > GART_MAX_ADDR) {

		printk(KERN_ERR

			"Cannot allocate aperture memory hole (%lx,%uK)\n",

				addr, aper_size>>10);

arch/x86/kernel/cpu/mcheck/mce.c

+7 −18
Original line number Diff line number Diff line
@@ -105,20 +105,6 @@ static int cpu_missing; 
ATOMIC_NOTIFIER_HEAD(x86_mce_decoder_chain);

EXPORT_SYMBOL_GPL(x86_mce_decoder_chain);



static int default_decode_mce(struct notifier_block *nb, unsigned long val,

			       void *data)

{

	pr_emerg(HW_ERR "No human readable MCE decoding support on this CPU type.\n");

	pr_emerg(HW_ERR "Run the message through 'mcelog --ascii' to decode.\n");



	return NOTIFY_STOP;

}



static struct notifier_block mce_dec_nb = {

	.notifier_call = default_decode_mce,

	.priority      = -1,

};



/* MCA banks polled by the period polling timer for corrected events */

DEFINE_PER_CPU(mce_banks_t, mce_poll_banks) = {

	[0 ... BITS_TO_LONGS(MAX_NR_BANKS)-1] = ~0UL
@@ -212,6 +198,8 @@ void mce_log(struct mce *mce) 


static void print_mce(struct mce *m)

{

	int ret = 0;



	pr_emerg(HW_ERR "CPU %d: Machine Check Exception: %Lx Bank %d: %016Lx\n",

	       m->extcpu, m->mcgstatus, m->bank, m->status);
@@ -239,7 +227,11 @@ static void print_mce(struct mce *m) 
	 * Print out human-readable details about the MCE error,

	 * (if the CPU has an implementation for that)

	 */

	atomic_notifier_call_chain(&x86_mce_decoder_chain, 0, m);

	ret = atomic_notifier_call_chain(&x86_mce_decoder_chain, 0, m);

	if (ret == NOTIFY_STOP)

		return;



	pr_emerg_ratelimited(HW_ERR "Run the above through 'mcelog --ascii'\n");

}



#define PANIC_TIMEOUT 5 /* 5 seconds */
@@ -590,7 +582,6 @@ void machine_check_poll(enum mcp_flags flags, mce_banks_t *b) 
		if (!(flags & MCP_DONTLOG) && !mce_dont_log_ce) {

			mce_log(&m);

			atomic_notifier_call_chain(&x86_mce_decoder_chain, 0, &m);

			add_taint(TAINT_MACHINE_CHECK);

		}



		/*
@@ -1722,8 +1713,6 @@ __setup("mce", mcheck_enable); 


int __init mcheck_init(void)

{

	atomic_notifier_chain_register(&x86_mce_decoder_chain, &mce_dec_nb);



	mcheck_intel_therm_init();



	return 0;

arch/x86/kernel/cpu/mcheck/therm_throt.c

+0 −3
Original line number Diff line number Diff line
@@ -187,8 +187,6 @@ static int therm_throt_process(bool new_event, int event, int level) 
				this_cpu,

				level == CORE_LEVEL ? "Core" : "Package",

				state->count);



		add_taint(TAINT_MACHINE_CHECK);

		return 1;

	}

	if (old_event) {
@@ -393,7 +391,6 @@ static void unexpected_thermal_interrupt(void) 
{

	printk(KERN_ERR "CPU%d: Unexpected LVT thermal interrupt!\n",

			smp_processor_id());

	add_taint(TAINT_MACHINE_CHECK);

}



static void (*smp_thermal_vector)(void) = unexpected_thermal_interrupt;