From 6dfee4834394825da35b977ca71cdc965bc7b6a4 Mon Sep 17 00:00:00 2001 From: tsien Date: Mon, 21 Nov 2005 14:27:45 -0800 Subject: PSARC 2005/465 FMA for UltraSPARC-T1 CPU/Memory 6278369 enhance C-based diagnosis engine for Niagara CPU diagnosis 6336193 FRU FMRI for cpu fault is not in hc: scheme format --HG-- rename : usr/src/cmd/fm/modules/sun4v/cpumem-diagnosis/cmd_memerr_arch.h => deleted_files/usr/src/cmd/fm/modules/sun4v/cpumem-diagnosis/cmd_memerr_arch.h rename : usr/src/cmd/fm/modules/sun4/cpumem-diagnosis/cmd_ecache.c => usr/src/cmd/fm/modules/sun4u/cpumem-diagnosis/cmd_ecache.c rename : usr/src/cmd/fm/modules/sun4/cpumem-diagnosis/cmd_ecache.h => usr/src/cmd/fm/modules/sun4u/cpumem-diagnosis/cmd_ecache.h rename : usr/src/cmd/fm/modules/sun4/cpumem-diagnosis/cpumem-diagnosis.conf => usr/src/cmd/fm/modules/sun4u/cpumem-diagnosis/cpumem-diagnosis.conf rename : usr/src/uts/sun4u/sys/errclassify.h => usr/src/uts/sun4/sys/errclassify.h --- usr/src/uts/common/sys/fm/cpu/UltraSPARC-T1.h | 9 +++++++++ usr/src/uts/common/sys/fm/protocol.h | 2 ++ usr/src/uts/common/sys/mdesc.h | 2 ++ 3 files changed, 13 insertions(+) (limited to 'usr/src/uts/common') diff --git a/usr/src/uts/common/sys/fm/cpu/UltraSPARC-T1.h b/usr/src/uts/common/sys/fm/cpu/UltraSPARC-T1.h index c48622f597..e6ffdfe922 100644 --- a/usr/src/uts/common/sys/fm/cpu/UltraSPARC-T1.h +++ b/usr/src/uts/common/sys/fm/cpu/UltraSPARC-T1.h @@ -50,6 +50,15 @@ extern "C" { #define FM_EREPORT_CPU_UST1_DSU "dsu" #define FM_EREPORT_CPU_UST1_DSC "dsc" +/* + * The following constants are also defined in UltraSPARC-III.h and + * could possibly be moved into a common header file + */ + +#define FM_EREPORT_PAYLOAD_NAME_RESOURCE "resource" +#define FM_EREPORT_PAYLOAD_NAME_ERR_TYPE "error-type" +#define FM_EREPORT_PAYLOAD_NAME_ERR_DISP "error-disposition" + #ifdef __cplusplus } #endif diff --git a/usr/src/uts/common/sys/fm/protocol.h b/usr/src/uts/common/sys/fm/protocol.h index 939dd66c5d..de54f511ea 100644 --- a/usr/src/uts/common/sys/fm/protocol.h +++ b/usr/src/uts/common/sys/fm/protocol.h @@ -216,6 +216,8 @@ extern "C" { #define FM_FMRI_CPU_ID "cpuid" #define FM_FMRI_CPU_SERIAL_ID "serial" #define FM_FMRI_CPU_MASK "cpumask" +#define FM_FMRI_CPU_VID "cpuvid" +#define FM_FMRI_CPU_CPUFRU "cpufru" /* legacy-hc scheme member names */ #define FM_FMRI_LEGACY_HC "component" diff --git a/usr/src/uts/common/sys/mdesc.h b/usr/src/uts/common/sys/mdesc.h index 87e3e8492b..e05374f60e 100644 --- a/usr/src/uts/common/sys/mdesc.h +++ b/usr/src/uts/common/sys/mdesc.h @@ -29,6 +29,8 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include + #ifdef __cplusplus extern "C" { #endif -- cgit v1.2.3