x86 updates
Subsystems (5)
Linus,
Please pull the latest x86 fixes+updates git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus
Various fixes, plus a late batch of MCE cleanups from Hidetoshi Seto.
Thanks,
Ingo
------------------>
Alexander van Heukelum (3):
i386: fix return to 16-bit stack from NMI handler
i386: fix/simplify espfix stack switching, move it into assembly
x86: de-assembler-ize asm/desc.h
Andi Kleen (1):
x86: mce: Handle banks == 0 case in K7 quirk
Chris Wright (3):
amd-iommu: flush domain tlb when attaching a new device
amd-iommu: disable cmd buffer and evt logging before reprogramming iommu
amd-iommu: resume cleanup
Cliff Wickman (1):
x86: correct the conversion of EFI memory types
Cyrill Gorcunov (2):
x86: mce: Don't touch THERMAL_APIC_VECTOR if no active APIC present x86, ioapic: Don't call disconnect_bsp_APIC if no APIC present
Figo.zhang (1):
x86, io_apic.c: Work around compiler warning
H. Peter Anvin (3):
x86: cap iomem_resource to addressable physical memory x86, boot: use .code16gcc instead of .code16 x86, mce: mce_intel.c needs <asm/apic.h>
Hidetoshi Seto (17):
x86, mce: don't init timer if !mce_available
x86, mce: cleanup mce_start()
x86, mce: add __read_mostly
x86, mce: rename static variables around trigger
x86, mce: sysfs entries for new mce options
x86, mce: unify mce.h
x86, mce: make mce_disabled boolean
x86, mce: unify smp_thermal_interrupt, prepare p4 x86, mce: unify smp_thermal_interrupt, prepare mce_intel_64 x86, mce: unify smp_thermal_interrupt, prepare
x86, mce: unify smp_thermal_interrupt
x86, mce: squash mce_intel.c into therm_throt.c
x86, mce: remove intel_set_thermal_handler()
x86, mce: remove therm_throt.h
x86, mce: mce.h cleanup
x86, mce: rename _64.c files which are no longer 64-bit-specific x86, mce: fix error path in mce_create_device()
Huang Weiyi (1):
x86: Remove duplicated #include's
Huang Ying (1):
x86, mce: fix a race condition about mce_callin and no_way_out
Ingo Molnar (1):
x86: mm: Read cr2 before prefetching the mmap_lock
Jaswinder Singh Rajput (2):
x86: apic/io_apic.c: dmar_msi_type should be static
x86: msr.h linux/types.h is only required for __KERNEL__
Joerg Roedel (3):
amd-iommu: disable IOMMU hardware on shutdown
x86: disable IOMMUs on kernel crash
amd-iommu: set event buffer head and tail to 0 manually
Prarit Bhargava (1):
x86: nmi: Add Intel processor 0x6f4 to NMI perfctr1 workaround
Randy Dunlap (1):
x86: atomic_32.h: Fix kernel-doc warnings
Shaohua Li (1):
x86: change kernel_physical_mapping_init() __init to __meminit
Thomas Gleixner (1):
x86: hpet: Mark per cpu interrupts IRQF_TIMER to prevent resume failure
Yinghai Lu (2):
x86: fix duplicated sysfs attribute
x86: use zalloc_cpumask_var for mce_dev_initialized
arch/x86/boot/bioscall.S | 2 +-
arch/x86/include/asm/amd_iommu.h | 2 +
arch/x86/include/asm/atomic_32.h | 3 +-
arch/x86/include/asm/desc.h | 26 --
arch/x86/include/asm/mce.h | 63 ++++-
arch/x86/include/asm/msr.h | 7 +-
arch/x86/include/asm/therm_throt.h | 9 -
arch/x86/kernel/amd_iommu.c | 16 ++
arch/x86/kernel/amd_iommu_init.c | 26 ++-
arch/x86/kernel/apic/io_apic.c | 9 +-
arch/x86/kernel/apic/probe_32.c | 11 -
arch/x86/kernel/apic/summit_32.c | 1 -
arch/x86/kernel/cpu/common.c | 5 +-
arch/x86/kernel/cpu/mcheck/Makefile | 9 +-
arch/x86/kernel/cpu/mcheck/k7.c | 3 +-
arch/x86/kernel/cpu/mcheck/mce.c | 233 +++++++++++++------
arch/x86/kernel/cpu/mcheck/mce.h | 38 ---
.../kernel/cpu/mcheck/{mce_amd_64.c => mce_amd.c} | 0
arch/x86/kernel/cpu/mcheck/mce_intel.c | 250 ++++++++++++++++----
arch/x86/kernel/cpu/mcheck/mce_intel_64.c | 248 -------------------
arch/x86/kernel/cpu/mcheck/non-fatal.c | 3 +-
arch/x86/kernel/cpu/mcheck/p4.c | 48 +----
arch/x86/kernel/cpu/mcheck/p5.c | 15 +-
arch/x86/kernel/cpu/mcheck/p6.c | 3 +-
arch/x86/kernel/cpu/mcheck/therm_throt.c | 106 ++++++++-
arch/x86/kernel/cpu/mcheck/winchip.c | 3 +-
arch/x86/kernel/cpu/perfctr-watchdog.c | 12 +-
arch/x86/kernel/crash.c | 6 +
arch/x86/kernel/efi.c | 31 +++-
arch/x86/kernel/entry_32.S | 64 ++++--
arch/x86/kernel/head_32.S | 1 -
arch/x86/kernel/head_64.S | 1 -
arch/x86/kernel/hpet.c | 3 +-
arch/x86/kernel/pci-dma.c | 2 +
arch/x86/kernel/traps.c | 3 +-
arch/x86/mm/fault.c | 4 +-
arch/x86/mm/init_64.c | 2 +-
37 files changed, 671 insertions(+), 597 deletions(-)
delete mode 100644 arch/x86/include/asm/therm_throt.h
delete mode 100644 arch/x86/kernel/cpu/mcheck/mce.h
rename arch/x86/kernel/cpu/mcheck/{mce_amd_64.c => mce_amd.c} (100%)
delete mode 100644 arch/x86/kernel/cpu/mcheck/mce_intel_64.carch/x86/boot/bioscall.S +1 -1
@@ -13,7 +13,7 @@ * touching registers they shouldn't be. */ - .code16 + .code16gcc .text .globl intcall .type intcall, @function
arch/x86/include/asm/amd_iommu.h +2 -0
@@ -29,9 +29,11 @@ extern void amd_iommu_detect(void);extern irqreturn_t amd_iommu_int_handler (int irq,void *data);extern void amd_iommu_flush_all_domains (void );extern void amd_iommu_flush_all_devices (void ); +extern void amd_iommu_shutdown (void );#else static inline int amd_iommu_init (void ) {return -ENODEV ; }static inline void amd_iommu_detect (void ) { } +static inline void amd_iommu_shutdown (void ) { }#endif #endif /* _ASM_X86_AMD_IOMMU_H */
arch/x86/include/asm/atomic_32.h +1 -2
@@ -257,7 +257,7 @@ typedef struct {/** * atomic64_read - read atomic64 variable -* @v: pointer of type atomic64_t +* @ptr: pointer of type atomic64_t * * Atomically reads the value of @v. * Doesn't imply a read memory barrier.
@@ -294,7 +294,6 @@ atomic64_cmpxchg(atomic64_t *ptr, unsigned long long old_val,* atomic64_xchg - xchg atomic64 variable * @ptr: pointer to type atomic64_t * @new_val: value to assign -* @old_val: old value that was there * * Atomically xchgs the value of @ptr to @new_val and returns * the old value.
arch/x86/include/asm/desc.h +0 -26
@@ -1,7 +1,6 @@#ifndef _ASM_X86_DESC_H#define _ASM_X86_DESC_H -#ifndef __ASSEMBLY__#include <asm/desc_defs.h> #include <asm/ldt.h> #include <asm/mmu.h>
@@ -380,29 +379,4 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist) _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS); } -#else -/* -* GET_DESC_BASE reads the descriptor base of the specified segment. -* -* Args: -* idx - descriptor index -* gdt - GDT pointer -* base - 32bit register to which the base will be written -* lo_w - lo word of the "base" register -* lo_b - lo byte of the "base" register -* hi_b - hi byte of the low word of the "base" register -* -* Example: -* GET_DESC_BASE(GDT_ENTRY_ESPFIX_SS, %ebx, %eax, %ax, %al, %ah) -* Will read the base address of GDT_ENTRY_ESPFIX_SS and put it into %eax. -*/ -#define GET_DESC_BASE (idx, gdt, base, lo_w, lo_b, hi_b) \ - movb idx * 8 + 4(gdt), lo_b; \ - movb idx * 8 + 7(gdt), hi_b; \ - shll $16, base; \ - movw idx * 8 + 2(gdt), lo_w; - - -#endif /* __ASSEMBLY__ */ -#endif /* _ASM_X86_DESC_H */
arch/x86/include/asm/mce.h +51 -12
91 lines not on this page · raw message
arch/x86/include/asm/msr.h +1 -6
@@ -3,13 +3,10 @@#include <asm/msr-index.h> -#ifndef __ASSEMBLY__ -# include <linux/types.h> -#endif -#ifdef __KERNEL__#ifndef __ASSEMBLY__ +#include <linux/types.h> #include <asm/asm.h> #include <asm/errno.h> #include <asm/cpumask.h>
@@ -264,6 +261,4 @@ static inline int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h)#endif /* CONFIG_SMP */ #endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */ - -#endif /* _ASM_X86_MSR_H */
arch/x86/include/asm/therm_throt.h deleted +0 -9
@@ -1,9 +0,0 @@ -#ifndef _ASM_X86_THERM_THROT_H -#define _ASM_X86_THERM_THROT_H - -#include <asm/atomic.h> - -extern atomic_t therm_throt_en; -int therm_throt_process (int curr); - -#endif /* _ASM_X86_THERM_THROT_H */
arch/x86/kernel/amd_iommu.c +16 -0
@@ -434,6 +434,16 @@ static void iommu_flush_tlb(struct amd_iommu *iommu, u16 domid)iommu_queue_inv_iommu_pages (iommu, address, domid,0 ,1 ); } +/* Flush the whole IO/TLB for a given protection domain - including PDE */ +static void iommu_flush_tlb_pde (struct amd_iommu *iommu,u16 domid) +{ +u64 address =CMD_INV_IOMMU_ALL_PAGES_ADDRESS ; + +INC_STATS_COUNTER (domain_flush_single); + +iommu_queue_inv_iommu_pages (iommu, address, domid,1 ,1 ); +} +/* * This function is used to flush the IO/TLB for a given protection domain * on every IOMMU in the system
@@ -1078,7 +1088,13 @@ static void attach_device(struct amd_iommu *iommu, amd_iommu_pd_table[devid] = domain;write_unlock_irqrestore (&amd_iommu_devtable_lock, flags); +/* +* We might boot into a crash-kernel here. The crashed kernel +* left the caches in the IOMMU dirty. So we have to flush +* here to evict all dirty stuff. +*/ iommu_queue_inv_dev_entry (iommu, devid); +iommu_flush_tlb_pde (iommu, domain->id); }/*
arch/x86/kernel/amd_iommu_init.c +19 -7
@@ -260,6 +260,14 @@ static void iommu_enable(struct amd_iommu *iommu)static void iommu_disable (struct amd_iommu *iommu) { +/* Disable command buffer */ +iommu_feature_disable (iommu,CONTROL_CMDBUF_EN ); + +/* Disable event logging and event interrupts */ +iommu_feature_disable (iommu,CONTROL_EVT_INT_EN ); +iommu_feature_disable (iommu,CONTROL_EVT_LOG_EN ); + +/* Disable IOMMU hardware itself */ iommu_feature_disable (iommu,CONTROL_IOMMU_EN ); }
@@ -478,6 +486,10 @@ static void iommu_enable_event_buffer(struct amd_iommu *iommu)memcpy_toio (iommu->mmio_base +MMIO_EVT_BUF_OFFSET , &entry,sizeof (entry)); +/* set head and tail to zero manually */ +writel (0x00 , iommu->mmio_base +MMIO_EVT_HEAD_OFFSET ); +writel (0x00 , iommu->mmio_base +MMIO_EVT_TAIL_OFFSET ); +iommu_feature_enable (iommu,CONTROL_EVT_LOG_EN ); }
@@ -1042,6 +1054,7 @@ static void enable_iommus(void)struct amd_iommu *iommu;for_each_iommu (iommu) { +iommu_disable (iommu);iommu_set_device_table (iommu);iommu_enable_command_buffer (iommu);iommu_enable_event_buffer (iommu);
@@ -1066,12 +1079,6 @@ static void disable_iommus(void)static int amd_iommu_resume (struct sys_device *dev) { -/* -* Disable IOMMUs before reprogramming the hardware registers. -* IOMMU is still enabled from the resume kernel. -*/ -disable_iommus (); -/* re-load the hardware */ enable_iommus ();
@@ -1079,8 +1086,8 @@ static int amd_iommu_resume(struct sys_device *dev)* we have to flush after the IOMMUs are enabled because a * disabled IOMMU will never execute the commands we send */ -amd_iommu_flush_all_domains ();amd_iommu_flush_all_devices (); +amd_iommu_flush_all_domains ();return 0 ; }
@@ -1273,6 +1280,11 @@ free: goto out; } +void amd_iommu_shutdown (void ) +{ +disable_iommus (); +} +/**************************************************************************** * * Early detect code. This code runs at IOMMU detection time in the DMA
arch/x86/kernel/apic/io_apic.c +6 -3
@@ -462,7 +462,8 @@ static struct IO_APIC_route_entry ioapic_read_entry(int apic, int pin)static void __ioapic_write_entry (int apic,int pin,struct IO_APIC_route_entry e) { -union entry_union eu; +union entry_union eu = {{0 ,0 }}; + eu.entry = e;io_apic_write (apic,0x11 +2 *pin, eu.w2);io_apic_write (apic,0x10 +2 *pin, eu.w1);
@@ -2003,7 +2004,9 @@ void disable_IO_APIC(void)/* * Use virtual wire A mode when interrupt remapping is enabled. */ -disconnect_bsp_APIC (!intr_remapping_enabled && ioapic_i8259.pin !=-1 ); +if (cpu_has_apic) +disconnect_bsp_APIC (!intr_remapping_enabled && + ioapic_i8259.pin !=-1 ); }#ifdef CONFIG_X86_32
@@ -3567,7 +3570,7 @@ static int dmar_msi_set_affinity(unsigned int irq, const struct cpumask *mask)#endif /* CONFIG_SMP */ -struct irq_chip dmar_msi_type = { +static struct irq_chip dmar_msi_type = { .name ="DMAR_MSI" , .unmask = dmar_msi_unmask, .mask = dmar_msi_mask,
arch/x86/kernel/apic/probe_32.c +0 -11
@@ -20,23 +20,12 @@#include <asm/apic.h> #include <asm/setup.h> -#include <linux/threads.h> -#include <linux/cpumask.h> -#include <asm/mpspec.h> -#include <asm/fixmap.h> -#include <asm/apicdef.h> -#include <linux/kernel.h> -#include <linux/string.h> #include <linux/smp.h> -#include <linux/init.h> #include <asm/ipi.h> -#include <linux/smp.h> -#include <linux/init.h> #include <linux/interrupt.h> #include <asm/acpi.h> #include <asm/e820.h> -#include <asm/setup.h> #ifdef CONFIG_HOTPLUG_CPU #define DEFAULT_SEND_IPI (1)
arch/x86/kernel/apic/summit_32.c +0 -1
@@ -44,7 +44,6 @@#include <asm/ipi.h> #include <linux/kernel.h> #include <linux/string.h> -#include <linux/init.h> #include <linux/gfp.h> #include <linux/smp.h>
arch/x86/kernel/cpu/common.c +4 -1
@@ -108,7 +108,7 @@ DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = { /* data */ [GDT_ENTRY_APMBIOS_BASE+2] = { { { 0x0000ffff, 0x00409200 } } }, - [GDT_ENTRY_ESPFIX_SS] = { { { 0x00000000, 0x00c09200 } } }, + [GDT_ENTRY_ESPFIX_SS] = { { { 0x0000ffff, 0x00cf9200 } } }, [GDT_ENTRY_PERCPU] = { { { 0x0000ffff, 0x00cf9200 } } }, GDT_STACK_CANARY_INIT#endif
@@ -853,6 +853,9 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)#if defined(CONFIG_NUMA ) && defined(CONFIG_X86_64 )numa_add_cpu (smp_processor_id ());#endif + +/* Cap the iomem address space to what is addressable on all CPUs */ + iomem_resource.end &= (1ULL << c->x86_phys_bits) -1 ; }#ifdef CONFIG_X86_64
arch/x86/kernel/cpu/mcheck/Makefile +5 -4
@@ -1,11 +1,12 @@ -obj-y = mce.o therm_throt.o +obj-y = mce.o obj-$(CONFIG_X86_NEW_MCE) += mce-severity.o obj-$(CONFIG_X86_OLD_MCE) += k7.o p4.o p6.o obj-$(CONFIG_X86_ANCIENT_MCE) += winchip.o p5.o -obj-$(CONFIG_X86_MCE_P4THERMAL) += mce_intel.o -obj-$(CONFIG_X86_MCE_INTEL) += mce_intel_64.o mce_intel.o -obj-$(CONFIG_X86_MCE_AMD) += mce_amd_64.o +obj-$(CONFIG_X86_MCE_INTEL) += mce_intel.o +obj-$(CONFIG_X86_MCE_AMD) += mce_amd.o obj-$(CONFIG_X86_MCE_NONFATAL) += non-fatal.o obj-$(CONFIG_X86_MCE_THRESHOLD) += threshold.o obj-$(CONFIG_X86_MCE_INJECT) += mce-inject.o + +obj-$(CONFIG_X86_THERMAL_VECTOR) += therm_throt.o
arch/x86/kernel/cpu/mcheck/k7.c +1 -2
@@ -10,10 +10,9 @@#include <asm/processor.h> #include <asm/system.h> +#include <asm/mce.h> #include <asm/msr.h> -#include "mce.h" -/* Machine Check Handler For AMD Athlon/Duron: */ static void k7_machine_check (struct pt_regs *regs,long error_code) {
arch/x86/kernel/cpu/mcheck/mce.c +159 -74
418 lines not on this page · raw message
arch/x86/kernel/cpu/mcheck/mce.h deleted +0 -38
@@ -1,38 +0,0 @@ -#include <linux/init.h> -#include <asm/mce.h> - -#ifdef CONFIG_X86_OLD_MCE -void amd_mcheck_init (struct cpuinfo_x86 *c); -void intel_p4_mcheck_init (struct cpuinfo_x86 *c); -void intel_p6_mcheck_init (struct cpuinfo_x86 *c); -#endif - -#ifdef CONFIG_X86_ANCIENT_MCE -void intel_p5_mcheck_init (struct cpuinfo_x86 *c); -void winchip_mcheck_init (struct cpuinfo_x86 *c); -extern int mce_p5_enable; -static inline int mce_p5_enabled (void ) {return mce_p5_enable; } -static inline void enable_p5_mce (void ) { mce_p5_enable =1 ; } -#else -static inline void intel_p5_mcheck_init (struct cpuinfo_x86 *c) {} -static inline void winchip_mcheck_init (struct cpuinfo_x86 *c) {} -static inline int mce_p5_enabled (void ) {return 0 ; } -static inline void enable_p5_mce (void ) { } -#endif - -/* Call the installed machine check handler for this CPU setup. */ -extern void (*machine_check_vector)(struct pt_regs *,long error_code); - -#ifdef CONFIG_X86_OLD_MCE - -extern int nr_mce_banks; - -void intel_set_thermal_handler (void ); - -#else - -static inline void intel_set_thermal_handler (void ) { } - -#endif - -void intel_init_thermal (struct cpuinfo_x86 *c);
arch/x86/kernel/cpu/mcheck/mce_amd.c renamed from arch/x86/kernel/cpu/mcheck/mce_amd_64.c +0 -0
arch/x86/kernel/cpu/mcheck/mce_intel.c +201 -49
275 lines not on this page · raw message
arch/x86/kernel/cpu/mcheck/mce_intel_64.c deleted +0 -248
248 lines not on this page · raw message
arch/x86/kernel/cpu/mcheck/non-fatal.c +1 -2
@@ -17,10 +17,9 @@#include <asm/processor.h> #include <asm/system.h> +#include <asm/mce.h> #include <asm/msr.h> -#include "mce.h" -static int firstbank;#define MCE_RATE (15*HZ)/* timer rate is 15s */
arch/x86/kernel/cpu/mcheck/p4.c +1 -47
68 lines not on this page · raw message
arch/x86/kernel/cpu/mcheck/p5.c +6 -9
@@ -10,12 +10,11 @@#include <asm/processor.h> #include <asm/system.h> +#include <asm/mce.h> #include <asm/msr.h> -#include "mce.h" -/* By default disabled */ -int mce_p5_enable; +int mce_p5_enabled__read_mostly ;/* Machine check handler for Pentium class Intel CPUs: */ static void pentium_machine_check (struct pt_regs *regs,long error_code)
@@ -43,15 +42,13 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c) {u32 l, h; -/* Check for MCE support: */ -if (!cpu_has (c,X86_FEATURE_MCE )) +/* Default P5 to off as its often misconnected: */ +if (!mce_p5_enabled)return ; -#ifdef CONFIG_X86_OLD_MCE -/* Default P5 to off as its often misconnected: */ -if (mce_disabled !=-1 ) +/* Check for MCE support: */ +if (!cpu_has (c,X86_FEATURE_MCE ))return ; -#endif machine_check_vector = pentium_machine_check;/* Make sure the vector pointer is visible before we enable MCEs: */
arch/x86/kernel/cpu/mcheck/p6.c +1 -2
@@ -10,10 +10,9 @@#include <asm/processor.h> #include <asm/system.h> +#include <asm/mce.h> #include <asm/msr.h> -#include "mce.h" -/* Machine Check Handler For PII/PIII */ static void intel_machine_check (struct pt_regs *regs,long error_code) {
arch/x86/kernel/cpu/mcheck/therm_throt.c +102 -4
135 lines not on this page · raw message
arch/x86/kernel/cpu/mcheck/winchip.c +1 -2
@@ -9,10 +9,9 @@#include <asm/processor.h> #include <asm/system.h> +#include <asm/mce.h> #include <asm/msr.h> -#include "mce.h" -/* Machine check handler for WinChip C6: */ static void winchip_machine_check (struct pt_regs *regs,long error_code) {
arch/x86/kernel/cpu/perfctr-watchdog.c +8 -4
@@ -716,11 +716,15 @@ static void probe_nmi_watchdog(void) wd_ops = &k7_wd_ops;break ;case X86_VENDOR_INTEL : -/* -* Work around Core Duo (Yonah) errata AE49 where perfctr1 -* doesn't have a working enable bit. +/* Work around where perfctr1 doesn't have a working enable +* bit as described in the following errata: +* AE49 Core Duo and Intel Core Solo 65 nm +* AN49 Intel Pentium Dual-Core +* AF49 Dual-Core Intel Xeon Processor LV */ -if (boot_cpu_data.x86 ==6 && boot_cpu_data.x86_model ==14 ) { +if ((boot_cpu_data.x86 ==6 && boot_cpu_data.x86_model ==14 ) || + ((boot_cpu_data.x86 ==6 && boot_cpu_data.x86_model ==15 && + boot_cpu_data.x86_mask ==4 ))) { intel_arch_wd_ops.perfctr =MSR_ARCH_PERFMON_PERFCTR0 ; intel_arch_wd_ops.evntsel =MSR_ARCH_PERFMON_EVENTSEL0 ; }
arch/x86/kernel/crash.c +6 -0
@@ -27,6 +27,7 @@#include <asm/cpu.h> #include <asm/reboot.h> #include <asm/virtext.h> +#include <asm/iommu.h> #if defined(CONFIG_SMP ) && defined(CONFIG_X86_LOCAL_APIC )
@@ -103,5 +104,10 @@ void native_machine_crash_shutdown(struct pt_regs *regs)#ifdef CONFIG_HPET_TIMER hpet_disable ();#endif + +#ifdef CONFIG_X86_64 +pci_iommu_shutdown (); +#endif +crash_save_cpu (regs,safe_smp_processor_id ()); }
arch/x86/kernel/efi.c +28 -3
@@ -240,10 +240,35 @@ static void __init do_add_efi_memmap(void)unsigned long long size = md->num_pages <<EFI_PAGE_SHIFT ;int e820_type; -if (md->attribute &EFI_MEMORY_WB ) - e820_type =E820_RAM ; -else +switch (md->type) { +case EFI_LOADER_CODE : +case EFI_LOADER_DATA : +case EFI_BOOT_SERVICES_CODE : +case EFI_BOOT_SERVICES_DATA : +case EFI_CONVENTIONAL_MEMORY : +if (md->attribute &EFI_MEMORY_WB ) + e820_type =E820_RAM ; +else + e820_type =E820_RESERVED ; +break ; +case EFI_ACPI_RECLAIM_MEMORY : + e820_type =E820_ACPI ; +break ; +case EFI_ACPI_MEMORY_NVS : + e820_type =E820_NVS ; +break ; +case EFI_UNUSABLE_MEMORY : + e820_type =E820_UNUSABLE ; +break ; +default : +/* +* EFI_RESERVED_TYPE EFI_RUNTIME_SERVICES_CODE +* EFI_RUNTIME_SERVICES_DATA EFI_MEMORY_MAPPED_IO +* EFI_MEMORY_MAPPED_IO_PORT_SPACE EFI_PAL_CODE +*/ e820_type =E820_RESERVED ; +break ; + }e820_add_region (start, size, e820_type); }sanitize_e820_map (e820.map,ARRAY_SIZE (e820.map), &e820.nr_map);
arch/x86/kernel/entry_32.S +42 -22
121 lines not on this page · raw message
arch/x86/kernel/head_32.S +0 -1
@@ -13,7 +13,6 @@ #include <asm/segment.h> #include <asm/page_types.h> #include <asm/pgtable_types.h> -#include <asm/desc.h> #include <asm/cache.h> #include <asm/thread_info.h> #include <asm/asm-offsets.h>
arch/x86/kernel/head_64.S +0 -1
@@ -12,7 +12,6 @@ #include <linux/linkage.h> #include <linux/threads.h> #include <linux/init.h> -#include <asm/desc.h> #include <asm/segment.h> #include <asm/pgtable.h> #include <asm/page.h>
arch/x86/kernel/hpet.c +2 -1
@@ -510,7 +510,8 @@ static int hpet_setup_irq(struct hpet_dev *dev) {if (request_irq (dev->irq, hpet_interrupt_handler, -IRQF_DISABLED |IRQF_NOBALANCING , dev->name, dev)) +IRQF_TIMER |IRQF_DISABLED |IRQF_NOBALANCING , + dev->name, dev))return -1 ;disable_irq (dev->irq);
arch/x86/kernel/pci-dma.c +2 -0
@@ -290,6 +290,8 @@ static int __init pci_iommu_init(void)void pci_iommu_shutdown (void ) {gart_iommu_shutdown (); + +amd_iommu_shutdown (); }/* Must execute after PCI subsystem */ fs_initcall (pci_iommu_init);
arch/x86/kernel/traps.c +1 -2
@@ -53,6 +53,7 @@#include <asm/traps.h> #include <asm/desc.h> #include <asm/i387.h> +#include <asm/mce.h> #include <asm/mach_traps.h>
@@ -64,8 +65,6 @@#include <asm/setup.h> #include <asm/traps.h> -#include "cpu/mcheck/mce.h" - asmlinkage int system_call(void);/* Do we ignore FPU interrupts ? */
arch/x86/mm/fault.c +2 -2
@@ -951,11 +951,11 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code) tsk = current; mm = tsk->mm; -prefetchw (&mm->mmap_sem); -/* Get the faulting address: */ address =read_cr2 (); +prefetchw (&mm->mmap_sem); +if (unlikely (kmmio_fault (regs, address)))return ;
arch/x86/mm/init_64.c +1 -1
@@ -527,7 +527,7 @@ phys_pud_update(pgd_t *pgd, unsigned long addr, unsigned long end,return phys_pud_init (pud, addr, end, page_size_mask); } -unsigned long __init +unsigned long __meminit kernel_physical_mapping_init (unsigned long start,unsigned long end,unsigned long page_size_mask)