Commit 0864708f authored by David Mosberger's avatar David Mosberger

ia64: Minor whitespace & formatting fixups in asm-ia64/sal.h.

parent 19250aed
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
* Copyright (C) 2001 Intel * Copyright (C) 2001 Intel
* Copyright (C) 2002 Jenna Hall <jenna.s.hall@intel.com> * Copyright (C) 2002 Jenna Hall <jenna.s.hall@intel.com>
* Copyright (C) 2001 Fred Lewis <frederick.v.lewis@intel.com> * Copyright (C) 2001 Fred Lewis <frederick.v.lewis@intel.com>
* Copyright (C) 1998, 1999, 2001 Hewlett-Packard Co * Copyright (C) 1998, 1999, 2001, 2003 Hewlett-Packard Co
* Copyright (C) 1998, 1999, 2001 David Mosberger-Tang <davidm@hpl.hp.com> * David Mosberger-Tang <davidm@hpl.hp.com>
* Copyright (C) 1999 Srinivasa Prasad Thirumalachar <sprasad@sprasad.engr.sgi.com> * Copyright (C) 1999 Srinivasa Prasad Thirumalachar <sprasad@sprasad.engr.sgi.com>
* *
* 02/01/04 J. Hall Updated Error Record Structures to conform to July 2001 * 02/01/04 J. Hall Updated Error Record Structures to conform to July 2001
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
* 01/01/03 fvlewis Updated Error Record Structures to conform with Nov. 2000 * 01/01/03 fvlewis Updated Error Record Structures to conform with Nov. 2000
* revision of the SAL spec. * revision of the SAL spec.
* 99/09/29 davidm Updated for SAL 2.6. * 99/09/29 davidm Updated for SAL 2.6.
* 00/03/29 cfleck Updated SAL Error Logging info for processor (SAL 2.6) * 00/03/29 cfleck Updated SAL Error Logging info for processor (SAL 2.6)
* (plus examples of platform error info structures from smariset @ Intel) * (plus examples of platform error info structures from smariset @ Intel)
*/ */
...@@ -208,30 +208,30 @@ extern void ia64_sal_init (struct ia64_sal_systab *sal_systab); ...@@ -208,30 +208,30 @@ extern void ia64_sal_init (struct ia64_sal_systab *sal_systab);
/* SAL information type encodings */ /* SAL information type encodings */
enum { enum {
SAL_INFO_TYPE_MCA = 0, /* Machine check abort information */ SAL_INFO_TYPE_MCA = 0, /* Machine check abort information */
SAL_INFO_TYPE_INIT = 1, /* Init information */ SAL_INFO_TYPE_INIT = 1, /* Init information */
SAL_INFO_TYPE_CMC = 2, /* Corrected machine check information */ SAL_INFO_TYPE_CMC = 2, /* Corrected machine check information */
SAL_INFO_TYPE_CPE = 3 /* Corrected platform error information */ SAL_INFO_TYPE_CPE = 3 /* Corrected platform error information */
}; };
/* Encodings for machine check parameter types */ /* Encodings for machine check parameter types */
enum { enum {
SAL_MC_PARAM_RENDEZ_INT = 1, /* Rendezevous interrupt */ SAL_MC_PARAM_RENDEZ_INT = 1, /* Rendezevous interrupt */
SAL_MC_PARAM_RENDEZ_WAKEUP = 2, /* Wakeup */ SAL_MC_PARAM_RENDEZ_WAKEUP = 2, /* Wakeup */
SAL_MC_PARAM_CPE_INT = 3 /* Corrected Platform Error Int */ SAL_MC_PARAM_CPE_INT = 3 /* Corrected Platform Error Int */
}; };
/* Encodings for rendezvous mechanisms */ /* Encodings for rendezvous mechanisms */
enum { enum {
SAL_MC_PARAM_MECHANISM_INT = 1, /* Use interrupt */ SAL_MC_PARAM_MECHANISM_INT = 1, /* Use interrupt */
SAL_MC_PARAM_MECHANISM_MEM = 2 /* Use memory synchronization variable*/ SAL_MC_PARAM_MECHANISM_MEM = 2 /* Use memory synchronization variable*/
}; };
/* Encodings for vectors which can be registered by the OS with SAL */ /* Encodings for vectors which can be registered by the OS with SAL */
enum { enum {
SAL_VECTOR_OS_MCA = 0, SAL_VECTOR_OS_MCA = 0,
SAL_VECTOR_OS_INIT = 1, SAL_VECTOR_OS_INIT = 1,
SAL_VECTOR_OS_BOOT_RENDEZ = 2 SAL_VECTOR_OS_BOOT_RENDEZ = 2
}; };
/* Encodings for mca_opt parameter sent to SAL_MC_SET_PARAMS */ /* Encodings for mca_opt parameter sent to SAL_MC_SET_PARAMS */
...@@ -239,387 +239,349 @@ enum { ...@@ -239,387 +239,349 @@ enum {
#define SAL_MC_PARAM_BINIT_ESCALATE 0x10 #define SAL_MC_PARAM_BINIT_ESCALATE 0x10
/* /*
** Definition of the SAL Error Log from the SAL spec * Definition of the SAL Error Log from the SAL spec
*/ */
/* SAL Error Record Section GUID Definitions */ /* SAL Error Record Section GUID Definitions */
#define SAL_PROC_DEV_ERR_SECT_GUID \ #define SAL_PROC_DEV_ERR_SECT_GUID \
EFI_GUID ( 0xe429faf1, 0x3cb7, 0x11d4, 0xbc, 0xa7, 0x0, 0x80, \ EFI_GUID(0xe429faf1, 0x3cb7, 0x11d4, 0xbc, 0xa7, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81)
0xc7, 0x3c, 0x88, 0x81 )
#define SAL_PLAT_MEM_DEV_ERR_SECT_GUID \ #define SAL_PLAT_MEM_DEV_ERR_SECT_GUID \
EFI_GUID( 0xe429faf2, 0x3cb7, 0x11d4, 0xbc, 0xa7, 0x0, 0x80, \ EFI_GUID(0xe429faf2, 0x3cb7, 0x11d4, 0xbc, 0xa7, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81)
0xc7, 0x3c, 0x88, 0x81 )
#define SAL_PLAT_SEL_DEV_ERR_SECT_GUID \ #define SAL_PLAT_SEL_DEV_ERR_SECT_GUID \
EFI_GUID( 0xe429faf3, 0x3cb7, 0x11d4, 0xbc, 0xa7, 0x0, 0x80, \ EFI_GUID(0xe429faf3, 0x3cb7, 0x11d4, 0xbc, 0xa7, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81)
0xc7, 0x3c, 0x88, 0x81 )
#define SAL_PLAT_PCI_BUS_ERR_SECT_GUID \ #define SAL_PLAT_PCI_BUS_ERR_SECT_GUID \
EFI_GUID( 0xe429faf4, 0x3cb7, 0x11d4, 0xbc, 0xa7, 0x0, 0x80, \ EFI_GUID(0xe429faf4, 0x3cb7, 0x11d4, 0xbc, 0xa7, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81)
0xc7, 0x3c, 0x88, 0x81 )
#define SAL_PLAT_SMBIOS_DEV_ERR_SECT_GUID \ #define SAL_PLAT_SMBIOS_DEV_ERR_SECT_GUID \
EFI_GUID( 0xe429faf5, 0x3cb7, 0x11d4, 0xbc, 0xa7, 0x0, 0x80, \ EFI_GUID(0xe429faf5, 0x3cb7, 0x11d4, 0xbc, 0xa7, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81)
0xc7, 0x3c, 0x88, 0x81 )
#define SAL_PLAT_PCI_COMP_ERR_SECT_GUID \ #define SAL_PLAT_PCI_COMP_ERR_SECT_GUID \
EFI_GUID( 0xe429faf6, 0x3cb7, 0x11d4, 0xbc, 0xa7, 0x0, 0x80, \ EFI_GUID(0xe429faf6, 0x3cb7, 0x11d4, 0xbc, 0xa7, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81)
0xc7, 0x3c, 0x88, 0x81 )
#define SAL_PLAT_SPECIFIC_ERR_SECT_GUID \ #define SAL_PLAT_SPECIFIC_ERR_SECT_GUID \
EFI_GUID( 0xe429faf7, 0x3cb7, 0x11d4, 0xbc, 0xa7, 0x0, 0x80, \ EFI_GUID(0xe429faf7, 0x3cb7, 0x11d4, 0xbc, 0xa7, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81)
0xc7, 0x3c, 0x88, 0x81 )
#define SAL_PLAT_HOST_CTLR_ERR_SECT_GUID \ #define SAL_PLAT_HOST_CTLR_ERR_SECT_GUID \
EFI_GUID( 0xe429faf8, 0x3cb7, 0x11d4, 0xbc, 0xa7, 0x0, 0x80, \ EFI_GUID(0xe429faf8, 0x3cb7, 0x11d4, 0xbc, 0xa7, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81)
0xc7, 0x3c, 0x88, 0x81 )
#define SAL_PLAT_BUS_ERR_SECT_GUID \ #define SAL_PLAT_BUS_ERR_SECT_GUID \
EFI_GUID( 0xe429faf9, 0x3cb7, 0x11d4, 0xbc, 0xa7, 0x0, 0x80, \ EFI_GUID(0xe429faf9, 0x3cb7, 0x11d4, 0xbc, 0xa7, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81)
0xc7, 0x3c, 0x88, 0x81 )
#define MAX_CACHE_ERRORS 6 #define MAX_CACHE_ERRORS 6
#define MAX_TLB_ERRORS 6 #define MAX_TLB_ERRORS 6
#define MAX_BUS_ERRORS 1 #define MAX_BUS_ERRORS 1
/* Definition of version according to SAL spec for logging purposes */ /* Definition of version according to SAL spec for logging purposes */
typedef struct sal_log_revision typedef struct sal_log_revision {
{ u8 minor; /* BCD (0..99) */
u8 minor; /* BCD (0..99) */ u8 major; /* BCD (0..99) */
u8 major; /* BCD (0..99) */
} sal_log_revision_t; } sal_log_revision_t;
/* Definition of timestamp according to SAL spec for logging purposes */ /* Definition of timestamp according to SAL spec for logging purposes */
typedef struct sal_log_timestamp typedef struct sal_log_timestamp {
{
u8 slh_second; /* Second (0..59) */ u8 slh_second; /* Second (0..59) */
u8 slh_minute; /* Minute (0..59) */ u8 slh_minute; /* Minute (0..59) */
u8 slh_hour; /* Hour (0..23) */ u8 slh_hour; /* Hour (0..23) */
u8 slh_reserved; u8 slh_reserved;
u8 slh_day; /* Day (1..31) */ u8 slh_day; /* Day (1..31) */
u8 slh_month; /* Month (1..12) */ u8 slh_month; /* Month (1..12) */
u8 slh_year; /* Year (00..99) */ u8 slh_year; /* Year (00..99) */
u8 slh_century; /* Century (19, 20, 21, ...) */ u8 slh_century; /* Century (19, 20, 21, ...) */
} sal_log_timestamp_t; } sal_log_timestamp_t;
/* Definition of log record header structures */ /* Definition of log record header structures */
typedef struct sal_log_record_header typedef struct sal_log_record_header {
{ u64 id; /* Unique monotonically increasing ID */
u64 id; /* Unique monotonically increasing ID */ sal_log_revision_t revision; /* Major and Minor revision of header */
sal_log_revision_t revision; /* Major and Minor revision of header */ u16 severity; /* Error Severity */
u16 severity; /* Error Severity */ u32 len; /* Length of this error log in bytes */
u32 len; /* Length of this error log in bytes */ sal_log_timestamp_t timestamp; /* Timestamp */
sal_log_timestamp_t timestamp; /* Timestamp */ efi_guid_t platform_guid; /* Unique OEM Platform ID */
efi_guid_t platform_guid; /* Unique OEM Platform ID */
} sal_log_record_header_t; } sal_log_record_header_t;
/* Definition of log section header structures */ /* Definition of log section header structures */
typedef struct sal_log_sec_header typedef struct sal_log_sec_header {
{ efi_guid_t guid; /* Unique Section ID */
efi_guid_t guid; /* Unique Section ID */ sal_log_revision_t revision; /* Major and Minor revision of Section */
sal_log_revision_t revision; /* Major and Minor revision of Section */ u16 reserved;
u16 reserved; u32 len; /* Section length */
u32 len; /* Section length */
} sal_log_section_hdr_t; } sal_log_section_hdr_t;
typedef struct sal_log_mod_error_info typedef struct sal_log_mod_error_info {
{ struct {
struct u64 check_info : 1,
{ requestor_identifier : 1,
u64 check_info : 1, responder_identifier : 1,
requestor_identifier : 1, target_identifier : 1,
responder_identifier : 1, precise_ip : 1,
target_identifier : 1, reserved : 59;
precise_ip : 1, } valid;
reserved : 59; u64 check_info;
} valid; u64 requestor_identifier;
u64 check_info; u64 responder_identifier;
u64 requestor_identifier; u64 target_identifier;
u64 responder_identifier; u64 precise_ip;
u64 target_identifier;
u64 precise_ip;
} sal_log_mod_error_info_t; } sal_log_mod_error_info_t;
typedef struct sal_processor_static_info typedef struct sal_processor_static_info {
{ struct {
struct u64 minstate : 1,
{ br : 1,
u64 minstate : 1, cr : 1,
br : 1, ar : 1,
cr : 1, rr : 1,
ar : 1, fr : 1,
rr : 1, reserved : 58;
fr : 1, } valid;
reserved : 58; pal_min_state_area_t min_state_area;
} valid; u64 br[8];
pal_min_state_area_t min_state_area; u64 cr[128];
u64 br[8]; u64 ar[128];
u64 cr[128]; u64 rr[8];
u64 ar[128]; struct ia64_fpreg fr[128];
u64 rr[8];
struct ia64_fpreg fr[128];
} sal_processor_static_info_t; } sal_processor_static_info_t;
typedef struct sal_log_processor_info typedef struct sal_log_processor_info {
{ sal_log_section_hdr_t header;
sal_log_section_hdr_t header; struct {
struct u64 proc_error_map : 1,
{ proc_state_param : 1,
u64 proc_error_map : 1, proc_cr_lid : 1,
proc_state_param : 1, psi_static_struct : 1,
proc_cr_lid : 1, num_cache_check : 4,
psi_static_struct : 1, num_tlb_check : 4,
num_cache_check : 4, num_bus_check : 4,
num_tlb_check : 4, num_reg_file_check : 4,
num_bus_check : 4, num_ms_check : 4,
num_reg_file_check : 4, cpuid_info : 1,
num_ms_check : 4, reserved1 : 39;
cpuid_info : 1, } valid;
reserved1 : 39; u64 proc_error_map;
} valid; u64 proc_state_parameter;
u64 proc_error_map; u64 proc_cr_lid;
u64 proc_state_parameter; sal_log_mod_error_info_t cache_check_info[16];
u64 proc_cr_lid; sal_log_mod_error_info_t tlb_check_info[16];
sal_log_mod_error_info_t cache_check_info[16]; sal_log_mod_error_info_t bus_check_info[16];
sal_log_mod_error_info_t tlb_check_info[16]; sal_log_mod_error_info_t reg_file_check_info[16];
sal_log_mod_error_info_t bus_check_info[16]; sal_log_mod_error_info_t ms_check_info[16];
sal_log_mod_error_info_t reg_file_check_info[16]; struct {
sal_log_mod_error_info_t ms_check_info[16]; u64 regs[5];
struct u64 reserved;
{ } cpuid_info;
u64 regs[5]; sal_processor_static_info_t processor_static_info;
u64 reserved;
} cpuid_info;
sal_processor_static_info_t processor_static_info;
} sal_log_processor_info_t; } sal_log_processor_info_t;
/* platform error log structures */ /* platform error log structures */
typedef struct sal_log_mem_dev_err_info typedef struct sal_log_mem_dev_err_info {
{ sal_log_section_hdr_t header;
sal_log_section_hdr_t header; struct {
struct u64 error_status : 1,
{ physical_addr : 1,
u64 error_status : 1, addr_mask : 1,
physical_addr : 1, node : 1,
addr_mask : 1, card : 1,
node : 1, module : 1,
card : 1, bank : 1,
module : 1, device : 1,
bank : 1, row : 1,
device : 1, column : 1,
row : 1, bit_position : 1,
column : 1, requestor_id : 1,
bit_position : 1, responder_id : 1,
requestor_id : 1, target_id : 1,
responder_id : 1, bus_spec_data : 1,
target_id : 1, oem_id : 1,
bus_spec_data : 1, oem_data : 1,
oem_id : 1, reserved : 47;
oem_data : 1, } valid;
reserved : 47; u64 error_status;
} valid; u64 physical_addr;
u64 error_status; u64 addr_mask;
u64 physical_addr; u16 node;
u64 addr_mask; u16 card;
u16 node; u16 module;
u16 card; u16 bank;
u16 module; u16 device;
u16 bank; u16 row;
u16 device; u16 column;
u16 row; u16 bit_position;
u16 column; u64 requestor_id;
u16 bit_position; u64 responder_id;
u64 requestor_id; u64 target_id;
u64 responder_id; u64 bus_spec_data;
u64 target_id; u8 oem_id[16];
u64 bus_spec_data; u8 oem_data[1]; /* Variable length data */
u8 oem_id[16];
u8 oem_data[1]; /* Variable length data */
} sal_log_mem_dev_err_info_t; } sal_log_mem_dev_err_info_t;
typedef struct sal_log_sel_dev_err_info typedef struct sal_log_sel_dev_err_info {
{ sal_log_section_hdr_t header;
sal_log_section_hdr_t header; struct {
struct u64 record_id : 1,
{ record_type : 1,
u64 record_id : 1, generator_id : 1,
record_type : 1, evm_rev : 1,
generator_id : 1, sensor_type : 1,
evm_rev : 1, sensor_num : 1,
sensor_type : 1, event_dir : 1,
sensor_num : 1, event_data1 : 1,
event_dir : 1, event_data2 : 1,
event_data1 : 1, event_data3 : 1,
event_data2 : 1, reserved : 54;
event_data3 : 1, } valid;
reserved : 54; u16 record_id;
} valid; u8 record_type;
u16 record_id; u8 timestamp[4];
u8 record_type; u16 generator_id;
u8 timestamp[4]; u8 evm_rev;
u16 generator_id; u8 sensor_type;
u8 evm_rev; u8 sensor_num;
u8 sensor_type; u8 event_dir;
u8 sensor_num; u8 event_data1;
u8 event_dir; u8 event_data2;
u8 event_data1; u8 event_data3;
u8 event_data2;
u8 event_data3;
} sal_log_sel_dev_err_info_t; } sal_log_sel_dev_err_info_t;
typedef struct sal_log_pci_bus_err_info typedef struct sal_log_pci_bus_err_info {
{ sal_log_section_hdr_t header;
sal_log_section_hdr_t header; struct {
struct u64 err_status : 1,
{ err_type : 1,
u64 err_status : 1, bus_id : 1,
err_type : 1, bus_address : 1,
bus_id : 1, bus_data : 1,
bus_address : 1, bus_cmd : 1,
bus_data : 1, requestor_id : 1,
bus_cmd : 1, responder_id : 1,
requestor_id : 1, target_id : 1,
responder_id : 1, oem_data : 1,
target_id : 1, reserved : 54;
oem_data : 1, } valid;
reserved : 54; u64 err_status;
} valid; u16 err_type;
u64 err_status; u16 bus_id;
u16 err_type; u32 reserved;
u16 bus_id; u64 bus_address;
u32 reserved; u64 bus_data;
u64 bus_address; u64 bus_cmd;
u64 bus_data; u64 requestor_id;
u64 bus_cmd; u64 responder_id;
u64 requestor_id; u64 target_id;
u64 responder_id; u8 oem_data[1]; /* Variable length data */
u64 target_id;
u8 oem_data[1]; /* Variable length data */
} sal_log_pci_bus_err_info_t; } sal_log_pci_bus_err_info_t;
typedef struct sal_log_smbios_dev_err_info typedef struct sal_log_smbios_dev_err_info {
{ sal_log_section_hdr_t header;
sal_log_section_hdr_t header; struct {
struct u64 event_type : 1,
{ length : 1,
u64 event_type : 1, time_stamp : 1,
length : 1, data : 1,
time_stamp : 1, reserved1 : 60;
data : 1, } valid;
reserved1 : 60; u8 event_type;
} valid; u8 length;
u8 event_type; u8 time_stamp[6];
u8 length; u8 data[1]; /* data of variable length, length == slsmb_length */
u8 time_stamp[6];
u8 data[1]; // data of variable length, length == slsmb_length
} sal_log_smbios_dev_err_info_t; } sal_log_smbios_dev_err_info_t;
typedef struct sal_log_pci_comp_err_info typedef struct sal_log_pci_comp_err_info {
{ sal_log_section_hdr_t header;
sal_log_section_hdr_t header; struct {
struct u64 err_status : 1,
{ comp_info : 1,
u64 err_status : 1, num_mem_regs : 1,
comp_info : 1, num_io_regs : 1,
num_mem_regs : 1, reg_data_pairs : 1,
num_io_regs : 1, oem_data : 1,
reg_data_pairs : 1, reserved : 58;
oem_data : 1, } valid;
reserved : 58; u64 err_status;
} valid; struct {
u64 err_status; u16 vendor_id;
struct u16 device_id;
{ u8 class_code[3];
u16 vendor_id; u8 func_num;
u16 device_id; u8 dev_num;
u8 class_code[3]; u8 bus_num;
u8 func_num; u8 seg_num;
u8 dev_num; u8 reserved[5];
u8 bus_num; } comp_info;
u8 seg_num; u32 num_mem_regs;
u8 reserved[5]; u32 num_io_regs;
} comp_info; u64 reg_data_pairs[1];
u32 num_mem_regs; /*
u32 num_io_regs; * array of address/data register pairs is num_mem_regs + num_io_regs elements
u64 reg_data_pairs[1]; * long. Each array element consists of a u64 address followed by a u64 data
/* array of address/data register pairs is num_mem_regs + num_io_regs * value. The oem_data array immediately follows the reg_data_pairs array
elements long. Each array element consists of a u64 address followed */
by a u64 data value. The oem_data array immediately follows the u8 oem_data[1]; /* Variable length data */
reg_data_pairs array */
u8 oem_data[1]; /* Variable length data */
} sal_log_pci_comp_err_info_t; } sal_log_pci_comp_err_info_t;
typedef struct sal_log_plat_specific_err_info typedef struct sal_log_plat_specific_err_info {
{ sal_log_section_hdr_t header;
sal_log_section_hdr_t header; struct {
struct u64 err_status : 1,
{ guid : 1,
u64 err_status : 1, oem_data : 1,
guid : 1, reserved : 61;
oem_data : 1, } valid;
reserved : 61; u64 err_status;
} valid; efi_guid_t guid;
u64 err_status; u8 oem_data[1]; /* platform specific variable length data */
efi_guid_t guid;
u8 oem_data[1]; /* platform specific variable length data */
} sal_log_plat_specific_err_info_t; } sal_log_plat_specific_err_info_t;
typedef struct sal_log_host_ctlr_err_info typedef struct sal_log_host_ctlr_err_info {
{ sal_log_section_hdr_t header;
sal_log_section_hdr_t header; struct {
struct u64 err_status : 1,
{ requestor_id : 1,
u64 err_status : 1, responder_id : 1,
requestor_id : 1, target_id : 1,
responder_id : 1, bus_spec_data : 1,
target_id : 1, oem_data : 1,
bus_spec_data : 1, reserved : 58;
oem_data : 1, } valid;
reserved : 58; u64 err_status;
} valid; u64 requestor_id;
u64 err_status; u64 responder_id;
u64 requestor_id; u64 target_id;
u64 responder_id; u64 bus_spec_data;
u64 target_id; u8 oem_data[1]; /* Variable length OEM data */
u64 bus_spec_data;
u8 oem_data[1]; /* Variable length OEM data */
} sal_log_host_ctlr_err_info_t; } sal_log_host_ctlr_err_info_t;
typedef struct sal_log_plat_bus_err_info typedef struct sal_log_plat_bus_err_info {
{ sal_log_section_hdr_t header;
sal_log_section_hdr_t header; struct {
struct u64 err_status : 1,
{ requestor_id : 1,
u64 err_status : 1, responder_id : 1,
requestor_id : 1, target_id : 1,
responder_id : 1, bus_spec_data : 1,
target_id : 1, oem_data : 1,
bus_spec_data : 1, reserved : 58;
oem_data : 1, } valid;
reserved : 58; u64 err_status;
} valid; u64 requestor_id;
u64 err_status; u64 responder_id;
u64 requestor_id; u64 target_id;
u64 responder_id; u64 bus_spec_data;
u64 target_id; u8 oem_data[1]; /* Variable length OEM data */
u64 bus_spec_data;
u8 oem_data[1]; /* Variable length OEM data */
} sal_log_plat_bus_err_info_t; } sal_log_plat_bus_err_info_t;
/* Overall platform error section structure */ /* Overall platform error section structure */
typedef union sal_log_platform_err_info typedef union sal_log_platform_err_info {
{ sal_log_mem_dev_err_info_t mem_dev_err;
sal_log_mem_dev_err_info_t mem_dev_err; sal_log_sel_dev_err_info_t sel_dev_err;
sal_log_sel_dev_err_info_t sel_dev_err; sal_log_pci_bus_err_info_t pci_bus_err;
sal_log_pci_bus_err_info_t pci_bus_err; sal_log_smbios_dev_err_info_t smbios_dev_err;
sal_log_smbios_dev_err_info_t smbios_dev_err; sal_log_pci_comp_err_info_t pci_comp_err;
sal_log_pci_comp_err_info_t pci_comp_err; sal_log_plat_specific_err_info_t plat_specific_err;
sal_log_plat_specific_err_info_t plat_specific_err; sal_log_host_ctlr_err_info_t host_ctlr_err;
sal_log_host_ctlr_err_info_t host_ctlr_err; sal_log_plat_bus_err_info_t plat_bus_err;
sal_log_plat_bus_err_info_t plat_bus_err;
} sal_log_platform_err_info_t; } sal_log_platform_err_info_t;
/* SAL log over-all, multi-section error record structure (processor+platform) */ /* SAL log over-all, multi-section error record structure (processor+platform) */
typedef struct err_rec typedef struct err_rec {
{ sal_log_record_header_t sal_elog_header;
sal_log_record_header_t sal_elog_header; sal_log_processor_info_t proc_err;
sal_log_processor_info_t proc_err; sal_log_platform_err_info_t plat_err;
sal_log_platform_err_info_t plat_err; u8 oem_data_pad[1024];
u8 oem_data_pad[1024];
} ia64_err_rec_t; } ia64_err_rec_t;
/* /*
...@@ -648,7 +610,6 @@ ia64_sal_cache_flush (u64 cache_type) ...@@ -648,7 +610,6 @@ ia64_sal_cache_flush (u64 cache_type)
} }
/* Initialize all the processor and platform level instruction and data caches */ /* Initialize all the processor and platform level instruction and data caches */
static inline s64 static inline s64
ia64_sal_cache_init (void) ia64_sal_cache_init (void)
...@@ -658,8 +619,9 @@ ia64_sal_cache_init (void) ...@@ -658,8 +619,9 @@ ia64_sal_cache_init (void)
return isrv.status; return isrv.status;
} }
/* Clear the processor and platform information logged by SAL with respect to the /*
* machine state at the time of MCA's, INITs, CMCs, or CPEs. * Clear the processor and platform information logged by SAL with respect to the machine
* state at the time of MCA's, INITs, CMCs, or CPEs.
*/ */
static inline s64 static inline s64
ia64_sal_clear_state_info (u64 sal_info_type) ia64_sal_clear_state_info (u64 sal_info_type)
...@@ -684,9 +646,11 @@ ia64_sal_get_state_info (u64 sal_info_type, u64 *sal_info) ...@@ -684,9 +646,11 @@ ia64_sal_get_state_info (u64 sal_info_type, u64 *sal_info)
return 0; return 0;
return isrv.v0; return isrv.v0;
} }
/* Get the maximum size of the information logged by SAL with respect to the machine
* state at the time of MCAs, INITs, CMCs, or CPEs. /*
* Get the maximum size of the information logged by SAL with respect to the machine state
* at the time of MCAs, INITs, CMCs, or CPEs.
*/ */
static inline u64 static inline u64
ia64_sal_get_state_info_size (u64 sal_info_type) ia64_sal_get_state_info_size (u64 sal_info_type)
...@@ -699,8 +663,9 @@ ia64_sal_get_state_info_size (u64 sal_info_type) ...@@ -699,8 +663,9 @@ ia64_sal_get_state_info_size (u64 sal_info_type)
return isrv.v0; return isrv.v0;
} }
/* Causes the processor to go into a spin loop within SAL where SAL awaits a wakeup /*
* from the monarch processor. * Causes the processor to go into a spin loop within SAL where SAL awaits a wakeup from
* the monarch processor.
*/ */
static inline s64 static inline s64
ia64_sal_mc_rendez (void) ia64_sal_mc_rendez (void)
...@@ -710,15 +675,17 @@ ia64_sal_mc_rendez (void) ...@@ -710,15 +675,17 @@ ia64_sal_mc_rendez (void)
return isrv.status; return isrv.status;
} }
/* Allow the OS to specify the interrupt number to be used by SAL to interrupt OS during /*
* the machine check rendezvous sequence as well as the mechanism to wake up the * Allow the OS to specify the interrupt number to be used by SAL to interrupt OS during
* the machine check rendezvous sequence as well as the mechanism to wake up the
* non-monarch processor at the end of machine check processing. * non-monarch processor at the end of machine check processing.
*/ */
static inline s64 static inline s64
ia64_sal_mc_set_params (u64 param_type, u64 i_or_m, u64 i_or_m_val, u64 timeout, u64 rz_always) ia64_sal_mc_set_params (u64 param_type, u64 i_or_m, u64 i_or_m_val, u64 timeout, u64 rz_always)
{ {
struct ia64_sal_retval isrv; struct ia64_sal_retval isrv;
SAL_CALL(isrv, SAL_MC_SET_PARAMS, param_type, i_or_m, i_or_m_val, timeout, rz_always, 0, 0); SAL_CALL(isrv, SAL_MC_SET_PARAMS, param_type, i_or_m, i_or_m_val,
timeout, rz_always, 0, 0);
return isrv.status; return isrv.status;
} }
...@@ -744,8 +711,8 @@ ia64_sal_pci_config_write (u64 pci_config_addr, u64 size, u64 value) ...@@ -744,8 +711,8 @@ ia64_sal_pci_config_write (u64 pci_config_addr, u64 size, u64 value)
} }
/* /*
* Register physical addresses of locations needed by SAL when SAL * Register physical addresses of locations needed by SAL when SAL procedures are invoked
* procedures are invoked in virtual mode. * in virtual mode.
*/ */
static inline s64 static inline s64
ia64_sal_register_physical_addr (u64 phys_entry, u64 phys_addr) ia64_sal_register_physical_addr (u64 phys_entry, u64 phys_addr)
...@@ -756,9 +723,10 @@ ia64_sal_register_physical_addr (u64 phys_entry, u64 phys_addr) ...@@ -756,9 +723,10 @@ ia64_sal_register_physical_addr (u64 phys_entry, u64 phys_addr)
return isrv.status; return isrv.status;
} }
/* Register software dependent code locations within SAL. These locations are handlers /*
* or entry points where SAL will pass control for the specified event. These event * Register software dependent code locations within SAL. These locations are handlers or
* handlers are for the bott rendezvous, MCAs and INIT scenarios. * entry points where SAL will pass control for the specified event. These event handlers
* are for the bott rendezvous, MCAs and INIT scenarios.
*/ */
static inline s64 static inline s64
ia64_sal_set_vectors (u64 vector_type, ia64_sal_set_vectors (u64 vector_type,
...@@ -768,10 +736,11 @@ ia64_sal_set_vectors (u64 vector_type, ...@@ -768,10 +736,11 @@ ia64_sal_set_vectors (u64 vector_type,
struct ia64_sal_retval isrv; struct ia64_sal_retval isrv;
SAL_CALL(isrv, SAL_SET_VECTORS, vector_type, SAL_CALL(isrv, SAL_SET_VECTORS, vector_type,
handler_addr1, gp1, handler_len1, handler_addr1, gp1, handler_len1,
handler_addr2, gp2, handler_len2); handler_addr2, gp2, handler_len2);
return isrv.status; return isrv.status;
} }
/* Update the contents of PAL block in the non-volatile storage device */ /* Update the contents of PAL block in the non-volatile storage device */
static inline s64 static inline s64
ia64_sal_update_pal (u64 param_buf, u64 scratch_buf, u64 scratch_buf_size, ia64_sal_update_pal (u64 param_buf, u64 scratch_buf, u64 scratch_buf_size,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment