Skip to content

Commit ebca601

Browse files
dchowesannerd
dchowe
authored and
sannerd
committed
DD2 updated scan overrides, Cumulus DD1 initfile updates
Change-Id: I1b66fdf7786a2358b304b6b3d5bbc6b92d06e4e1 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42380 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: Jenny Huynh <jhuynh@us.ibm.com> Reviewed-by: DANIEL C. HOWE <dchowe@us.ibm.com> Dev-Ready: Brent Wieman <bwieman@us.ibm.com> Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com> Reviewed-by: Prachi Gupta <pragupta@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42399 Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Reviewed-by: Dean Sanner <dsanner@us.ibm.com> Tested-by: Dean Sanner <dsanner@us.ibm.com>
1 parent 1788064 commit ebca601

File tree

6 files changed

+102
-131
lines changed

6 files changed

+102
-131
lines changed

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

Lines changed: 34 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ constexpr uint64_t literal_110 = 110;
5353
constexpr uint64_t literal_105 = 105;
5454
constexpr uint64_t literal_0b01011 = 0b01011;
5555
constexpr uint64_t literal_125 = 125;
56-
constexpr uint64_t literal_130 = 130;
57-
constexpr uint64_t literal_135 = 135;
5856
constexpr uint64_t literal_0b01111 = 0b01111;
5957
constexpr uint64_t literal_0b10001 = 0b10001;
6058
constexpr uint64_t literal_0b10011 = 0b10011;
@@ -89,8 +87,8 @@ constexpr uint64_t literal_0b1 = 0b1;
8987
constexpr uint64_t literal_0b10 = 0b10;
9088
constexpr uint64_t literal_0x400 = 0x400;
9189
constexpr uint64_t literal_0b010 = 0b010;
92-
constexpr uint64_t literal_0b00010000 = 0b00010000;
93-
constexpr uint64_t literal_0x10 = 0x10;
90+
constexpr uint64_t literal_0b00001100 = 0b00001100;
91+
constexpr uint64_t literal_0x0C = 0x0C;
9492
constexpr uint64_t literal_0x141 = 0x141;
9593
constexpr uint64_t literal_0x21B = 0x21B;
9694
constexpr uint64_t literal_0x30D = 0x30D;
@@ -132,8 +130,6 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
132130
uint64_t l_def_X_RATIO_100_115 = ((literal_115 * l_TGT1_ATTR_FREQ_X_MHZ) >= (literal_100 * l_TGT1_ATTR_FREQ_PB_MHZ));
133131
uint64_t l_def_X_RATIO_100_120 = ((literal_120 * l_TGT1_ATTR_FREQ_X_MHZ) >= (literal_100 * l_TGT1_ATTR_FREQ_PB_MHZ));
134132
uint64_t l_def_X_RATIO_100_125 = ((literal_125 * l_TGT1_ATTR_FREQ_X_MHZ) >= (literal_100 * l_TGT1_ATTR_FREQ_PB_MHZ));
135-
uint64_t l_def_X_RATIO_100_130 = ((literal_130 * l_TGT1_ATTR_FREQ_X_MHZ) >= (literal_100 * l_TGT1_ATTR_FREQ_PB_MHZ));
136-
uint64_t l_def_X_RATIO_100_135 = ((literal_135 * l_TGT1_ATTR_FREQ_X_MHZ) >= (literal_100 * l_TGT1_ATTR_FREQ_PB_MHZ));
137133
fapi2::ATTR_PROC_FABRIC_SMP_OPTICS_MODE_Type l_TGT1_ATTR_PROC_FABRIC_SMP_OPTICS_MODE;
138134
FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PROC_FABRIC_SMP_OPTICS_MODE, TGT1, l_TGT1_ATTR_PROC_FABRIC_SMP_OPTICS_MODE));
139135
uint64_t l_def_SMP_OPTICS_MODE = (l_TGT1_ATTR_PROC_FABRIC_SMP_OPTICS_MODE ==
@@ -240,14 +236,6 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
240236
{
241237
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b01100 );
242238
}
243-
else if ((((l_def_NUM_A_LINKS_CFG == literal_0) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_100_130))
244-
{
245-
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b01100 );
246-
}
247-
else if ((((l_def_NUM_A_LINKS_CFG == literal_0) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_100_135))
248-
{
249-
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b01100 );
250-
}
251239
else if ((((l_def_NUM_A_LINKS_CFG == literal_1) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_120_100))
252240
{
253241
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b01110 );
@@ -288,14 +276,6 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
288276
{
289277
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b10011 );
290278
}
291-
else if ((((l_def_NUM_A_LINKS_CFG == literal_1) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_100_130))
292-
{
293-
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b10011 );
294-
}
295-
else if ((((l_def_NUM_A_LINKS_CFG == literal_1) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_100_135))
296-
{
297-
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b10100 );
298-
}
299279
else if ((((l_def_NUM_A_LINKS_CFG == literal_2) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_120_100))
300280
{
301281
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b10011 );
@@ -336,14 +316,6 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
336316
{
337317
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b11010 );
338318
}
339-
else if ((((l_def_NUM_A_LINKS_CFG == literal_2) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_100_130))
340-
{
341-
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b11011 );
342-
}
343-
else if ((((l_def_NUM_A_LINKS_CFG == literal_2) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_100_135))
344-
{
345-
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b11100 );
346-
}
347319
else if ((((l_def_NUM_A_LINKS_CFG == literal_3) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_120_100))
348320
{
349321
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b11000 );
@@ -384,14 +356,6 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
384356
{
385357
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b11111 );
386358
}
387-
else if ((((l_def_NUM_A_LINKS_CFG == literal_3) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_100_130))
388-
{
389-
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b11111 );
390-
}
391-
else if ((((l_def_NUM_A_LINKS_CFG == literal_3) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_100_135))
392-
{
393-
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b11111 );
394-
}
395359
else if (((l_def_NUM_A_LINKS_CFG == literal_0) && (l_def_NUM_X_LINKS_CFG == literal_4)))
396360
{
397361
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b01110 );
@@ -428,6 +392,19 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
428392
{
429393
l_scom_buffer.flush<0> ();
430394

395+
if (l_def_SMP_OPTICS_MODE)
396+
{
397+
constexpr auto l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_ARBMODE_NEXT_ENABLE_012 = 0xe;
398+
l_scom_buffer.insert<45, 4, 60, uint64_t>
399+
(l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_ARBMODE_NEXT_ENABLE_012 );
400+
}
401+
else if (( ! l_def_SMP_OPTICS_MODE))
402+
{
403+
constexpr auto l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_ARBMODE_NEXT_ENABLE_01 = 0xc;
404+
l_scom_buffer.insert<45, 4, 60, uint64_t>
405+
(l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_ARBMODE_NEXT_ENABLE_01 );
406+
}
407+
431408
if (l_def_SMP_OPTICS_MODE)
432409
{
433410
constexpr auto l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_VCINIT_NEXT_DOFF_32_32 = 0x4;
@@ -481,6 +458,19 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
481458
{
482459
l_scom_buffer.flush<0> ();
483460

461+
if (l_def_SMP_OPTICS_MODE)
462+
{
463+
constexpr auto l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_ARBMODE_NEXT_ENABLE_012 = 0xe;
464+
l_scom_buffer.insert<45, 4, 60, uint64_t>
465+
(l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_ARBMODE_NEXT_ENABLE_012 );
466+
}
467+
else if (( ! l_def_SMP_OPTICS_MODE))
468+
{
469+
constexpr auto l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_ARBMODE_NEXT_ENABLE_01 = 0xc;
470+
l_scom_buffer.insert<45, 4, 60, uint64_t>
471+
(l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_ARBMODE_NEXT_ENABLE_01 );
472+
}
473+
484474
if (l_def_SMP_OPTICS_MODE)
485475
{
486476
constexpr auto l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_VCINIT_NEXT_DOFF_32_32 = 0x4;
@@ -533,35 +523,17 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
533523
if (((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
534524
{
535525
l_scom_buffer.flush<0> ();
536-
537-
if ((l_def_TRUE == literal_1))
538-
{
539-
l_scom_buffer.insert<41, 2, 62, uint64_t>(literal_0b01 );
540-
}
541-
542-
if ((l_def_TRUE == literal_1))
543-
{
544-
l_scom_buffer.insert<43, 2, 62, uint64_t>(literal_0b11 );
545-
}
546-
526+
l_scom_buffer.insert<41, 2, 62, uint64_t>(literal_0b01 );
527+
l_scom_buffer.insert<43, 2, 62, uint64_t>(literal_0b11 );
547528
FAPI_TRY(fapi2::putScom(TGT0, 0x90000d6805011c11ull, l_scom_buffer));
548529
}
549530
}
550531
{
551532
if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
552533
{
553534
l_scom_buffer.flush<0> ();
554-
555-
if ((l_def_TRUE == literal_1))
556-
{
557-
l_scom_buffer.insert<41, 2, 62, uint64_t>(literal_0b01 );
558-
}
559-
560-
if ((l_def_TRUE == literal_1))
561-
{
562-
l_scom_buffer.insert<43, 2, 62, uint64_t>(literal_0b11 );
563-
}
564-
535+
l_scom_buffer.insert<41, 2, 62, uint64_t>(literal_0b01 );
536+
l_scom_buffer.insert<43, 2, 62, uint64_t>(literal_0b11 );
565537
FAPI_TRY(fapi2::putScom(TGT0, 0x90000d7805011c11ull, l_scom_buffer));
566538
}
567539
}
@@ -791,15 +763,12 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
791763

792764
if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
793765
{
794-
if ((l_def_TRUE == literal_1))
795-
{
796-
l_scom_buffer.insert<20, 8, 56, uint64_t>(literal_0b00010000 );
797-
}
766+
l_scom_buffer.insert<20, 8, 56, uint64_t>(literal_0b00001100 );
798767
}
799768

800769
if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
801770
{
802-
l_scom_buffer.insert<20, 8, 56, uint64_t>(literal_0x10 );
771+
l_scom_buffer.insert<20, 8, 56, uint64_t>(literal_0x0C );
803772
}
804773

805774
FAPI_TRY(fapi2::putScom(TGT0, 0x90000ec705011c11ull, l_scom_buffer));

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ fapi2::ReturnCode p9_fbc_ioe_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
324324
{
325325
FAPI_TRY(fapi2::getScom( TGT0, 0x5013411ull, l_scom_buffer ));
326326

327-
if ((l_def_X0_ENABLED && l_def_OPTICS_IS_A_BUS))
327+
if ((l_def_X1_ENABLED && l_def_OPTICS_IS_A_BUS))
328328
{
329329
l_scom_buffer.insert<24, 5, 59, uint64_t>(literal_0x10 );
330330
}
@@ -361,7 +361,7 @@ fapi2::ReturnCode p9_fbc_ioe_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
361361
{
362362
FAPI_TRY(fapi2::getScom( TGT0, 0x5013412ull, l_scom_buffer ));
363363

364-
if ((l_def_X0_ENABLED && l_def_OPTICS_IS_A_BUS))
364+
if ((l_def_X2_ENABLED && l_def_OPTICS_IS_A_BUS))
365365
{
366366
l_scom_buffer.insert<24, 5, 59, uint64_t>(literal_0x10 );
367367
}

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

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,31 +44,22 @@ fapi2::ReturnCode p9_fbc_ioo_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS
4444
FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_EC, TGT1, l_chip_ec));
4545
fapi2::ATTR_OPTICS_CONFIG_MODE_Type l_TGT0_ATTR_OPTICS_CONFIG_MODE;
4646
FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_OPTICS_CONFIG_MODE, TGT0, l_TGT0_ATTR_OPTICS_CONFIG_MODE));
47-
uint64_t l_def_OBUS_FBC_ENABLED = (l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_SMP);
4847
uint64_t l_def_OBUS_NV_ENABLED = (l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_NV);
48+
uint64_t l_def_OBUS_FBC_ENABLED = (l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_SMP);
4949
fapi2::buffer<uint64_t> l_scom_buffer;
5050
{
5151
FAPI_TRY(fapi2::getScom( TGT0, 0x901080aull, l_scom_buffer ));
5252

53-
if (l_def_OBUS_FBC_ENABLED)
54-
{
55-
constexpr auto l_PB_IOO_LL0_CONFIG_LINK_PAIR_ON = 0x1;
56-
l_scom_buffer.insert<0, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_LINK_PAIR_ON );
57-
}
53+
constexpr auto l_PB_IOO_LL0_CONFIG_LINK_PAIR_ON = 0x1;
54+
l_scom_buffer.insert<0, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_LINK_PAIR_ON );
5855

5956
if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
6057
{
61-
if (l_def_OBUS_FBC_ENABLED)
62-
{
63-
l_scom_buffer.insert<12, 4, 60, uint64_t>(literal_0x0B );
64-
}
58+
l_scom_buffer.insert<12, 4, 60, uint64_t>(literal_0x0B );
6559
}
6660
else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
6761
{
68-
if (l_def_OBUS_FBC_ENABLED)
69-
{
70-
l_scom_buffer.insert<11, 5, 59, uint64_t>(literal_0x0B );
71-
}
62+
l_scom_buffer.insert<11, 5, 59, uint64_t>(literal_0x0B );
7263
}
7364

7465
l_scom_buffer.insert<28, 4, 60, uint64_t>(literal_0x0 );
@@ -157,6 +148,21 @@ fapi2::ReturnCode p9_fbc_ioo_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS
157148

158149
constexpr auto l_PB_IOO_LL0_CONFIG_REPLAY_BUFFER_SIZE_REPLAY_255 = 0x2;
159150
l_scom_buffer.insert<56, 2, 62, uint64_t>(l_PB_IOO_LL0_CONFIG_REPLAY_BUFFER_SIZE_REPLAY_255 );
151+
constexpr auto l_PB_IOO_LL0_LINK1_ELEVEN_LANE_SHIFT_ON = 0x1;
152+
l_scom_buffer.insert<39, 1, 63, uint64_t>(l_PB_IOO_LL0_LINK1_ELEVEN_LANE_SHIFT_ON );
153+
154+
if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
155+
{
156+
constexpr auto l_PB_IOO_LL0_LINK1_RX_LANE_SWAP_ON = 0x1;
157+
l_scom_buffer.insert<42, 1, 63, uint64_t>(l_PB_IOO_LL0_LINK1_RX_LANE_SWAP_ON );
158+
}
159+
160+
if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
161+
{
162+
constexpr auto l_PB_IOO_LL0_LINK1_TX_LANE_SWAP_ON = 0x1;
163+
l_scom_buffer.insert<43, 1, 63, uint64_t>(l_PB_IOO_LL0_LINK1_TX_LANE_SWAP_ON );
164+
}
165+
160166
FAPI_TRY(fapi2::putScom(TGT0, 0x901080full, l_scom_buffer));
161167
}
162168

0 commit comments

Comments
 (0)