Skip to content

Commit

Permalink
Deconfig updates for Axone and OCMB
Browse files Browse the repository at this point in the history 
Added support for MC->MI->MCC->OMI->OCMB path in presentByAssoc and made
changes to checkMinimumHardware that will prevent all dimms from being
incorrectly deconfigured so that AXONE simics is able to reach
iStep 6.11.

Change-Id: I0be474733a78097505c85826a1f34a854144f931
RTC:196804
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/70058
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Ilya Smirnov <ismirno@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
@dcrowell77
Matt Raybuck authored and dcrowell77 committed Jan 16, 2019
1 parent 39295f7 commit 7e7b0b6
Show file tree
Hide file tree
Showing 3 changed files with 503 additions and 34 deletions.
13 changes: 11 additions & 2 deletions src/include/usr/hwas/common/deconfigGard.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,15 @@ public:
DECONFIGURED_BY_NO_CHILD_DIMM, // BASE | 0x0A

// set by presentByAssoc() when a MEMBUF has no MCS
DECONFIGURED_BY_NO_PARENT_DMI, // BASE | 0x0B
DECONFIGURED_BY_NO_PARENT_DMI, // BASE | 0x0B
DECONFIGURED_BY_NO_PARENT_MCS =
DECONFIGURED_BY_NO_PARENT_DMI,
// set by presentByAssoc() when a MEMBUF has no MBAs
DECONFIGURED_BY_NO_CHILD_MBA, // BASE | 0x0C

// set by presentByAssoc() when a DIMM has no MBA or MCA
// set by presentByAssoc() when a DIMM has no MBA or MCA or MEMPORT
//@TODO RTC 196804: Rename to
// DECONFIGURED_BY_NO_PARENT_MBA_OR_MCA_OR_MEMPORT
DECONFIGURED_BY_NO_PARENT_MBA_OR_MCA, // BASE | 0x0D
// TODO RTC 149367 Remove deprecated enumeration once hwsv is not using
DECONFIGURED_BY_NO_PARENT_MBA = //Deprecated
Expand All @@ -183,13 +185,20 @@ public:
DECONFIGURED_BY_DISABLED_PORT, // BASE | 0x16

DECONFIGURED_BY_NO_CHILD_MI, // BASE | 0x17
//@TODO RTC 196804: Rename to DECONFIGURED_BY_NO_CHILD_DMI_OR_MCC
DECONFIGURED_BY_NO_CHILD_DMI, // BASE | 0x18
DECONFIGURED_BY_NO_PARENT_MC, // BASE | 0x19
DECONFIGURED_BY_NO_PARENT_MI, // BASE | 0x1A

DECONFIGURED_BY_NO_MATCHING_LINK_SET, // BASE | 0x1B
//used when we deconfigure unused children of OBUS
DECONFIGURED_BY_OBUS_MODE, // BASE | 0x1C
DECONFIGURED_BY_NO_CHILD_OMI, // BASE | 0x1D
DECONFIGURED_BY_NO_PARENT_MCC, // BASE | 0x1E
DECONFIGURED_BY_NO_CHILD_MEM_PORT, // BASE | 0x1F
DECONFIGURED_BY_NO_PARENT_OMI, // BASE | 0x20
DECONFIGURED_BY_NO_CHILD_OCMB_CHIP, // BASE | 0x21
DECONFIGURED_BY_NO_PARENT_OCMB_CHIP, // BASE | 0x22

// mask - these bits mean it's a PLID and not an enum
DECONFIGURED_BY_PLID_MASK = 0xFFFF0000,
Expand Down
6 changes: 4 additions & 2 deletions src/include/usr/hwas/common/hwas_reasoncodes.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2012,2018 */
/* Contributors Listed Below - COPYRIGHT 2012,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -67,7 +67,9 @@ namespace HWAS
RC_NULL_TARGET = HWAS_COMP_ID | 0x13,
RC_ONLY_TWO_OBUS_SHOULD_BE_CONFIGURED = HWAS_COMP_ID | 0x14,
RC_NO_UPDATE_WHEN_MEM_MISSING = HWAS_COMP_ID | 0x15,
RC_NO_PG_LOGIC = HWAS_COMP_ID | 0x16
RC_NO_PG_LOGIC = HWAS_COMP_ID | 0x16,
RC_SYSAVAIL_NO_OCMBS_FUNC = HWAS_COMP_ID | 0x17,
RC_SYSAVAIL_NO_MEMORY_PRESENT = HWAS_COMP_ID | 0x18,
};
};

Expand Down

0 comments on commit 7e7b0b6

Please sign in to comment.