diff options
| -rw-r--r-- | arch/ia64/kernel/mca.c | 66 | ||||
| -rw-r--r-- | arch/ia64/kernel/mca_asm.S | 46 | ||||
| -rw-r--r-- | arch/ia64/kernel/mca_drv.c | 2 | ||||
| -rw-r--r-- | arch/ia64/kernel/mca_drv.h | 2 | ||||
| -rw-r--r-- | arch/ia64/kernel/mca_drv_asm.S | 2 | ||||
| -rw-r--r-- | include/asm-ia64/mca.h | 6 | ||||
| -rw-r--r-- | include/asm-ia64/mca_asm.h | 3 | 
7 files changed, 70 insertions, 57 deletions
| diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c index 6dbf5919d2d0..846e7e036b13 100644 --- a/arch/ia64/kernel/mca.c +++ b/arch/ia64/kernel/mca.c | |||
| @@ -2,61 +2,69 @@ | |||
| 2 | * File: mca.c | 2 | * File: mca.c | 
| 3 | * Purpose: Generic MCA handling layer | 3 | * Purpose: Generic MCA handling layer | 
| 4 | * | 4 | * | 
| 5 | * Updated for latest kernel | ||
| 6 | * Copyright (C) 2003 Hewlett-Packard Co | 5 | * Copyright (C) 2003 Hewlett-Packard Co | 
| 7 | * David Mosberger-Tang <davidm@hpl.hp.com> | 6 | * David Mosberger-Tang <davidm@hpl.hp.com> | 
| 8 | * | 7 | * | 
| 9 | * Copyright (C) 2002 Dell Inc. | 8 | * Copyright (C) 2002 Dell Inc. | 
| 10 | * Copyright (C) Matt Domsch (Matt_Domsch@dell.com) | 9 | * Copyright (C) Matt Domsch <Matt_Domsch@dell.com> | 
| 11 | * | 10 | * | 
| 12 | * Copyright (C) 2002 Intel | 11 | * Copyright (C) 2002 Intel | 
| 13 | * Copyright (C) Jenna Hall (jenna.s.hall@intel.com) | 12 | * Copyright (C) Jenna Hall <jenna.s.hall@intel.com> | 
| 14 | * | 13 | * | 
| 15 | * Copyright (C) 2001 Intel | 14 | * Copyright (C) 2001 Intel | 
| 16 | * Copyright (C) Fred Lewis (frederick.v.lewis@intel.com) | 15 | * Copyright (C) Fred Lewis <frederick.v.lewis@intel.com> | 
| 17 | * | 16 | * | 
| 18 | * Copyright (C) 2000 Intel | 17 | * Copyright (C) 2000 Intel | 
| 19 | * Copyright (C) Chuck Fleckenstein (cfleck@co.intel.com) | 18 | * Copyright (C) Chuck Fleckenstein <cfleck@co.intel.com> | 
| 20 | * | 19 | * | 
| 21 | * Copyright (C) 1999, 2004 Silicon Graphics, Inc. | 20 | * Copyright (C) 1999, 2004 Silicon Graphics, Inc. | 
| 22 | * Copyright (C) Vijay Chander(vijay@engr.sgi.com) | 21 | * Copyright (C) Vijay Chander <vijay@engr.sgi.com> | 
| 23 | * | 22 | * | 
| 24 | * 03/04/15 D. Mosberger Added INIT backtrace support. | 23 | * Copyright (C) 2006 FUJITSU LIMITED | 
| 25 | * 02/03/25 M. Domsch GUID cleanups | 24 | * Copyright (C) Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> | 
| 26 | * | 25 | * | 
| 27 | * 02/01/04 J. Hall Aligned MCA stack to 16 bytes, added platform vs. CPU | 26 | * 2000-03-29 Chuck Fleckenstein <cfleck@co.intel.com> | 
| 28 | * error flag, set SAL default return values, changed | 27 | * Fixed PAL/SAL update issues, began MCA bug fixes, logging issues, | 
| 29 | * error record structure to linked list, added init call | 28 | * added min save state dump, added INIT handler. | 
| 30 | * to sal_get_state_info_size(). | ||
| 31 | * | 29 | * | 
| 32 | * 01/01/03 F. Lewis Added setup of CMCI and CPEI IRQs, logging of corrected | 30 | * 2001-01-03 Fred Lewis <frederick.v.lewis@intel.com> | 
| 33 | * platform errors, completed code for logging of | 31 | * Added setup of CMCI and CPEI IRQs, logging of corrected platform | 
| 34 | * corrected & uncorrected machine check errors, and | 32 | * errors, completed code for logging of corrected & uncorrected | 
| 35 | * updated for conformance with Nov. 2000 revision of the | 33 | * machine check errors, and updated for conformance with Nov. 2000 | 
| 36 | * SAL 3.0 spec. | 34 | * revision of the SAL 3.0 spec. | 
| 37 | * 00/03/29 C. Fleckenstein Fixed PAL/SAL update issues, began MCA bug fixes, logging issues, | 35 | * | 
| 38 | * added min save state dump, added INIT handler. | 36 | * 2002-01-04 Jenna Hall <jenna.s.hall@intel.com> | 
| 37 | * Aligned MCA stack to 16 bytes, added platform vs. CPU error flag, | ||
| 38 | * set SAL default return values, changed error record structure to | ||
| 39 | * linked list, added init call to sal_get_state_info_size(). | ||
| 40 | * | ||
| 41 | * 2002-03-25 Matt Domsch <Matt_Domsch@dell.com> | ||
| 42 | * GUID cleanups. | ||
| 43 | * | ||
| 44 | * 2003-04-15 David Mosberger-Tang <davidm@hpl.hp.com> | ||
| 45 | * Added INIT backtrace support. | ||
| 39 | * | 46 | * | 
| 40 | * 2003-12-08 Keith Owens <kaos@sgi.com> | 47 | * 2003-12-08 Keith Owens <kaos@sgi.com> | 
| 41 | * smp_call_function() must not be called from interrupt context (can | 48 | * smp_call_function() must not be called from interrupt context | 
| 42 | * deadlock on tasklist_lock). Use keventd to call smp_call_function(). | 49 | * (can deadlock on tasklist_lock). | 
| 50 | * Use keventd to call smp_call_function(). | ||
| 43 | * | 51 | * | 
| 44 | * 2004-02-01 Keith Owens <kaos@sgi.com> | 52 | * 2004-02-01 Keith Owens <kaos@sgi.com> | 
| 45 | * Avoid deadlock when using printk() for MCA and INIT records. | 53 | * Avoid deadlock when using printk() for MCA and INIT records. | 
| 46 | * Delete all record printing code, moved to salinfo_decode in user space. | 54 | * Delete all record printing code, moved to salinfo_decode in user | 
| 47 | * Mark variables and functions static where possible. | 55 | * space. Mark variables and functions static where possible. | 
| 48 | * Delete dead variables and functions. | 56 | * Delete dead variables and functions. Reorder to remove the need | 
| 49 | * Reorder to remove the need for forward declarations and to consolidate | 57 | * for forward declarations and to consolidate related code. | 
| 50 | * related code. | ||
| 51 | * | 58 | * | 
| 52 | * 2005-08-12 Keith Owens <kaos@sgi.com> | 59 | * 2005-08-12 Keith Owens <kaos@sgi.com> | 
| 53 | * Convert MCA/INIT handlers to use per event stacks and SAL/OS state. | 60 | * Convert MCA/INIT handlers to use per event stacks and SAL/OS | 
| 61 | * state. | ||
| 54 | * | 62 | * | 
| 55 | * 2005-10-07 Keith Owens <kaos@sgi.com> | 63 | * 2005-10-07 Keith Owens <kaos@sgi.com> | 
| 56 | * Add notify_die() hooks. | 64 | * Add notify_die() hooks. | 
| 57 | * | 65 | * | 
| 58 | * 2006-09-15 Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> | 66 | * 2006-09-15 Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> | 
| 59 | * Add printing support for MCA/INIT. | 67 | * Add printing support for MCA/INIT. | 
| 60 | * | 68 | * | 
| 61 | * 2007-04-27 Russ Anderson <rja@sgi.com> | 69 | * 2007-04-27 Russ Anderson <rja@sgi.com> | 
| 62 | * Support multiple cpus going through OS_MCA in the same event. | 70 | * Support multiple cpus going through OS_MCA in the same event. | 
| diff --git a/arch/ia64/kernel/mca_asm.S b/arch/ia64/kernel/mca_asm.S index 0f5965fcdf85..8bc7d259e0c6 100644 --- a/arch/ia64/kernel/mca_asm.S +++ b/arch/ia64/kernel/mca_asm.S | |||
| @@ -1,24 +1,28 @@ | |||
| 1 | // | 1 | /* | 
| 2 | // assembly portion of the IA64 MCA handling | 2 | * File: mca_asm.S | 
| 3 | // | 3 | * Purpose: assembly portion of the IA64 MCA handling | 
| 4 | // Mods by cfleck to integrate into kernel build | 4 | * | 
| 5 | // 00/03/15 davidm Added various stop bits to get a clean compile | 5 | * Mods by cfleck to integrate into kernel build | 
| 6 | // | 6 | * | 
| 7 | // 00/03/29 cfleck Added code to save INIT handoff state in pt_regs format, switch to temp | 7 | * 2000-03-15 David Mosberger-Tang <davidm@hpl.hp.com> | 
| 8 | // kstack, switch modes, jump to C INIT handler | 8 | * Added various stop bits to get a clean compile | 
| 9 | // | 9 | * | 
| 10 | // 02/01/04 J.Hall <jenna.s.hall@intel.com> | 10 | * 2000-03-29 Chuck Fleckenstein <cfleck@co.intel.com> | 
| 11 | // Before entering virtual mode code: | 11 | * Added code to save INIT handoff state in pt_regs format, | 
| 12 | // 1. Check for TLB CPU error | 12 | * switch to temp kstack, switch modes, jump to C INIT handler | 
| 13 | // 2. Restore current thread pointer to kr6 | 13 | * | 
| 14 | // 3. Move stack ptr 16 bytes to conform to C calling convention | 14 | * 2002-01-04 J.Hall <jenna.s.hall@intel.com> | 
| 15 | // | 15 | * Before entering virtual mode code: | 
| 16 | // 04/11/12 Russ Anderson <rja@sgi.com> | 16 | * 1. Check for TLB CPU error | 
| 17 | // Added per cpu MCA/INIT stack save areas. | 17 | * 2. Restore current thread pointer to kr6 | 
| 18 | // | 18 | * 3. Move stack ptr 16 bytes to conform to C calling convention | 
| 19 | // 12/08/05 Keith Owens <kaos@sgi.com> | 19 | * | 
| 20 | // Use per cpu MCA/INIT stacks for all data. | 20 | * 2004-11-12 Russ Anderson <rja@sgi.com> | 
| 21 | // | 21 | * Added per cpu MCA/INIT stack save areas. | 
| 22 | * | ||
| 23 | * 2005-12-08 Keith Owens <kaos@sgi.com> | ||
| 24 | * Use per cpu MCA/INIT stacks for all data. | ||
| 25 | */ | ||
| 22 | #include <linux/threads.h> | 26 | #include <linux/threads.h> | 
| 23 | 27 | ||
| 24 | #include <asm/asmmacro.h> | 28 | #include <asm/asmmacro.h> | 
| diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c index aba813c2c150..fab1d21a4f2c 100644 --- a/arch/ia64/kernel/mca_drv.c +++ b/arch/ia64/kernel/mca_drv.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * Purpose: Generic MCA handling layer | 3 | * Purpose: Generic MCA handling layer | 
| 4 | * | 4 | * | 
| 5 | * Copyright (C) 2004 FUJITSU LIMITED | 5 | * Copyright (C) 2004 FUJITSU LIMITED | 
| 6 | * Copyright (C) Hidetoshi Seto (seto.hidetoshi@jp.fujitsu.com) | 6 | * Copyright (C) 2004 Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> | 
| 7 | * Copyright (C) 2005 Silicon Graphics, Inc | 7 | * Copyright (C) 2005 Silicon Graphics, Inc | 
| 8 | * Copyright (C) 2005 Keith Owens <kaos@sgi.com> | 8 | * Copyright (C) 2005 Keith Owens <kaos@sgi.com> | 
| 9 | * Copyright (C) 2006 Russ Anderson <rja@sgi.com> | 9 | * Copyright (C) 2006 Russ Anderson <rja@sgi.com> | 
| diff --git a/arch/ia64/kernel/mca_drv.h b/arch/ia64/kernel/mca_drv.h index 485e34d0b199..53b8ecb5b4b9 100644 --- a/arch/ia64/kernel/mca_drv.h +++ b/arch/ia64/kernel/mca_drv.h | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * Purpose: Define helpers for Generic MCA handling | 3 | * Purpose: Define helpers for Generic MCA handling | 
| 4 | * | 4 | * | 
| 5 | * Copyright (C) 2004 FUJITSU LIMITED | 5 | * Copyright (C) 2004 FUJITSU LIMITED | 
| 6 | * Copyright (C) Hidetoshi Seto (seto.hidetoshi@jp.fujitsu.com) | 6 | * Copyright (C) 2004 Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> | 
| 7 | */ | 7 | */ | 
| 8 | /* | 8 | /* | 
| 9 | * Processor error section: | 9 | * Processor error section: | 
| diff --git a/arch/ia64/kernel/mca_drv_asm.S b/arch/ia64/kernel/mca_drv_asm.S index 3bccb06c8d21..767ac2c20d16 100644 --- a/arch/ia64/kernel/mca_drv_asm.S +++ b/arch/ia64/kernel/mca_drv_asm.S | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * Purpose: Assembly portion of Generic MCA handling | 3 | * Purpose: Assembly portion of Generic MCA handling | 
| 4 | * | 4 | * | 
| 5 | * Copyright (C) 2004 FUJITSU LIMITED | 5 | * Copyright (C) 2004 FUJITSU LIMITED | 
| 6 | * Copyright (C) Hidetoshi Seto (seto.hidetoshi@jp.fujitsu.com) | 6 | * Copyright (C) 2004 Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> | 
| 7 | */ | 7 | */ | 
| 8 | #include <linux/threads.h> | 8 | #include <linux/threads.h> | 
| 9 | 9 | ||
| diff --git a/include/asm-ia64/mca.h b/include/asm-ia64/mca.h index 823553bf12e6..f1663aa94a52 100644 --- a/include/asm-ia64/mca.h +++ b/include/asm-ia64/mca.h | |||
| @@ -3,9 +3,9 @@ | |||
| 3 | * Purpose: Machine check handling specific defines | 3 | * Purpose: Machine check handling specific defines | 
| 4 | * | 4 | * | 
| 5 | * Copyright (C) 1999, 2004 Silicon Graphics, Inc. | 5 | * Copyright (C) 1999, 2004 Silicon Graphics, Inc. | 
| 6 | * Copyright (C) Vijay Chander (vijay@engr.sgi.com) | 6 | * Copyright (C) Vijay Chander <vijay@engr.sgi.com> | 
| 7 | * Copyright (C) Srinivasa Thirumalachar (sprasad@engr.sgi.com) | 7 | * Copyright (C) Srinivasa Thirumalachar <sprasad@engr.sgi.com> | 
| 8 | * Copyright (C) Russ Anderson (rja@sgi.com) | 8 | * Copyright (C) Russ Anderson <rja@sgi.com> | 
| 9 | */ | 9 | */ | 
| 10 | 10 | ||
| 11 | #ifndef _ASM_IA64_MCA_H | 11 | #ifndef _ASM_IA64_MCA_H | 
| diff --git a/include/asm-ia64/mca_asm.h b/include/asm-ia64/mca_asm.h index 76203f9a8718..dd2a5b134390 100644 --- a/include/asm-ia64/mca_asm.h +++ b/include/asm-ia64/mca_asm.h | |||
| @@ -1,8 +1,9 @@ | |||
| 1 | /* | 1 | /* | 
| 2 | * File: mca_asm.h | 2 | * File: mca_asm.h | 
| 3 | * Purpose: Machine check handling specific defines | ||
| 3 | * | 4 | * | 
| 4 | * Copyright (C) 1999 Silicon Graphics, Inc. | 5 | * Copyright (C) 1999 Silicon Graphics, Inc. | 
| 5 | * Copyright (C) Vijay Chander (vijay@engr.sgi.com) | 6 | * Copyright (C) Vijay Chander <vijay@engr.sgi.com> | 
| 6 | * Copyright (C) Srinivasa Thirumalachar <sprasad@engr.sgi.com> | 7 | * Copyright (C) Srinivasa Thirumalachar <sprasad@engr.sgi.com> | 
| 7 | * Copyright (C) 2000 Hewlett-Packard Co. | 8 | * Copyright (C) 2000 Hewlett-Packard Co. | 
| 8 | * Copyright (C) 2000 David Mosberger-Tang <davidm@hpl.hp.com> | 9 | * Copyright (C) 2000 David Mosberger-Tang <davidm@hpl.hp.com> | 
