From 73c0a7c9842c19f6758feb1fe7a466a7d7183a17 Mon Sep 17 00:00:00 2001 From: Van Lee Date: Mon, 9 Jan 2012 22:21:17 -0600 Subject: HWPF Attribute Support: L2/L3 epsilon register attributes - RTC4564 Change-Id: I51f9ac55afad27ff98eac07768ed52c986c05040 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/602 Tested-by: Jenkins Server Reviewed-by: MIKE J. JONES Reviewed-by: A. Patrick Williams III --- src/usr/hwpf/hwp/L2_L3_attributes.xml | 116 ++++++++++++++++++ src/usr/hwpf/hwp/fapiTestHwpAttr.C | 25 ++++ src/usr/hwpf/makefile | 3 +- src/usr/targeting/xmltohb/attribute_types.xml | 170 ++++++++++++++++++++++++++ src/usr/targeting/xmltohb/makefile | 3 +- src/usr/targeting/xmltohb/target_types.xml | 30 +++++ 6 files changed, 345 insertions(+), 2 deletions(-) create mode 100644 src/usr/hwpf/hwp/L2_L3_attributes.xml (limited to 'src') diff --git a/src/usr/hwpf/hwp/L2_L3_attributes.xml b/src/usr/hwpf/hwp/L2_L3_attributes.xml new file mode 100644 index 000000000..513d1052a --- /dev/null +++ b/src/usr/hwpf/hwp/L2_L3_attributes.xml @@ -0,0 +1,116 @@ + + + + + ATTR_L2_R_T0_EPS + TARGET_TYPE_EX_CHIPLET + L2 tier0 read epsilon register value. + uint32 + + + + + + ATTR_L2_R_T1_EPS + TARGET_TYPE_EX_CHIPLET + L2 tier1 read epsilon register value. + uint32 + + + + + + ATTR_L2_R_T2_EPS + TARGET_TYPE_EX_CHIPLET + L2 tier2 read epsilon register value. + uint32 + + + + + + ATTR_L2_FORCE_R_T2_EPS + TARGET_TYPE_EX_CHIPLET + L2 force tier2 read epsilon protect (all tiers). + uint8 + OFF = 0x00, ON = 0x01 + + + + + + ATTR_L2_W_EPS + TARGET_TYPE_EX_CHIPLET + L2 write epsilon register value. + uint32 + + + + + + ATTR_L3_R_T0_EPS + TARGET_TYPE_EX_CHIPLET + L3 tier0 read epsilon register value. + uint32 + + + + + + ATTR_L3_R_T1_EPS + TARGET_TYPE_EX_CHIPLET + L3 tier1 read epsilon register value. + uint32 + + + + + + ATTR_L3_R_T2_EPS + TARGET_TYPE_EX_CHIPLET + L3 tier2 read epsilon register value. + uint32 + + + + + + ATTR_L3_FORCE_R_T2_EPS + TARGET_TYPE_EX_CHIPLET + L3 force tier2 read epsilon protect (all tiers). + uint8 + OFF = 0x00, ON = 0x01 + + + + + + ATTR_L3_W_EPS + TARGET_TYPE_EX_CHIPLET + L3 write epsilon register value. + uint32 + + + + diff --git a/src/usr/hwpf/hwp/fapiTestHwpAttr.C b/src/usr/hwpf/hwp/fapiTestHwpAttr.C index 21a9a7356..731c82720 100755 --- a/src/usr/hwpf/hwp/fapiTestHwpAttr.C +++ b/src/usr/hwpf/hwp/fapiTestHwpAttr.C @@ -94,6 +94,31 @@ fapi::ReturnCode hwpTestAttributes() } } + //---------------------------------------------------------------------- + // Test ATTR_L2_R_T0_EPS + //---------------------------------------------------------------------- + { + TARGETING::PredicateCTM l_pred(TARGETING::CLASS_UNIT, + TARGETING::TYPE_EX); + TARGETING::TargetRangeFilter l_filter( + TARGETING::targetService().begin(), + TARGETING::targetService().end(), &l_pred); + // Use the first EX chiplet + if (l_filter) + { + uint32_t l_tmp; + fapi::Target l_target(fapi::TARGET_TYPE_EX_CHIPLET, *l_filter); + fapi::Target * l_pTarget = &l_target; + + l_rc = FAPI_ATTR_GET(ATTR_L2_R_T0_EPS, l_pTarget, l_tmp); + if (l_rc) + { + FAPI_ERR("hwpTestAttributes: L2/L3 ATTR. Error from GET"); + break; + } + } + } + //---------------------------------------------------------------------- // Test ATTR_SCRATCH_UINT8_1 //---------------------------------------------------------------------- diff --git a/src/usr/hwpf/makefile b/src/usr/hwpf/makefile index d87bb65bc..58189d9f9 100644 --- a/src/usr/hwpf/makefile +++ b/src/usr/hwpf/makefile @@ -32,7 +32,8 @@ SUBDIRS = fapi.d hwp.d plat.d test.d #------------------------------------------------------------------------------ HWP_ERROR_XML_FILES = hwp/fapiHwpErrorInfo.xml HWP_ATTR_XML_FILES = hwp/fapiHwpAttributeInfo.xml \ - hwp/memory_attributes.xml + hwp/memory_attributes.xml \ + hwp/L2_L3_attributes.xml #------------------------------------------------------------------------------ # Initfiles diff --git a/src/usr/targeting/xmltohb/attribute_types.xml b/src/usr/targeting/xmltohb/attribute_types.xml index 2e3822612..9adbbb126 100644 --- a/src/usr/targeting/xmltohb/attribute_types.xml +++ b/src/usr/targeting/xmltohb/attribute_types.xml @@ -2598,4 +2598,174 @@ + + L2_R_T0_EPS + L2 tier0 read epsilon register value. + + + 0 + + + volatile-zeroed + + + + ATTR_L2_R_T0_EPS + DIRECT + + + + + L2_R_T1_EPS + L2 tier1 read epsilon register value. + + + 0 + + + volatile-zeroed + + + + ATTR_L2_R_T1_EPS + DIRECT + + + + + L2_R_T2_EPS + L2 tier2 read epsilon register value. + + + 0 + + + volatile-zeroed + + + + ATTR_L2_R_T2_EPS + DIRECT + + + + + L2_FORCE_R_T2_EPS + L2 force tier2 read epsilon protect (all tiers). + + + 0 + + + volatile-zeroed + + + + ATTR_L2_FORCE_R_T2_EPS + DIRECT + + + + + L2_W_EPS + L2 write epsilon register value. + + + 0 + + + volatile-zeroed + + + + ATTR_L2_W_EPS + DIRECT + + + + + L3_R_T0_EPS + L3 tier0 read epsilon register value. + + + 0 + + + volatile-zeroed + + + + ATTR_L3_R_T0_EPS + DIRECT + + + + + L3_R_T1_EPS + L3 tier1 read epsilon register value. + + + 0 + + + volatile-zeroed + + + + ATTR_L3_R_T1_EPS + DIRECT + + + + + L3_R_T2_EPS + L3 tier2 read epsilon register value. + + + 0 + + + volatile-zeroed + + + + ATTR_L3_R_T2_EPS + DIRECT + + + + + L3_FORCE_R_T2_EPS + L3 force tier2 read epsilon protect (all tiers). + + + 0 + + + volatile-zeroed + + + + ATTR_L3_FORCE_R_T2_EPS + DIRECT + + + + + L3_W_EPS + L3 write epsilon register value. + + + 0 + + + volatile-zeroed + + + + ATTR_L3_W_EPS + DIRECT + + + diff --git a/src/usr/targeting/xmltohb/makefile b/src/usr/targeting/xmltohb/makefile index 4e61e142f..7dccc3003 100644 --- a/src/usr/targeting/xmltohb/makefile +++ b/src/usr/targeting/xmltohb/makefile @@ -47,7 +47,8 @@ XMLTOHB_GENERIC_SOURCES = attribute_types.xml target_types.xml XMLTOHB_FAPIATTR_SOURCES = \ ${ROOTPATH}/src/usr/hwpf/hwp/fapiHwpAttributeInfo.xml \ - ${ROOTPATH}/src/usr/hwpf/hwp/memory_attributes.xml + ${ROOTPATH}/src/usr/hwpf/hwp/memory_attributes.xml \ + ${ROOTPATH}/src/usr/hwpf/hwp/L2_L3_attributes.xml VMM_CONSTS_FILE = \ ${ROOTPATH}/src/include/usr/vmmconst.h diff --git a/src/usr/targeting/xmltohb/target_types.xml b/src/usr/targeting/xmltohb/target_types.xml index 8529b780a..a4be0cab1 100644 --- a/src/usr/targeting/xmltohb/target_types.xml +++ b/src/usr/targeting/xmltohb/target_types.xml @@ -257,6 +257,36 @@ TYPE EX + + L2_R_T0_EPS + + + L2_R_T1_EPS + + + L2_R_T2_EPS + + + L2_FORCE_R_T2_EPS + + + L2_W_EPS + + + L3_R_T0_EPS + + + L3_R_T1_EPS + + + L3_R_T2_EPS + + + L3_FORCE_R_T2_EPS + + + L3_W_EPS + -- cgit v1.2.1