diff options
author | Caleb Palmer <cnpalmer@us.ibm.com> | 2019-02-15 13:16:40 -0600 |
---|---|---|
committer | Zane C. Shelley <zshelle@us.ibm.com> | 2019-02-22 13:27:00 -0600 |
commit | 76a14521424a12dcfdf82c12f68c74e129790039 (patch) | |
tree | eb2e11e045a462ab91d76312a1d5802e971f6ecf /src/usr/diag/prdf/plat | |
parent | 076b28a8f4452f4d7a1d080daa73c538e32ad343 (diff) | |
download | talos-hostboot-76a14521424a12dcfdf82c12f68c74e129790039.tar.gz talos-hostboot-76a14521424a12dcfdf82c12f68c74e129790039.zip |
Revert "PRD: Initial NVDIMM Support"
This reverts commit 027226769c8b4f6f57c31e5ebbc41eca5ade2a28.
Change-Id: I4b618250a71432121900ac711210723d0129d463
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/72081
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/72277
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>
Diffstat (limited to 'src/usr/diag/prdf/plat')
-rw-r--r-- | src/usr/diag/prdf/plat/prdfPlatServices.C | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/src/usr/diag/prdf/plat/prdfPlatServices.C b/src/usr/diag/prdf/plat/prdfPlatServices.C index bcf5186bc..cf36f634d 100644 --- a/src/usr/diag/prdf/plat/prdfPlatServices.C +++ b/src/usr/diag/prdf/plat/prdfPlatServices.C @@ -107,19 +107,7 @@ uint32_t getScom(TARGETING::TargetHandle_t i_target, BitString& io_bs, size_t bsize = (io_bs.getBitLen()+7)/8; CPU_WORD* buffer = io_bs.getBufAddr(); - // We also want to be able to read the NVDIMMs using this interface, so we - // will assume if we are trying to call this function with a DIMM target - // it is an NVDIMM and adjust the call to deviceRead accordingly. - if ( TYPE_DIMM == getTargetType(i_target) ) - { - errl = deviceRead(i_target, buffer, bsize, - DEVICE_NVDIMM_ADDRESS(i_address)); - } - else - { - errl = deviceRead(i_target, buffer, bsize, - DEVICE_SCOM_ADDRESS(i_address)); - } + errl = deviceRead(i_target, buffer, bsize, DEVICE_SCOM_ADDRESS(i_address)); if ( nullptr != errl ) { @@ -198,19 +186,7 @@ uint32_t putScom(TARGETING::TargetHandle_t i_target, BitString& io_bs, size_t bsize = (io_bs.getBitLen()+7)/8; CPU_WORD* buffer = io_bs.getBufAddr(); - // We also want to be able to write to NVDIMMs using this interface, so we - // will assume if we are trying to call this function with a DIMM target - // it is an NVDIMM and adjust the call to deviceWrite accordingly. - if ( TYPE_DIMM == getTargetType(i_target) ) - { - errl = deviceWrite(i_target, buffer, bsize, - DEVICE_NVDIMM_ADDRESS(i_address)); - } - else - { - errl = deviceWrite(i_target, buffer, bsize, - DEVICE_SCOM_ADDRESS(i_address)); - } + errl = deviceWrite(i_target, buffer, bsize, DEVICE_SCOM_ADDRESS(i_address)); if( NULL != errl ) { |