From 198e80b53d58c506c0db4d5de4eb5b8e4bed2aed Mon Sep 17 00:00:00 2001 From: Nick Bofferding Date: Tue, 14 Oct 2014 17:11:08 -0500 Subject: Move FSP-only attributes to common targeting for Open Power - Added default lane masks to Hostboot system XML files - Added PCIE config related module IDs and reason codes - Added new packing function to combine 4x uint8 into 1x uint32 - Added dynamic PCIE config for SP-less environments - Moved PCIE attributes into common attribute definition - Attached new PCIE attributes to common target definition - Defaulted PCIE lanes per proc appropriately for all proc chips - Added CDM_DOMAIN attribute into common attribute definition - Attached + defaulted CDM domain in common target definition - Updated common MRW parser to customize the new PCIE attributes Change-Id: I3779ca6e6a4803d7e78e21e47a92e0b1a09e657d RTC: 113488 CMVC-coreq: 942076 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/13997 Tested-by: Jenkins Server Reviewed-by: STEPHEN M. CPREK Reviewed-by: Andrew J. Geissler Reviewed-by: A. Patrick Williams III --- src/include/usr/errl/hberrltypes.H | 5 +++++ src/include/usr/hwpf/istepreasoncodes.H | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'src/include/usr') diff --git a/src/include/usr/errl/hberrltypes.H b/src/include/usr/errl/hberrltypes.H index 94e3722a8..e948e4df0 100644 --- a/src/include/usr/errl/hberrltypes.H +++ b/src/include/usr/errl/hberrltypes.H @@ -79,6 +79,11 @@ namespace ERRORLOG { class ErrlEntry; }; ( (TO_UINT64(TWO_UINT16_TO_UINT32(mostleft_16, left_16)) << 32) | \ (TO_UINT64(TWO_UINT16_TO_UINT32(right_16, mostright_16))) ) +// uint32_t val = 8bit:8bit:8bit:8bit +#define FOUR_UINT8_TO_UINT32(mostleft_8, left_8, right_8, mostright_8) \ + ( (TO_UINT32(TWO_UINT8_TO_UINT16(mostleft_8, left_8)) << 16) | \ + (TO_UINT32(TWO_UINT8_TO_UINT16(right_8, mostright_8))) ) + namespace ERRORLOG { diff --git a/src/include/usr/hwpf/istepreasoncodes.H b/src/include/usr/hwpf/istepreasoncodes.H index 1a8314e25..b433701cb 100644 --- a/src/include/usr/hwpf/istepreasoncodes.H +++ b/src/include/usr/hwpf/istepreasoncodes.H @@ -56,6 +56,8 @@ enum istepModuleId ISTEP_HOST_ACTIVATE_MASTER = 0x06, ISTEP_SBE_CENTAUR_INIT = 0x07, ISTEP_ENABLE_CORE_CHECKSTOPS = 0x08, + ISTEP_DECONFIG_PHBS_BASED_ON_PCI_STATE = 0x09, + ISTEP_COMPUTE_PCIE_CONFIG_ATTRS = 0x0A, }; /** @@ -76,6 +78,9 @@ enum istepReasonCode ISTEP_REPAIR_LOADER_RETRY_OCCURED = ISTEP_COMP_ID | 0x07, ISTEP_MM_MAP_ERR = ISTEP_COMP_ID | 0x08, ISTEP_INCORRECT_TARGET_COUNT = ISTEP_COMP_ID | 0x09, + ISTEP_INVALID_TARGET_TYPE = ISTEP_COMP_ID | 0x0A, + ISTEP_INVALID_ATTR_VALUE = ISTEP_COMP_ID | 0x0B, + ISTEP_INVALID_CONFIGURATION = ISTEP_COMP_ID | 0x0C, }; // end ISTEP } -- cgit v1.2.1