Additional changes to support new NPU_MMIO_BAR attributes

Change-Id: I4da9edd752f45d3066210d100ad8e280ffcdabdb
CQ:SW295054
Backport: release-fips830
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/17077
Tested-by: Jenkins Server
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 0 insertions, 54 deletions

diff --git a/src/include/usr/hwpf/plat/fapiPlatAttributeService.H b/src/include/usr/hwpf/plat/fapiPlatAttributeService.H
index 11d519077..e08b79629 100644
--- a/src/include/usr/hwpf/plat/fapiPlatAttributeService.H
+++ b/src/include/usr/hwpf/plat/fapiPlatAttributeService.H
@@ -430,51 +430,6 @@ fapi::ReturnCode fapiPlatGetProcPcieBarSize (
 
 /**
  * @brief This function is called by the FAPI_ATTR_GET macro when getting
- * ATTR_PROC_NPU_MMIO_BAR_ENABLE
- * It should not be called directly.
- *
- *  @param[in]  i_pTarget       Target pointer
- *  @param[out] o_mmioBarEnable NPU MMIO Bar Enable
- *                          @note:  the array size of 4,2 was pulled from
- *                          the xml file and is not expected to change.
- *  @return     ReturnCode. Zero on success, else platform specified error
- */
-fapi::ReturnCode fapiPlatGetNpuMmioBarEnable (
-                                    const fapi::Target * i_pTarget,
-                                    uint8_t    (&o_mmioBarEnable) [4][2] );
-
-/**
- * @brief This function is called by the FAPI_ATTR_GET macro when getting
- * ATTR_PROC_NPU_MMIO_BAR_BASE_ADDR
- * It should not be called directly.
- *
- *  @param[in]  i_pTarget         Target pointer
- *  @param[out] o_mmioBarBaseAddr NPU MMIO Bar Base Address
- *                          @note:  the array size of 4,2 was pulled from
- *                          the xml file and is not expected to change.
- *  @return     ReturnCode. Zero on success, else platform specified error
- */
-fapi::ReturnCode fapiPlatGetNpuMmioBarBaseAddr (
-                                    const fapi::Target * i_pTarget,
-                                    uint64_t    (&o_mmioBarBaseAddr) [4][2] );
-
-/**
- * @brief This function is called by the FAPI_ATTR_GET macro when getting
- * ATTR_PROC_NPU_MMIO_BAR_SIZE
- * It should not be called directly.
- *
- *  @param[in]  i_pTarget       Target pointer
- *  @param[out] o_mmioBarSize   NPU MMIO Bar Size
- *                          @note:  the array size of 4,2 was pulled from
- *                          the xml file and is not expected to change.
- *  @return     ReturnCode. Zero on success, else platform specified error
- */
-fapi::ReturnCode fapiPlatGetNpuMmioBarSize (
-                                    const fapi::Target * i_pTarget,
-                                    uint64_t    (&o_mmioBarSize) [4][2] );
-
-/**
- * @brief This function is called by the FAPI_ATTR_GET macro when getting
  * ATTR_EX_L2_SINGLE_MEMBER_ENABLE. It should not be called directly.
  *
  *  @param[in]  i_pTarget Target MB pointer
@@ -1235,15 +1190,6 @@ fapi::ReturnCode fapiPlatGetRCDCntlWord015 (const fapi::Target * i_pTarget,
 #define ATTR_PROC_PCIE_BAR_SIZE_GETMACRO( ID, PTARGET, VAL )   \
     fapi::AttrOverrideSync::getAttrOverrideFunc(fapi::ID, PTARGET, &VAL) ? fapi::FAPI_RC_SUCCESS : \
     fapi::platAttrSvc::fapiPlatGetProcPcieBarSize (PTARGET, VAL )
-#define ATTR_PROC_NPU_MMIO_BAR_ENABLE_GETMACRO( ID, PTARGET, VAL )   \
-    fapi::AttrOverrideSync::getAttrOverrideFunc(fapi::ID, PTARGET, &VAL) ? fapi::FAPI_RC_SUCCESS : \
-    fapi::platAttrSvc::fapiPlatGetNpuMmioBarEnable (PTARGET, VAL )
-#define ATTR_PROC_NPU_MMIO_BAR_BASE_ADDR_GETMACRO( ID, PTARGET, VAL )   \
-    fapi::AttrOverrideSync::getAttrOverrideFunc(fapi::ID, PTARGET, &VAL) ? fapi::FAPI_RC_SUCCESS : \
-    fapi::platAttrSvc::fapiPlatGetNpuMmioBarBaseAddr (PTARGET, VAL )
-#define ATTR_PROC_NPU_MMIO_BAR_SIZE_GETMACRO( ID, PTARGET, VAL )   \
-    fapi::AttrOverrideSync::getAttrOverrideFunc(fapi::ID, PTARGET, &VAL) ? fapi::FAPI_RC_SUCCESS : \
-    fapi::platAttrSvc::fapiPlatGetNpuMmioBarSize (PTARGET, VAL )
 
 //------------------------------------------------------------------------------
 //  MACROS to support enable attributes in p8_xip_customize_attributes.xml