diff options
| author | Corey Swenson <cswenson@us.ibm.com> | 2019-06-17 13:19:43 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-06-21 19:15:28 -0500 |
| commit | 639cf25d2ace2f3ddc75f30b7ff4317bbcc548c0 (patch) | |
| tree | 59599b86919d9a38dc923e7e8d60d00cc5f67595 /src/usr/targeting | |
| parent | 4b81399d6441708373f5694e5db21fa35633405a (diff) | |
| download | talos-hostboot-639cf25d2ace2f3ddc75f30b7ff4317bbcc548c0.tar.gz talos-hostboot-639cf25d2ace2f3ddc75f30b7ff4317bbcc548c0.zip | |
Move the NVDIMM_ARMED attribute from PROC to DIMM type
The attribute holds status for armed/occ_active/errors.
As DIMM type it will more accurately reflect nvdimm status.
Removed the workaround using the scratch register.
RTC:211510
Change-Id: I8a1c686773fc7d9ba4d2788dc788764f5170c136
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/79068
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Roland Veloz <rveloz@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/targeting')
| -rw-r--r-- | src/usr/targeting/common/xmltohb/target_types.xml | 6 | ||||
| -rwxr-xr-x | src/usr/targeting/targetservicestart.C | 10 |
2 files changed, 5 insertions, 11 deletions
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index 97927aecc..34441ee39 100644 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -649,9 +649,6 @@ <id>LOCATION_CODE</id> </attribute> <attribute> - <id>NVDIMM_ARMED</id> - </attribute> - <attribute> <default> <field> <id>childRollupAllowed</id> @@ -1492,6 +1489,9 @@ <id>MEM_PORT</id> </attribute> <attribute> + <id>NVDIMM_ARMED</id> + </attribute> + <attribute> <id>NV_OPS_TIMEOUT_MSEC</id> </attribute> <attribute> diff --git a/src/usr/targeting/targetservicestart.C b/src/usr/targeting/targetservicestart.C index 8e0d5dcdb..0cce34319 100755 --- a/src/usr/targeting/targetservicestart.C +++ b/src/usr/targeting/targetservicestart.C @@ -595,19 +595,13 @@ static void initializeAttributes(TargetService& i_targetService, for (auto const l_nvdimm : l_nvdimmTargetList) { ATTR_NVDIMM_ARMED_type l_armed_state = {}; - // TODO: RTC 211510 Move ATTR_NVDIMM_ARMED from proc_type to dimm type - //l_armed_state = l_nvdimm->getAttr<ATTR_NVDIMM_ARMED>(); - uint8_t l_tmp = l_nvdimm->getAttr<ATTR_SCRATCH_UINT8_1>(); - memcpy(&l_armed_state, &l_tmp, sizeof(l_tmp)); + l_armed_state = l_nvdimm->getAttr<ATTR_NVDIMM_ARMED>(); // Only force rearming (error setting should persist) l_armed_state.armed = 0; l_armed_state.occ_active = 0; - // TODO: RTC 211510 Move ATTR_NVDIMM_ARMED from proc_type to dimm type - //l_nvdimm->setAttr<ATTR_NVDIMM_ARMED>(l_armed_state); - memcpy(&l_tmp, &l_armed_state, sizeof(l_tmp)); - l_nvdimm->setAttr<ATTR_SCRATCH_UINT8_1>(l_tmp); + l_nvdimm->setAttr<ATTR_NVDIMM_ARMED>(l_armed_state); } if (l_chip == l_pMasterProcChip) |
