From 291ef16dcb1e9692e69925341fcda7a4040ff914 Mon Sep 17 00:00:00 2001 From: Anusha Reddy Rangareddygari Date: Tue, 17 Oct 2017 08:25:15 -0400 Subject: osclite status check in clock_test2 checking bits based on pci osc scenarios Change-Id: Ida0b6d97cffc1bc43d32dda1f3bdb611e26d56bf Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/48485 Tested-by: FSP CI Jenkins Tested-by: Jenkins Server Tested-by: PPE CI Reviewed-by: Joachim Fenkes Reviewed-by: Joseph J. McGill Reviewed-by: PARVATHI RACHAKONDA Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/48491 Reviewed-by: Hostboot Team Reviewed-by: Sachin Gupta --- .../procedures/hwp/perv/p9_sbe_tp_chiplet_init3.C | 38 ++++++++++++++++------ 1 file changed, 28 insertions(+), 10 deletions(-) (limited to 'src/import/chips/p9') diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init3.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init3.C index df464672..c4c2ea6b 100644 --- a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init3.C +++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init3.C @@ -43,6 +43,7 @@ //## auto_generated #include "p9_sbe_tp_chiplet_init3.H" +#include "p9_setup_clock_term.H" //## auto_generated #include "p9_const_common.H" @@ -280,6 +281,7 @@ fapi_try_exit: static fapi2::ReturnCode p9_sbe_tp_chiplet_init3_clock_test2( const fapi2::Target& i_target_chip, uint8_t cumulus_only_ec_attr) { + fapi2::buffer l_data32; fapi2::buffer l_read ; fapi2::buffer l_data64; FAPI_INF("p9_sbe_tp_chiplet_init3_clock_test2: Entering ..."); @@ -345,6 +347,11 @@ static fapi2::ReturnCode p9_sbe_tp_chiplet_init3_clock_test2( l_data64.clearBit(); FAPI_TRY(fapi2::putScom(i_target_chip, PERV_TP_LOCAL_FIR_AND, l_data64)); + FAPI_DBG("To get info about scr0,src1,both_src0,both_src1 from Root_ctrl3"); + FAPI_TRY(fapi2::getScom(i_target_chip, PERV_ROOT_CTRL3_SCOM, l_data64)); + l_data64.extractToRight<0, 32>(l_data32); + l_data32 &= 0x0000F000; + #ifndef SIM_ONLY_OSC_SWC_CHK if (cumulus_only_ec_attr) //Cumulus only @@ -354,17 +361,28 @@ static fapi2::ReturnCode p9_sbe_tp_chiplet_init3_clock_test2( FAPI_TRY(fapi2::getScom(i_target_chip, PERV_SNS1LTH_SCOM, l_read)); //l_read = PIB.SNS1LTH - FAPI_ASSERT(l_read.getBit<21>() == 0 && l_read.getBit<26>() == 1, - fapi2::MF_OSC_NOT_TOGGLE() - .set_MASTER_CHIP(i_target_chip) - .set_READ_SNS1LTH(l_read), - "MF oscillator(OSC0) not toggling"); + if (l_data32 == p9SetupClockTerm::P9C_OSCSWITCH_RC3_BOTHSRC0 + || l_data32 == p9SetupClockTerm::P9C_OSCSWITCH_RC3_BOTHSRC1 + || l_data32 == p9SetupClockTerm::P9C_OSCSWITCH_RC3_SRC0) + { + FAPI_ASSERT(l_read.getBit<21>() == 0 && l_read.getBit<28>() == 1, + fapi2::MF_OSC_NOT_TOGGLE() + .set_MASTER_CHIP(i_target_chip) + .set_READ_SNS1LTH(l_read), + "MF oscillator(OSC0) not toggling"); - FAPI_ASSERT(l_read.getBit<23>() == 0 && l_read.getBit<27>() == 1, - fapi2::MF_OSC_NOT_TOGGLE() - .set_MASTER_CHIP(i_target_chip) - .set_READ_SNS1LTH(l_read), - "MF oscillator(OSC1) not toggling"); + } + + if (l_data32 == p9SetupClockTerm::P9C_OSCSWITCH_RC3_BOTHSRC0 + || l_data32 == p9SetupClockTerm::P9C_OSCSWITCH_RC3_BOTHSRC1 + || l_data32 == p9SetupClockTerm::P9C_OSCSWITCH_RC3_SRC1 ) + { + FAPI_ASSERT(l_read.getBit<23>() == 0 && l_read.getBit<29>() == 1, + fapi2::MF_OSC_NOT_TOGGLE() + .set_MASTER_CHIP(i_target_chip) + .set_READ_SNS1LTH(l_read), + "MF oscillator(OSC1) not toggling"); + } FAPI_DBG("Cumulus - check Osc error active"); //Getting OSCERR_HOLD register value -- cgit v1.2.1