From e147a8e14a254784ce4975806d1cc32d55af2df4 Mon Sep 17 00:00:00 2001 From: Elliott Dahle Date: Mon, 9 Dec 2013 11:17:38 -0600 Subject: Add Deconfig State / GARD Error parameters to addClockCallout(...) Change-Id: Ia8bd707604651f8779897a177657eaa5e639a37d RTC:91649 CMVC-Coreq:910647 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/7863 Tested-by: Jenkins Server Reviewed-by: Brian H. Horton Reviewed-by: Christopher T. Phan Reviewed-by: A. Patrick Williams III --- src/usr/hwas/common/hwasCallout.C | 6 ++++-- src/usr/hwas/hwasPlatCallout.C | 12 +++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'src/usr/hwas') diff --git a/src/usr/hwas/common/hwasCallout.C b/src/usr/hwas/common/hwasCallout.C index dcac818e8..1868efd56 100644 --- a/src/usr/hwas/common/hwasCallout.C +++ b/src/usr/hwas/common/hwasCallout.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2013 */ +/* COPYRIGHT International Business Machines Corp. 2012,2014 */ /* */ /* p1 */ /* */ @@ -196,7 +196,9 @@ void processCallout(errlHndl_t &io_errl, pTarget, pCalloutUD->clockType, pCalloutUD->priority, - io_errl); + io_errl, + pCalloutUD->clkDeconfigState, + pCalloutUD->clkGardErrorType); if (errl) { HWAS_ERR("processCallout: error from platHandleClockCallout"); diff --git a/src/usr/hwas/hwasPlatCallout.C b/src/usr/hwas/hwasPlatCallout.C index b8adddecf..164ffdf30 100644 --- a/src/usr/hwas/hwasPlatCallout.C +++ b/src/usr/hwas/hwasPlatCallout.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2013 */ +/* COPYRIGHT International Business Machines Corp. 2013,2014 */ /* */ /* p1 */ /* */ @@ -166,16 +166,18 @@ errlHndl_t platHandleClockCallout( TARGETING::Target *i_pTarget, clockTypeEnum i_clockType, callOutPriority i_priority, - errlHndl_t &io_errl) + errlHndl_t &io_errl, + DeconfigEnum i_deconfigState, + GARD_ErrorType i_gardErrorType) { // WARNING: // this hostboot code should not change io_errl, unless the caller of the - // processCallouts() function also changes, as today it (errlentry.C) calls - // from the errlEntry object + // processCallouts() function also changes, as today it (errlentry.C) calls + // from the errlEntry object errlHndl_t errl = NULL; - // hostboot does not handle or do any action for clock callouts + // Hostboot does not handle or do any action for clock callouts return errl; } -- cgit v1.2.1