Skip to content

Commit a406daa

Browse files
Jin Song Jiangdcrowell77
Jin Song Jiang
authored and
dcrowell77
committed
p9_cen_framelock -- 2nd version
1) Replace MCSMODE4 register with MCMODE2 and MCBCFGQ register shift host attention enablement to p9c_set_inband_addr HWP 2) Update FIR registers'(ACT0,ACT1 and MASK) set from p8 to p9c Change-Id: Ifdce2d948c12ad2b82a74cfc6a8731617a3086df Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39558 Dev-Ready: Brent Wieman <bwieman@us.ibm.com> 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: Thi N. Tran <thi@us.ibm.com> Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com> Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39561 Reviewed-by: Hostboot Team <hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
1 parent affc765 commit a406daa

File tree

4 files changed

+63
-4
lines changed

4 files changed

+63
-4
lines changed

‎src/import/chips/p9/common/include/p9_mc_scom_addresses.H

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/* */
66
/* OpenPOWER HostBoot Project */
77
/* */
8-
/* Contributors Listed Below - COPYRIGHT 2015,2016 */
8+
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
99
/* [+] International Business Machines Corp. */
1010
/* */
1111
/* */
@@ -38963,6 +38963,31 @@ REG64( MCA_7_MBACALFIRQ , RULL(0x080109C0
3896338963
REG64( MCA_7_MBACALFIRQ_AND , RULL(0x080109C1), SH_UNT_MCA_7 , SH_ACS_SCOM1_AND );
3896438964
REG64( MCA_7_MBACALFIRQ_OR , RULL(0x080109C2), SH_UNT_MCA_7 , SH_ACS_SCOM2_OR );
3896538965

38966+
REG64( MCS_DATAPATHFIR_0x07010900 , RULL(0x07010900), SH_UNT_MCA ,
38967+
SH_ACS_SCOM_RW );
38968+
REG64( MCS_DATAPATHFIR_AND_0x07010901 , RULL(0x07010901), SH_UNT_MCA ,
38969+
SH_ACS_SCOM1_AND );
38970+
REG64( MCS_DATAPATHFIR_OR_0x07010902 , RULL(0x07010902), SH_UNT_MCA ,
38971+
SH_ACS_SCOM2_OR );
38972+
REG64( MCS_DATAPATHFIRMASK_0x07010903 , RULL(0x07010903), SH_UNT_MCA ,
38973+
SH_ACS_SCOM_RW );
38974+
REG64( MCS_DATAPATHFIRMASK_AND_0x07010904 , RULL(0x07010904), SH_UNT_MCA ,
38975+
SH_ACS_SCOM1_AND );
38976+
REG64( MCS_DATAPATHFIRMASK_OR_0x07010905 , RULL(0x07010905), SH_UNT_MCA ,
38977+
SH_ACS_SCOM2_OR );
38978+
REG64( MCS_DATAPATHFIRACT0_0x07010906 , RULL(0x07010906), SH_UNT_MCA ,
38979+
SH_ACS_SCOM );
38980+
REG64( MCS_DATAPATHFIRACT1_0x07010907 , RULL(0x07010907), SH_UNT_MCA ,
38981+
SH_ACS_SCOM );
38982+
REG64( MCS_MCICFG_0x0701090A , RULL(0x0701090A), SH_UNT_MCA ,
38983+
SH_ACS_SCOM );
38984+
REG64( MCS_MCISTAT_0x0701090B , RULL(0x0701090B), SH_UNT_MCA ,
38985+
SH_ACS_SCOM );
38986+
REG64( MC_MCMODE2_0x03010813 , RULL(0x03010813), SH_UNT_MCA ,
38987+
SH_ACS_SCOM );
38988+
REG64( MCS_MCBCFG_0x070123E0 , RULL(0x070123E0), SH_UNT_MCA ,
38989+
SH_ACS_SCOM );
38990+
3896638991
REG64( MCA_MBACALFIR_ACTION0 , RULL(0x07010906), SH_UNT_MCA , SH_ACS_SCOM_RW );
3896738992
REG64( MCA_0_MBACALFIR_ACTION0 , RULL(0x07010906), SH_UNT_MCA_0 , SH_ACS_SCOM_RW );
3896838993
REG64( MCA_1_MBACALFIR_ACTION0 , RULL(0x07010946), SH_UNT_MCA_1 , SH_ACS_SCOM_RW );

‎src/import/chips/p9/common/include/p9_mc_scom_addresses_fixes.H

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,32 @@ REG64( MCA_MBA_MCP0XLT0 , RULL(0x05010820),
4343
REG64( MCA_MBA_MCP0XLT1 , RULL(0x05010821), SH_UNT_MCA , SH_ACS_SCOM_RW );
4444
REG64( MCA_MBA_MCP0XLT2 , RULL(0x05010822), SH_UNT_MCA , SH_ACS_SCOM_RW );
4545

46+
// Register define for Framelock
47+
REG64( DMI_DATAPATHFIR_0x07010900 , RULL(0x07010900), SH_UNT_MCA ,
48+
SH_ACS_SCOM_RW );
49+
REG64( DMI_DATAPATHFIR_AND_0x07010901 , RULL(0x07010901), SH_UNT_MCA ,
50+
SH_ACS_SCOM1_AND );
51+
REG64( DMI_DATAPATHFIR_OR_0x07010902 , RULL(0x07010902), SH_UNT_MCA ,
52+
SH_ACS_SCOM2_OR );
53+
REG64( DMI_DATAPATHFIRMASK_0x07010903 , RULL(0x07010903), SH_UNT_MCA ,
54+
SH_ACS_SCOM_RW );
55+
REG64( DMI_DATAPATHFIRMASK_AND_0x07010904 , RULL(0x07010904), SH_UNT_MCA ,
56+
SH_ACS_SCOM1_AND );
57+
REG64( DMI_DATAPATHFIRMASK_OR_0x07010905 , RULL(0x07010905), SH_UNT_MCA ,
58+
SH_ACS_SCOM2_OR );
59+
REG64( DMI_DATAPATHFIRACT0_0x07010906 , RULL(0x07010906), SH_UNT_MCA ,
60+
SH_ACS_SCOM );
61+
REG64( DMI_DATAPATHFIRACT1_0x07010907 , RULL(0x07010907), SH_UNT_MCA ,
62+
SH_ACS_SCOM );
63+
REG64( DMI_MCICFG_0x0701090A , RULL(0x0701090A), SH_UNT_MCA ,
64+
SH_ACS_SCOM );
65+
REG64( DMI_MCISTAT_0x0701090B , RULL(0x0701090B), SH_UNT_MCA ,
66+
SH_ACS_SCOM );
67+
REG64( MI_MCMODE2_0x05010813 , RULL(0x05010813), SH_UNT_MCA ,
68+
SH_ACS_SCOM );
69+
REG64( DMI_MCBCFG_0x070123E0 , RULL(0x070123E0), SH_UNT_MCA ,
70+
SH_ACS_SCOM );
71+
4672
// DDRPHY registers renamed in DD2.0
4773
REG64( MCA_DDRPHY_DP16_RD_VREF_DAC_0_P0_0 , RULL(0x800000160701103F), SH_UNT_MCA ,
4874
SH_ACS_SCOM_RW );

‎src/import/chips/p9/common/include/p9_misc_scom_addresses.H

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/* */
66
/* OpenPOWER HostBoot Project */
77
/* */
8-
/* Contributors Listed Below - COPYRIGHT 2015,2016 */
8+
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
99
/* [+] International Business Machines Corp. */
1010
/* */
1111
/* */
@@ -4063,6 +4063,15 @@ REG64( CAPP_1_FIR_REG , RULL(0x04010800
40634063
REG64( CAPP_1_FIR_REG_AND , RULL(0x04010801), SH_UNT_CAPP_1 , SH_ACS_SCOM1_AND );
40644064
REG64( CAPP_1_FIR_REG_OR , RULL(0x04010802), SH_UNT_CAPP_1 , SH_ACS_SCOM2_OR );
40654065

4066+
REG64( MBI_FIR_0x02010800 , RULL(0x02010800), SH_UNT , SH_ACS_SCOM_RW );
4067+
REG64( MBI_FIR_AND , RULL(0x02010801), SH_UNT , SH_ACS_SCOM1_AND );
4068+
REG64( MBI_FIR_OR , RULL(0x02010802), SH_UNT , SH_ACS_SCOM2_OR );
4069+
REG64( MBI_FIRMASK_0x02010803 , RULL(0x02010803), SH_UNT , SH_ACS_SCOM_RW );
4070+
REG64( MBI_FIRACT0_0x02010806 , RULL(0x02010806), SH_UNT , SH_ACS_SCOM_RW );
4071+
REG64( MBI_FIRACT1_0x02010807 , RULL(0x02010807), SH_UNT , SH_ACS_SCOM_RW );
4072+
REG64( MBI_CFG_0x0201080A , RULL(0x0201080A), SH_UNT , SH_ACS_SCOM_RW );
4073+
REG64( MBI_STAT_0x0201080B , RULL(0x0201080B), SH_UNT , SH_ACS_SCOM_RW );
4074+
40664075
REG64( PHB_FIR_REG , RULL(0x0D010908), SH_UNT_PHB , SH_ACS_SCOM_RW );
40674076
REG64( PHB_FIR_REG_AND , RULL(0x0D010909), SH_UNT_PHB , SH_ACS_SCOM1_AND );
40684077
REG64( PHB_FIR_REG_OR , RULL(0x0D01090A), SH_UNT_PHB , SH_ACS_SCOM2_OR );

‎src/import/chips/p9/common/include/p9_misc_scom_addresses_fixes.H

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/* */
66
/* OpenPOWER HostBoot Project */
77
/* */
8-
/* Contributors Listed Below - COPYRIGHT 2015,2016 */
8+
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
99
/* [+] International Business Machines Corp. */
1010
/* */
1111
/* */
@@ -549,5 +549,4 @@ REG64( PEC_1_PCS_PCLCK_CNTL_PLLB_REG , RULL(0x8000054F
549549
REG64( PEC_2_PCS_PCLCK_CNTL_PLLB_REG , RULL(0x8000054F0F010C3F), SH_UNT_PEC_2 ,
550550
SH_ACS_SCOM );
551551

552-
553552
#endif

0 commit comments

Comments
 (0)