diff options
author | Tony Luck <tony.luck@intel.com> | 2007-04-30 13:55:43 -0700 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2007-04-30 13:55:43 -0700 |
commit | e0cc09e295f346b7921e921f385fe5213472316a (patch) | |
tree | 3705c5bbd44afc235f39697a5b0c00d0d020188c /include/asm-ia64 | |
parent | 40caf5ea5a7d47f8a33e26b63ca81dea4b5109d2 (diff) | |
parent | e1b43bd556a611584a65f529e5077c1b54ace4f7 (diff) | |
download | linux-stable-e0cc09e295f346b7921e921f385fe5213472316a.tar.gz linux-stable-e0cc09e295f346b7921e921f385fe5213472316a.tar.bz2 linux-stable-e0cc09e295f346b7921e921f385fe5213472316a.zip |
Pull error-inject into release branch
Diffstat (limited to 'include/asm-ia64')
-rw-r--r-- | include/asm-ia64/pal.h | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/include/asm-ia64/pal.h b/include/asm-ia64/pal.h index 67656ce767c2..abfcb3a2588f 100644 --- a/include/asm-ia64/pal.h +++ b/include/asm-ia64/pal.h @@ -89,6 +89,8 @@ #define PAL_GET_PSTATE_TYPE_AVGNORESET 2 #define PAL_GET_PSTATE_TYPE_INSTANT 3 +#define PAL_MC_ERROR_INJECT 276 /* Injects processor error or returns injection capabilities */ + #ifndef __ASSEMBLY__ #include <linux/types.h> @@ -1235,6 +1237,37 @@ ia64_pal_mc_error_info (u64 info_index, u64 type_index, u64 *size, u64 *error_in return iprv.status; } +/* Injects the requested processor error or returns info on + * supported injection capabilities for current processor implementation + */ +static inline s64 +ia64_pal_mc_error_inject_phys (u64 err_type_info, u64 err_struct_info, + u64 err_data_buffer, u64 *capabilities, u64 *resources) +{ + struct ia64_pal_retval iprv; + PAL_CALL_PHYS_STK(iprv, PAL_MC_ERROR_INJECT, err_type_info, + err_struct_info, err_data_buffer); + if (capabilities) + *capabilities= iprv.v0; + if (resources) + *resources= iprv.v1; + return iprv.status; +} + +static inline s64 +ia64_pal_mc_error_inject_virt (u64 err_type_info, u64 err_struct_info, + u64 err_data_buffer, u64 *capabilities, u64 *resources) +{ + struct ia64_pal_retval iprv; + PAL_CALL_STK(iprv, PAL_MC_ERROR_INJECT, err_type_info, + err_struct_info, err_data_buffer); + if (capabilities) + *capabilities= iprv.v0; + if (resources) + *resources= iprv.v1; + return iprv.status; +} + /* Inform PALE_CHECK whether a machine check is expected so that PALE_CHECK willnot * attempt to correct any expected machine checks. */ |