From c47cf903aeb515c7497ab3bdac756210af982e87 Mon Sep 17 00:00:00 2001 From: Thi Tran Date: Mon, 15 Dec 2014 07:55:00 -0600 Subject: SW289468: INITPROC: FSP&Hostboot - Changes for Naples CMVC-Coreq: 947204 CQ:SW289468 Change-Id: I5d139ba3a6b003d05e8841e27f2414859010ea4a Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14867 Reviewed-by: Thi N. Tran Tested-by: Thi N. Tran Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14910 Tested-by: Jenkins Server Reviewed-by: A. Patrick Williams III --- src/usr/runtime/common/hsvc_exdata.C | 8 +++++--- src/usr/runtime/common/hsvc_procdata.C | 20 +++++++++++++++----- src/usr/runtime/common/hsvc_sysdata.C | 6 +++--- src/usr/runtime/populate_attributes.C | 4 ++-- 4 files changed, 25 insertions(+), 13 deletions(-) (limited to 'src/usr/runtime') diff --git a/src/usr/runtime/common/hsvc_exdata.C b/src/usr/runtime/common/hsvc_exdata.C index e20fee874..a8c22453c 100644 --- a/src/usr/runtime/common/hsvc_exdata.C +++ b/src/usr/runtime/common/hsvc_exdata.C @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -20,10 +22,10 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ -// Generated on Wed Jul 9 14:34:55 CDT 2014 by dcrowell from +// Generated on Wed Feb 18 09:37:26 CST 2015 by cswenson from // ./create_hsvc_data.pl -w ../../xml/attribute_info/chip_attributes.xml ../../xml/attribute_info/common_attributes.xml ../../xml/attribute_info/freq_attributes.xml ../../xml/attribute_info/L2_L3_attributes.xml ../../xml/attribute_info/p8_xip_customize_attributes.xml ../../xml/attribute_info/pm_hwp_attributes.xml ../../xml/attribute_info/pm_plat_attributes.xml ../../xml/attribute_info/poreve_memory_attributes.xml ../../xml/attribute_info/proc_chip_ec_feature.xml ../../xml/attribute_info/proc_fab_smp_fabric_attributes.xml ../../xml/attribute_info/proc_pll_ring_attributes.xml ../../xml/attribute_info/proc_setup_bars_l3_attributes.xml ../../xml/attribute_info/proc_winkle_scan_override_attributes.xml ../../xml/attribute_info/scratch_attributes.xml ../../xml/attribute_info/system_attributes.xml ../../xml/attribute_info/unit_attributes.xml // -- Input: ../../xml/attribute_info/chip_attributes.xml -- -// No attributes found +HSVC_LOAD_ATTR( ATTR_TARGET_SCOMABLE ); // -- Input: ../../xml/attribute_info/common_attributes.xml -- HSVC_LOAD_ATTR( ATTR_FUNCTIONAL ); // -- Input: ../../xml/attribute_info/freq_attributes.xml -- diff --git a/src/usr/runtime/common/hsvc_procdata.C b/src/usr/runtime/common/hsvc_procdata.C index aa3132063..8e177143f 100644 --- a/src/usr/runtime/common/hsvc_procdata.C +++ b/src/usr/runtime/common/hsvc_procdata.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2015 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -22,7 +22,7 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ -// Generated on Wed Jul 9 14:34:55 CDT 2014 by dcrowell from +// Generated on Wed Feb 18 09:37:26 CST 2015 by cswenson from // ./create_hsvc_data.pl -w ../../xml/attribute_info/chip_attributes.xml ../../xml/attribute_info/common_attributes.xml ../../xml/attribute_info/freq_attributes.xml ../../xml/attribute_info/L2_L3_attributes.xml ../../xml/attribute_info/p8_xip_customize_attributes.xml ../../xml/attribute_info/pm_hwp_attributes.xml ../../xml/attribute_info/pm_plat_attributes.xml ../../xml/attribute_info/poreve_memory_attributes.xml ../../xml/attribute_info/proc_chip_ec_feature.xml ../../xml/attribute_info/proc_fab_smp_fabric_attributes.xml ../../xml/attribute_info/proc_pll_ring_attributes.xml ../../xml/attribute_info/proc_setup_bars_l3_attributes.xml ../../xml/attribute_info/proc_winkle_scan_override_attributes.xml ../../xml/attribute_info/scratch_attributes.xml ../../xml/attribute_info/system_attributes.xml ../../xml/attribute_info/unit_attributes.xml // -- Input: ../../xml/attribute_info/chip_attributes.xml -- HSVC_LOAD_ATTR( ATTR_CHIP_HAS_SBE ); @@ -33,6 +33,7 @@ HSVC_LOAD_ATTR( ATTR_EX_L2_SINGLE_MEMBER_ENABLE ); HSVC_LOAD_ATTR( ATTR_FABRIC_CHIP_ID ); HSVC_LOAD_ATTR( ATTR_FABRIC_NODE_ID ); HSVC_LOAD_ATTR( ATTR_FSI_GP_REG_SCOM_ACCESS ); +HSVC_LOAD_ATTR( ATTR_I2C_SLAVE_ADDRESS ); HSVC_LOAD_ATTR_P( ATTR_NAME ); HSVC_LOAD_ATTR( ATTR_OSCSWITCH_CTL0 ); HSVC_LOAD_ATTR( ATTR_OSCSWITCH_CTL1 ); @@ -40,6 +41,7 @@ HSVC_LOAD_ATTR( ATTR_OSCSWITCH_CTL2 ); HSVC_LOAD_ATTR( ATTR_PCI_OSCSWITCH_CONFIG ); HSVC_LOAD_ATTR( ATTR_PROC_BOOT_VOLTAGE_VID ); HSVC_LOAD_ATTR( ATTR_PROC_DCM_INSTALLED ); +HSVC_LOAD_ATTR( ATTR_TARGET_SCOMABLE ); // -- Input: ../../xml/attribute_info/common_attributes.xml -- HSVC_LOAD_ATTR( ATTR_FUNCTIONAL ); HSVC_LOAD_ATTR( ATTR_POS ); @@ -166,13 +168,12 @@ HSVC_LOAD_ATTR( ATTR_SBE_SEEPROM_I2C_ADDRESS_BYTES ); HSVC_LOAD_ATTR( ATTR_SBE_SEEPROM_I2C_DEVICE_ADDRESS ); HSVC_LOAD_ATTR( ATTR_SBE_SEEPROM_I2C_PORT ); // -- Input: ../../xml/attribute_info/proc_chip_ec_feature.xml -- -HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_32_PCIE_LANES ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_ADU_PBINIT_LAUNCH_BUG ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_AISS_SPECIAL_WAKEUP ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_BOOT_FREQ_LESS_PSAVE ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_CAPP_HANG_CONTROL_ON_SCOM ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_CAPP_PROD ); -//HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_CFAM_RESET_SBE_START_WA ); +HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_DUAL_CAPP_PRESENT ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_ENABLE_IVE_PERFORMANCE_ORDERING ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_ENABLE_PCI_DMAR_OOO ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_FBC_SERIAL_SCOM_C10_VER2 ); @@ -182,10 +183,12 @@ HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_FBC_SERIAL_SCOM_WE5_VER2 ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_FBC_UX_LOCAL_ARB_RR ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_FBC_UX_SCOPE_ARB_LFSR_ON_STARVATION_ELSE_RR ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_FBC_UX_SCOPE_ARB_RR ); +HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_HCA_BAR_SCOM_BUG ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_HCA_SPLIT_HANG_CONTROL ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_HW_BUG_PBASLVRESET ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_HW_BUG_PIBSLVRESET ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_HW_BUG_PLLINIT ); +HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_HW_BUG_TOD_ERROR_MASK_NOT_WRITABLE ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_IVRM_WINKLE_BUG ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_LCTANK_PLL_VCO_BUG ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_MCD_HANG_RECOVERY_BUG ); @@ -196,6 +199,7 @@ HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_MCS_VENDD1_FIR_CONTROL ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_MPIPL_AISS_WINKLE_ENTRY ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_NOT_SUPPORT_SBE_AUTO_START ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_NOT_SUPPORT_SBE_CFAM_START ); +HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_NV_PRESENT ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_NX_HANG_CONTROL_ON_SCOM ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_OCC_CE_FIR_DISABLE ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_OCC_DISABLE ); @@ -205,9 +209,15 @@ HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_RECAL_DDC_ENABLE ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_RECAL_DFE_ENABLE ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_RESONANT_CLK_VALID ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_SECURE_IOVALID_PRESENT ); +HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_SET_ABUS_PRBS_TAP_ID ); +HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_SET_LEGACY_NODE_ID_VALID_MBOX_BIT ); +HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_SINGLE_XBUS_PRESENT ); +HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_TA_A_T1_PRESENT ); +HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_TA_PB_T1_PRESENT ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_TRACE_CONTROL_ON_SCOM ); -HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_VENICE_SPECIFIC ); +HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_USE_POLLING_PROT ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_XBUS_DLL_SLOW_MURANO ); +HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_XBUS_RESONANT_CLK_VALID ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_FEATURE_ZCAL_OVERRIDE ); HSVC_LOAD_ATTR( ATTR_CHIP_EC_PFET_POWEROFF_BUG ); HSVC_LOAD_ATTR( ATTR_DCCAL_PLL_WORKAROUND ); diff --git a/src/usr/runtime/common/hsvc_sysdata.C b/src/usr/runtime/common/hsvc_sysdata.C index 827c165dc..b9a94e380 100644 --- a/src/usr/runtime/common/hsvc_sysdata.C +++ b/src/usr/runtime/common/hsvc_sysdata.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2015 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -22,7 +22,7 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ -// Generated on Wed Jul 9 14:34:55 CDT 2014 by dcrowell from +// Generated on Wed Feb 18 09:37:26 CST 2015 by cswenson from // ./create_hsvc_data.pl -w ../../xml/attribute_info/chip_attributes.xml ../../xml/attribute_info/common_attributes.xml ../../xml/attribute_info/freq_attributes.xml ../../xml/attribute_info/L2_L3_attributes.xml ../../xml/attribute_info/p8_xip_customize_attributes.xml ../../xml/attribute_info/pm_hwp_attributes.xml ../../xml/attribute_info/pm_plat_attributes.xml ../../xml/attribute_info/poreve_memory_attributes.xml ../../xml/attribute_info/proc_chip_ec_feature.xml ../../xml/attribute_info/proc_fab_smp_fabric_attributes.xml ../../xml/attribute_info/proc_pll_ring_attributes.xml ../../xml/attribute_info/proc_setup_bars_l3_attributes.xml ../../xml/attribute_info/proc_winkle_scan_override_attributes.xml ../../xml/attribute_info/scratch_attributes.xml ../../xml/attribute_info/system_attributes.xml ../../xml/attribute_info/unit_attributes.xml // -- Input: ../../xml/attribute_info/chip_attributes.xml -- @@ -70,6 +70,7 @@ HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_HIGH_BAND_UPPER_FREQUENCY ); HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_LOW_BAND_LOWER_FREQUENCY ); HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY ); HSVC_LOAD_ATTR( ATTR_PM_SAFE_FREQUENCY ); +HSVC_LOAD_ATTR( ATTR_PM_SLEEP_ENABLE ); HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_FREQUENCY ); HSVC_LOAD_ATTR( ATTR_PM_SPIVID_FREQUENCY ); HSVC_LOAD_ATTR( ATTR_PM_SYSTEM_IVRMS_ENABLED ); @@ -80,7 +81,6 @@ HSVC_LOAD_ATTR( ATTR_PROC_R_LOADLINE_VCS ); HSVC_LOAD_ATTR( ATTR_PROC_R_LOADLINE_VDD ); HSVC_LOAD_ATTR( ATTR_PROC_VRM_VOFFSET_VCS ); HSVC_LOAD_ATTR( ATTR_PROC_VRM_VOFFSET_VDD ); -HSVC_LOAD_ATTR( ATTR_PM_SLEEP_ENABLE ); // -- Input: ../../xml/attribute_info/poreve_memory_attributes.xml -- // No attributes found // -- Input: ../../xml/attribute_info/proc_chip_ec_feature.xml -- diff --git a/src/usr/runtime/populate_attributes.C b/src/usr/runtime/populate_attributes.C index c128ce63f..6a6024219 100644 --- a/src/usr/runtime/populate_attributes.C +++ b/src/usr/runtime/populate_attributes.C @@ -209,9 +209,9 @@ struct system_data_t struct node_data_t { enum { - MAX_PROCS_RSV = P8_MAX_PROCS*2, //leave space for double + MAX_PROCS_RSV = P8_MAX_PROCS+4, //leave space for double MAX_EX_RSV = MAX_PROCS_RSV*P8_MAX_EX_PER_PROC, - NUM_PROC_ATTRIBUTES = 225, + NUM_PROC_ATTRIBUTES = 250, NUM_EX_ATTRIBUTES = 20, MAX_ATTRIBUTES = MAX_PROCS_RSV*NUM_PROC_ATTRIBUTES + MAX_EX_RSV*NUM_EX_ATTRIBUTES -- cgit v1.2.1