diff options
| author | Tsung Yeung <tyeung@us.ibm.com> | 2019-07-10 18:04:18 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-07-11 10:48:29 -0500 |
| commit | 311bb136cadf01f61f148e6978ce3c580b4937dd (patch) | |
| tree | d870ad41098ee7216ac67a1be5976020122358c4 /src | |
| parent | 264bea8053f263073fee6988e860944b4c427637 (diff) | |
| download | blackbird-hostboot-311bb136cadf01f61f148e6978ce3c580b4937dd.tar.gz blackbird-hostboot-311bb136cadf01f61f148e6978ce3c580b4937dd.zip | |
Double nvdimm ops timeout values to accommodate encryption
Encryption requires additional time on certain ops which pushes
the time required close to the timeout value. Double the timeout
values for safety margins.
Change-Id: Idcd147fe613059cb03592d46b36537e882b8e7f2
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/80242
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: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/isteps/nvdimm/nvdimm.C | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/usr/isteps/nvdimm/nvdimm.C b/src/usr/isteps/nvdimm/nvdimm.C index a56856f30..2b3b5d42d 100644 --- a/src/usr/isteps/nvdimm/nvdimm.C +++ b/src/usr/isteps/nvdimm/nvdimm.C @@ -1411,9 +1411,14 @@ errlHndl_t nvdimmGetTimeoutVal(Target* i_nvdimm) //Converting to msec depending on bit 15. 1 = sec, 0 = msec //except for charge. Charge is only in seconds so convert anyway + //Double the timeout values for margins if (timeout_map[i] >= 0x8000 || i == CHARGE){ timeout_map[i] = timeout_map[i] & 0x7FFF; - timeout_map[i] = timeout_map[i] * MS_PER_SEC; + timeout_map[i] = timeout_map[i] * MS_PER_SEC * 2; + } + else + { + timeout_map[i] = timeout_map[i] * 2; } TRACUCOMP(g_trac_nvdimm, "nvdimmGetTimeoutVal() HUID[%X], timeout_idx[%d], timeout_ms[%d]" |
