diff options
| author | Corey Swenson <cswenson@us.ibm.com> | 2019-06-27 14:58:35 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-07-01 09:36:17 -0500 |
| commit | 3acea873dad17f9487e7643c866a94363d46f975 (patch) | |
| tree | a9bb1df09351755aeace0aee2424fed5ccc9c93e /src/include | |
| parent | ac003eb126a0ca9d57c26eb339268854b3019671 (diff) | |
| download | talos-hostboot-3acea873dad17f9487e7643c866a94363d46f975.tar.gz talos-hostboot-3acea873dad17f9487e7643c866a94363d46f975.zip | |
Remove dependency on ATTR_NVDIMM_ENCRYPTION_ENABLE for unlock
An eflash will set ATTR_NVDIMM_ENCRYPTION_ENABLE = 0, so only
use HW encryption enabled to decide whether to unlock.
Also need to unlock whenever the nvdimm controller is reset.
Change-Id: I1505573283da5611354dcfb296b1cf488fa8aef9
CQ:SW469014
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/79674
Reviewed-by: Roland Veloz <rveloz@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-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>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/usr/isteps/nvdimm/nvdimm.H | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/include/usr/isteps/nvdimm/nvdimm.H b/src/include/usr/isteps/nvdimm/nvdimm.H index 0bcd51bca..68f1b1c13 100644 --- a/src/include/usr/isteps/nvdimm/nvdimm.H +++ b/src/include/usr/isteps/nvdimm/nvdimm.H @@ -71,6 +71,9 @@ void nvdimm_restore(TARGETING::TargetHandleList &i_nvdimmList); bool nvdimm_update(TARGETING::TargetHandleList &i_nvdimmList); +#endif + + /** * @brief Entry function to NVDIMM unlock encryption * @@ -81,8 +84,6 @@ bool nvdimm_update(TARGETING::TargetHandleList &i_nvdimmList); bool nvdimm_encrypt_unlock(TARGETING::TargetHandleList &i_nvdimmList); -#endif - /** * @brief Entry function to NVDIMM generate keys * Generate encryption keys and set the FW key attribute |
