Skip to content

Commit 0e588da

Browse files
premsjhacrgeddes
authored andcommitted
PM: Incorporated support for enabling/disabling queued scan mode.
Populates a bit in CME flag field of CME's image header. Given CME flag is expected to be read by CME Hcode to decide if queued scanning is to be supported. - Rebased Change-Id: Ie2a5291c393b140266a5d2ed204f54d83f390199 RTC:160171 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30520 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com> Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com> Reviewed-by: Michael S. Floyd <mfloyd@us.ibm.com> Reviewed-by: AMIT KUMAR <akumar3@us.ibm.com> Reviewed-by: Gregory S. Still <stillgs@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/31957 Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
1 parent 51b0739 commit 0e588da

File tree

7 files changed

+55
-1
lines changed

7 files changed

+55
-1
lines changed

src/import/chips/p9/procedures/hwp/lib/p9_hcd_memmap_base.H

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,7 @@ HCD_CONST(CME_STOP_4_TO_2_BIT_POS, 0x40000000)
353353
HCD_CONST(CME_STOP_5_TO_4_BIT_POS, 0x20000000)
354354
HCD_CONST(CME_STOP_8_TO_5_BIT_POS, 0x10000000)
355355
HCD_CONST(CME_STOP_11_TO_8_BIT_POS, 0x08000000)
356+
HCD_CONST(CME_QUEUED_SCAN_DISABLE, 0x00000002)
356357
HCD_CONST(CME_SKIP_CORE_POWEROFF_BIT_POS, 0x00000001)
357358

358359
/// CME Hcode

src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.C

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -733,6 +733,18 @@ extern "C"
733733

734734
FAPI_DBG("CME Instruction Trace Enabled : %s", attrVal ? "TRUE" : "FALSE" );
735735

736+
FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_SYSTEM_DISABLE_QUEUED_SCAN,
737+
FAPI_SYSTEM,
738+
attrVal),
739+
"Error from FAPI_ATTR_GET for attribute ATTR_SYSTEM_DISABLE_QUEUED_SCAN" );
740+
741+
if( attrVal )
742+
{
743+
cmeFlag |= CME_QUEUED_SCAN_DISABLE;
744+
}
745+
746+
FAPI_DBG("QUEUED_SCAN_DISABLE : %s", attrVal ? "TRUE" : "FALSE" );
747+
736748
// Set PGPE Header Flags from Attributes
737749
FAPI_DBG(" -------------------- PGPE Flags -----------------");
738750
pgpeFlags.value = 0;

src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ HCODE_UTIL+=$(ROOTPATH)/chips/p9/procedures/hwp/nest
3535

3636
lib$(PROCEDURE)_DEPLIBS += p9_scan_ring_util
3737
lib$(PROCEDURE)_DEPLIBS += p9_xip_image
38-
lib$(PROCEDURE)_DEPLIBS +=p9_pstate_parameter_block
38+
lib$(PROCEDURE)_DEPLIBS += p9_pstate_parameter_block
3939
lib$(PROCEDURE)_DEPLIBS += p9_tor
4040
lib$(PROCEDURE)_DEPLIBS += p9_ringId
4141
lib$(PROCEDURE)_DEPLIBS += p9_stop_util

src/import/chips/p9/procedures/xml/attribute_info/pm_plat_attributes.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1547,6 +1547,21 @@
15471547
<platInit/>
15481548
</attribute>
15491549
<!-- ********************************************************************* -->
1550+
<attribute>
1551+
<id>ATTR_SYSTEM_DISABLE_QUEUED_SCAN</id>
1552+
<targetType>TARGET_TYPE_SYSTEM</targetType>
1553+
<description>
1554+
Queued scan mode disable status. This attribute eventually decides if queued
1555+
scan is to be supported by CME Hcode.
1556+
1557+
Consumers: p9_hcode_image_build
1558+
</description>
1559+
<valueType>uint8</valueType>
1560+
<enum>FALSE = 0x00, TRUE = 0x01</enum>
1561+
<platInit/>
1562+
<initToZero/>
1563+
</attribute>
1564+
<!-- ********************************************************************* -->
15501565
<attribute>
15511566
<id>ATTR_PERF_24x7_INVOCATION_TIME_MS</id>
15521567
<description>

src/import/hwpf/fapi2/xml/attribute_info/hb_temp_defaults.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,10 @@
143143
<id>ATTR_PROC_EFF_FABRIC_CHIP_ID</id>
144144
<default>0x0</default>
145145
</attribute>
146+
<attribute>
147+
<id>ATTR_SYSTEM_DISABLE_QUEUED_SCAN</id>
148+
<default>0x00</default>
149+
</attribute>
146150

147151
<!-- =====================================================================
148152
End of temporary definitions

src/usr/targeting/common/xmltohb/attribute_types.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33415,4 +33415,25 @@ Measured in GB</description>
3341533415
<writeable/>
3341633416
</attribute>
3341733417

33418+
33419+
33420+
<attribute>
33421+
<id>SYSTEM_DISABLE_QUEUED_SCAN</id>
33422+
<description>
33423+
Queued scan mode disable status. This attribute eventually decides if queued
33424+
scan is to be supported by CME Hcode.
33425+
33426+
Consumers: p9_hcode_image_build
33427+
</description>
33428+
<simpleType>
33429+
<uint8_t></uint8_t>
33430+
</simpleType>
33431+
<persistency>volatile-zeroed</persistency>
33432+
<readable/>
33433+
<hwpfToHbAttrMap>
33434+
<id>ATTR_SYSTEM_DISABLE_QUEUED_SCAN</id>
33435+
<macro>DIRECT</macro>
33436+
</hwpfToHbAttrMap>
33437+
</attribute>
33438+
3341833439
</attributes>

src/usr/targeting/common/xmltohb/target_types.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -914,6 +914,7 @@
914914
<attribute><id>NEST_LEAKAGE_PERCENT</id></attribute>
915915
<attribute><id>MSS_MRW_DRAM_WRITE_CRC</id></attribute>
916916
<attribute><id>PGPE_HCODE_FUNCTION_ENABLE</id></attribute>
917+
<attribute><id>SYSTEM_DISABLE_QUEUED_SCAN</id></attribute>
917918
</targetType>
918919

919920
<!-- enc-node-power9 -->

0 commit comments

Comments
 (0)