Skip to content

Commit d65fbf8

Browse files
BenAtIBMdcrowell77
BenAtIBM
authored and
dcrowell77
committed
Build p9n 10 and 20 by default.
Enabling 20 caused generated initfile procedures to change. Chip target needed to be added to p9.fbc.ioo_dl.scom.initfile Change-Id: Id24aa67f8d2c3f07ef85ed3bf8a555c85b4a0d72 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38324 Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com> Reviewed-by: CHRISTINA L. GRAVES <clgraves@us.ibm.com> Reviewed-by: Richard J. Knight <rjknight@us.ibm.com> Reviewed-by: Benjamin Gass <bgass@us.ibm.com> Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38327 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: Daniel M. Crowell <dcrowell@us.ibm.com>
1 parent 67fc1db commit d65fbf8

16 files changed

+3515
-1274
lines changed

‎src/import/chips/p9/procedures/hwp/initfiles/p9_cxa_scom.C

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,29 @@ fapi2::ReturnCode p9_cxa_scom(const fapi2::Target<fapi2::TARGET_TYPE_CAPP>& TGT0
5757
{
5858
FAPI_TRY(fapi2::getScom( TGT0, 0x2010806ull, l_scom_buffer ));
5959

60-
l_scom_buffer.insert<0, 52, 12, uint64_t>(literal_0x0000000000000 );
60+
if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
61+
{
62+
l_scom_buffer.insert<0, 52, 12, uint64_t>(literal_0x0000000000000 );
63+
}
64+
else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
65+
{
66+
l_scom_buffer.insert<0, 53, 11, uint64_t>(literal_0x0000000000000 );
67+
}
68+
6169
FAPI_TRY(fapi2::putScom(TGT0, 0x2010806ull, l_scom_buffer));
6270
}
6371
{
6472
FAPI_TRY(fapi2::getScom( TGT0, 0x2010807ull, l_scom_buffer ));
6573

66-
l_scom_buffer.insert<0, 52, 12, uint64_t>(literal_0x2080000020080 );
74+
if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
75+
{
76+
l_scom_buffer.insert<0, 52, 12, uint64_t>(literal_0x2080000020080 );
77+
}
78+
else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
79+
{
80+
l_scom_buffer.insert<0, 53, 11, uint64_t>(literal_0x2080000020080 );
81+
}
82+
6783
FAPI_TRY(fapi2::putScom(TGT0, 0x2010807ull, l_scom_buffer));
6884
}
6985
{
@@ -92,11 +108,14 @@ fapi2::ReturnCode p9_cxa_scom(const fapi2::Target<fapi2::TARGET_TYPE_CAPP>& TGT0
92108
FAPI_TRY(fapi2::putScom(TGT0, 0x2010819ull, l_scom_buffer));
93109
}
94110
{
95-
FAPI_TRY(fapi2::getScom( TGT0, 0x201081bull, l_scom_buffer ));
111+
if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
112+
{
113+
FAPI_TRY(fapi2::getScom( TGT0, 0x201081bull, l_scom_buffer ));
96114

97-
l_scom_buffer.insert<45, 3, 61, uint64_t>(literal_0b111 );
98-
l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0010 );
99-
FAPI_TRY(fapi2::putScom(TGT0, 0x201081bull, l_scom_buffer));
115+
l_scom_buffer.insert<45, 3, 61, uint64_t>(literal_0b111 );
116+
l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0010 );
117+
FAPI_TRY(fapi2::putScom(TGT0, 0x201081bull, l_scom_buffer));
118+
}
100119
}
101120
{
102121
FAPI_TRY(fapi2::getScom( TGT0, 0x201081cull, l_scom_buffer ));

‎src/import/chips/p9/procedures/hwp/initfiles/p9_ddrphy_scom.C

Lines changed: 45 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,17 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
5656
FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_EC, TGT1, l_chip_ec));
5757
fapi2::buffer<uint64_t> l_scom_buffer;
5858
{
59-
FAPI_TRY(fapi2::getScom( TGT0, 0x800000030701103full, l_scom_buffer ));
60-
61-
if (( true ))
59+
if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
6260
{
63-
l_scom_buffer.insert<48, 16, 48, uint64_t>(literal_0x0120 );
64-
}
61+
FAPI_TRY(fapi2::getScom( TGT0, 0x800000030701103full, l_scom_buffer ));
62+
63+
if (( true ))
64+
{
65+
l_scom_buffer.insert<48, 16, 48, uint64_t>(literal_0x0120 );
66+
}
6567

66-
FAPI_TRY(fapi2::putScom(TGT0, 0x800000030701103full, l_scom_buffer));
68+
FAPI_TRY(fapi2::putScom(TGT0, 0x800000030701103full, l_scom_buffer));
69+
}
6770
}
6871
{
6972
FAPI_TRY(fapi2::getScom( TGT0, 0x800000240701103full, l_scom_buffer ));
@@ -306,14 +309,17 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
306309
FAPI_TRY(fapi2::putScom(TGT0, 0x800000ad0701103full, l_scom_buffer));
307310
}
308311
{
309-
FAPI_TRY(fapi2::getScom( TGT0, 0x800004030701103full, l_scom_buffer ));
310-
311-
if (( true ))
312+
if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
312313
{
313-
l_scom_buffer.insert<48, 16, 48, uint64_t>(literal_0x0120 );
314-
}
314+
FAPI_TRY(fapi2::getScom( TGT0, 0x800004030701103full, l_scom_buffer ));
315+
316+
if (( true ))
317+
{
318+
l_scom_buffer.insert<48, 16, 48, uint64_t>(literal_0x0120 );
319+
}
315320

316-
FAPI_TRY(fapi2::putScom(TGT0, 0x800004030701103full, l_scom_buffer));
321+
FAPI_TRY(fapi2::putScom(TGT0, 0x800004030701103full, l_scom_buffer));
322+
}
317323
}
318324
{
319325
FAPI_TRY(fapi2::getScom( TGT0, 0x800004240701103full, l_scom_buffer ));
@@ -556,14 +562,17 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
556562
FAPI_TRY(fapi2::putScom(TGT0, 0x800004ad0701103full, l_scom_buffer));
557563
}
558564
{
559-
FAPI_TRY(fapi2::getScom( TGT0, 0x800008030701103full, l_scom_buffer ));
560-
561-
if (( true ))
565+
if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
562566
{
563-
l_scom_buffer.insert<48, 16, 48, uint64_t>(literal_0x0120 );
564-
}
567+
FAPI_TRY(fapi2::getScom( TGT0, 0x800008030701103full, l_scom_buffer ));
565568

566-
FAPI_TRY(fapi2::putScom(TGT0, 0x800008030701103full, l_scom_buffer));
569+
if (( true ))
570+
{
571+
l_scom_buffer.insert<48, 16, 48, uint64_t>(literal_0x0120 );
572+
}
573+
574+
FAPI_TRY(fapi2::putScom(TGT0, 0x800008030701103full, l_scom_buffer));
575+
}
567576
}
568577
{
569578
FAPI_TRY(fapi2::getScom( TGT0, 0x800008240701103full, l_scom_buffer ));
@@ -806,14 +815,17 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
806815
FAPI_TRY(fapi2::putScom(TGT0, 0x800008ad0701103full, l_scom_buffer));
807816
}
808817
{
809-
FAPI_TRY(fapi2::getScom( TGT0, 0x80000c030701103full, l_scom_buffer ));
810-
811-
if (( true ))
818+
if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
812819
{
813-
l_scom_buffer.insert<48, 16, 48, uint64_t>(literal_0x0120 );
814-
}
820+
FAPI_TRY(fapi2::getScom( TGT0, 0x80000c030701103full, l_scom_buffer ));
821+
822+
if (( true ))
823+
{
824+
l_scom_buffer.insert<48, 16, 48, uint64_t>(literal_0x0120 );
825+
}
815826

816-
FAPI_TRY(fapi2::putScom(TGT0, 0x80000c030701103full, l_scom_buffer));
827+
FAPI_TRY(fapi2::putScom(TGT0, 0x80000c030701103full, l_scom_buffer));
828+
}
817829
}
818830
{
819831
FAPI_TRY(fapi2::getScom( TGT0, 0x80000c240701103full, l_scom_buffer ));
@@ -1056,14 +1068,17 @@ fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TG
10561068
FAPI_TRY(fapi2::putScom(TGT0, 0x80000cad0701103full, l_scom_buffer));
10571069
}
10581070
{
1059-
FAPI_TRY(fapi2::getScom( TGT0, 0x800010030701103full, l_scom_buffer ));
1060-
1061-
if (( true ))
1071+
if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
10621072
{
1063-
l_scom_buffer.insert<48, 16, 48, uint64_t>(literal_0x0120 );
1064-
}
1073+
FAPI_TRY(fapi2::getScom( TGT0, 0x800010030701103full, l_scom_buffer ));
1074+
1075+
if (( true ))
1076+
{
1077+
l_scom_buffer.insert<48, 16, 48, uint64_t>(literal_0x0120 );
1078+
}
10651079

1066-
FAPI_TRY(fapi2::putScom(TGT0, 0x800010030701103full, l_scom_buffer));
1080+
FAPI_TRY(fapi2::putScom(TGT0, 0x800010030701103full, l_scom_buffer));
1081+
}
10671082
}
10681083
{
10691084
FAPI_TRY(fapi2::getScom( TGT0, 0x800010240701103full, l_scom_buffer ));

0 commit comments

Comments
 (0)