Skip to content

feat: Switch skip-dp-nic-ms skips to WARN with explicit guidance #414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chetan-rathore merged 1 commit into from
May 27, 2026
Merged

feat: Switch skip-dp-nic-ms skips to WARN with explicit guidance #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions test_pool/pcie/p030.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ payload(void)
uint32_t base_cc;
uint32_t test_fails;
uint32_t test_skip = 1;
bool skip_due_to_flag = false;
bool skip_flag = acs_policy_get_pcie_skip_dp_nic_ms();
uint64_t bar_base;
uint32_t status;
uint32_t timeout;
Expand Down Expand Up @@ -159,9 +161,10 @@ payload(void)
val_pcie_read_cfg(bdf, TYPE01_RIDR, &reg_value);
val_print(DEBUG, "\n Class code is 0x%x", reg_value);
base_cc = reg_value >> TYPE01_BCC_SHIFT;
if (acs_policy_get_pcie_skip_dp_nic_ms() &&
if (skip_flag &&
((base_cc == UNCLAS_CC) || (base_cc == CNTRL_CC)
|| (base_cc == DP_CNTRL_CC) || (base_cc == MAS_CC))) {
skip_due_to_flag = true;
val_print(DEBUG, "\n Skipping for BDF 0x%x", bdf);
continue;
}
Expand Down Expand Up @@ -228,8 +231,19 @@ payload(void)
bar_data = 0;
}

if (test_skip == 1)
val_set_status(pe_index, RESULT_SKIP(1));
if (test_skip == 1) {
if (skip_flag && skip_due_to_flag) {
val_print(WARN,
"\n DP/NIC/MAS/RES devices are skipped.");
val_print(WARN,
"\n Please individually run the test without");
val_print(WARN,
"\n --skip-dp-nic-ms to check the compliance.");
val_set_status(pe_index, RESULT_WARNING(1));
} else {
val_set_status(pe_index, RESULT_SKIP(1));
}
}
else if (test_fails)
val_set_status(pe_index, RESULT_FAIL(test_fails));
else
Expand Down
21 changes: 17 additions & 4 deletions test_pool/pcie/p035.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ payload(void)
uint32_t base_cc;
uint32_t test_fails;
uint32_t test_skip = 1;
bool skip_due_to_flag = false;
bool skip_flag = acs_policy_get_pcie_skip_dp_nic_ms();
uint32_t idx;
uint32_t timeout;
uint32_t status;
Expand All @@ -92,10 +94,11 @@ payload(void)
* init can get corrupted when FLR is done */
val_pcie_read_cfg(bdf, TYPE01_RIDR, &reg_value);
base_cc = reg_value >> TYPE01_BCC_SHIFT;
if (acs_policy_get_pcie_skip_dp_nic_ms() &&
if (skip_flag &&
((base_cc == UNCLAS_CC) || (base_cc == MAS_CC)
|| (base_cc == CNTRL_CC) || (base_cc == DP_CNTRL_CC)))
{
skip_due_to_flag = true;
val_print(DEBUG, "\n Skipping for BDF - 0x%x ", bdf);
val_print(DEBUG, " Classcode is : 0x%x ", base_cc);
continue;
Expand Down Expand Up @@ -206,9 +209,19 @@ payload(void)
}

if (test_skip == 1) {
val_print(DEBUG,
"\n No EP type device found with PCIe Express Cap support. Skipping test");
val_set_status(pe_index, RESULT_SKIP(1));
if (skip_flag && skip_due_to_flag) {
val_print(WARN,
"\n DP/NIC/MAS/RES devices are skipped.");
val_print(WARN,
"\n Please individually run the test without");
val_print(WARN,
"\n --skip-dp-nic-ms to check the compliance.");
val_set_status(pe_index, RESULT_WARNING(1));
} else {
val_print(DEBUG,
"\n No EP type device found with PCIe Express Cap support. Skipping test");
val_set_status(pe_index, RESULT_SKIP(1));
}
}
else if (test_fails)
val_set_status(pe_index, RESULT_FAIL(test_fails));
Expand Down
23 changes: 18 additions & 5 deletions test_pool/pcie/p045.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ payload(void)
char *baseptr;
uint32_t index = val_pe_get_index_mpid(val_pe_get_mpid());
uint32_t test_skip = 1;
bool skip_due_to_flag = false;
bool skip_flag = acs_policy_get_pcie_skip_dp_nic_ms();
uint32_t test_warn = 1;
uint32_t test_fail = 0;
uint64_t offset;
Expand Down Expand Up @@ -110,9 +112,10 @@ payload(void)
val_print(DEBUG, "\n Class code is 0x%x", reg_value);
base_cc = reg_value >> TYPE01_BCC_SHIFT;

if (acs_policy_get_pcie_skip_dp_nic_ms() &&
if (skip_flag &&
((base_cc == UNCLAS_CC) || (base_cc == CNTRL_CC)
|| (base_cc == DP_CNTRL_CC) || (base_cc == MAS_CC))) {
skip_due_to_flag = true;
val_print(DEBUG, "\n Skipping BDF 0x%x", bdf);
tbl_index++;
goto next_bdf;
Expand Down Expand Up @@ -256,10 +259,20 @@ payload(void)
}

test_status:
if (test_skip)
val_set_status(index, RESULT_SKIP(1));
else if (test_warn) {
val_set_status(index, RESULT_WARNING(1));
if (test_skip) {
if (skip_flag && skip_due_to_flag) {
val_print(WARN,
"\n DP/NIC/MAS/RES devices are skipped.");
val_print(WARN,
"\n Please individually run the test without");
val_print(WARN,
"\n --skip-dp-nic-ms to check the compliance.");
val_set_status(index, RESULT_WARNING(1));
} else {
val_set_status(index, RESULT_SKIP(1));
}
} else if (test_warn) {
val_set_status(index, RESULT_WARNING(1));
} else if (test_fail)
val_set_status(index, RESULT_FAIL(test_fail));
else
Expand Down
21 changes: 17 additions & 4 deletions test_pool/pcie/p058.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ payload(void *arg)
uint32_t base_cc;
uint32_t test_fails;
uint32_t test_skip = 1;
bool skip_due_to_flag = false;
bool skip_flag = acs_policy_get_pcie_skip_dp_nic_ms();
uint64_t bar_base;
uint32_t dp_type;
uint32_t status;
Expand Down Expand Up @@ -198,9 +200,10 @@ payload(void *arg)
val_pcie_read_cfg(bdf, TYPE01_RIDR, &reg_value);
val_print(DEBUG, "\n Class code is 0x%x", reg_value);
base_cc = reg_value >> TYPE01_BCC_SHIFT;
if (acs_policy_get_pcie_skip_dp_nic_ms() &&
if (skip_flag &&
((base_cc == UNCLAS_CC) || (base_cc == CNTRL_CC)
|| (base_cc == DP_CNTRL_CC) || (base_cc == MAS_CC))) {
skip_due_to_flag = true;
val_print(DEBUG, "\n Skipping for BDF 0x%x", bdf);
continue;
}
Expand Down Expand Up @@ -268,9 +271,19 @@ payload(void *arg)
}

if (test_skip == 1) {
val_print(DEBUG,
"\n Found no target device type with MMIO BAR. Skipping test.");
val_set_status(pe_index, RESULT_SKIP(01));
if (skip_flag && skip_due_to_flag) {
val_print(WARN,
"\n DP/NIC/MAS/RES devices are skipped.");
val_print(WARN,
"\n Please individually run the test without");
val_print(WARN,
"\n --skip-dp-nic-ms to check the compliance.");
val_set_status(pe_index, RESULT_WARNING(01));
} else {
val_print(DEBUG,
"\n Found no target device type with MMIO BAR. Skipping test.");
val_set_status(pe_index, RESULT_SKIP(01));
}
}
else if (test_fails)
val_set_status(pe_index, RESULT_FAIL(test_fails));
Expand Down
21 changes: 17 additions & 4 deletions test_pool/pcie/p063.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ payload(void)
uint32_t base_cc;
uint32_t test_fails;
bool test_skip = 1;
bool skip_due_to_flag = false;
bool skip_flag = acs_policy_get_pcie_skip_dp_nic_ms();
uint32_t idx;
uint32_t timeout;
uint32_t status;
Expand All @@ -93,10 +95,11 @@ payload(void)
* init can get corrupted when FLR is done */
val_pcie_read_cfg(bdf, TYPE01_RIDR, &reg_value);
base_cc = reg_value >> TYPE01_BCC_SHIFT;
if (acs_policy_get_pcie_skip_dp_nic_ms() &&
if (skip_flag &&
((base_cc == UNCLAS_CC) || (base_cc == MAS_CC)
|| (base_cc == CNTRL_CC) || (base_cc == DP_CNTRL_CC)))
{
skip_due_to_flag = true;
val_print(DEBUG, "\n Skipping for BDF - 0x%x ", bdf);
val_print(DEBUG, " Classcode is : 0x%x ", base_cc);
continue;
Expand Down Expand Up @@ -202,9 +205,19 @@ payload(void)
}

if (test_skip == 1) {
val_print(DEBUG,
"\n No target device type with FLR Cap found. Skipping test");
val_set_status(pe_index, RESULT_SKIP(01));
if (skip_flag && skip_due_to_flag) {
val_print(WARN,
"\n DP/NIC/MAS/RES devices are skipped.");
val_print(WARN,
"\n Please individually run the test without");
val_print(WARN,
"\n --skip-dp-nic-ms to check the compliance.");
val_set_status(pe_index, RESULT_WARNING(01));
} else {
val_print(DEBUG,
"\n No target device type with FLR Cap found. Skipping test");
val_set_status(pe_index, RESULT_SKIP(01));
}
}
else if (test_fails)
val_set_status(pe_index, RESULT_FAIL(test_fails));
Expand Down
23 changes: 18 additions & 5 deletions test_pool/pcie/p094.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ payload(void)
uint32_t test_skip = 1;
uint32_t test_warn = 1;
uint32_t test_fail = 0;
bool skip_due_to_flag = false;
bool skip_flag = acs_policy_get_pcie_skip_dp_nic_ms();
uint64_t offset;
uint64_t base;
pcie_device_bdf_table *bdf_tbl_ptr;
Expand Down Expand Up @@ -111,9 +113,10 @@ payload(void)
val_print(DEBUG, "\n Class code is 0x%x", reg_value);
base_cc = reg_value >> TYPE01_BCC_SHIFT;

if (acs_policy_get_pcie_skip_dp_nic_ms() &&
if (skip_flag &&
((base_cc == UNCLAS_CC) || (base_cc == CNTRL_CC)
|| (base_cc == DP_CNTRL_CC) || (base_cc == MAS_CC))) {
skip_due_to_flag = true;
val_print(DEBUG, "\n Skipping BDF 0x%x", bdf);
tbl_index++;
goto next_bdf;
Expand Down Expand Up @@ -274,10 +277,20 @@ payload(void)
}

test_status:
if (test_skip)
val_set_status(index, RESULT_SKIP(1));
else if (test_warn) {
val_set_status(index, RESULT_WARNING(1));
if (test_skip) {
if (skip_flag && skip_due_to_flag) {
val_print(WARN,
"\n DP/NIC/MAS/RES devices are skipped.");
val_print(WARN,
"\n Please individually run the test without");
val_print(WARN,
"\n --skip-dp-nic-ms to check the compliance.");
val_set_status(index, RESULT_WARNING(1));
} else {
val_set_status(index, RESULT_SKIP(1));
}
} else if (test_warn) {
val_set_status(index, RESULT_WARNING(1));
} else if (test_fail)
val_set_status(index, RESULT_FAIL(test_fail));
else
Expand Down
32 changes: 24 additions & 8 deletions test_pool/pcie/p097.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ payload (void)
uint64_t current_dev_bdf;
uint64_t next_dev_bdf;
uint32_t test_skip = 1;
bool skip_due_to_flag = false;
bool skip_flag = acs_policy_get_pcie_skip_dp_nic_ms();
pcie_device_bdf_table *bdf_tbl_ptr;
uint32_t tbl_index = 0;
uint32_t tbl_index_next = 0;
Expand All @@ -146,11 +148,13 @@ payload (void)
* descriptors is causing an exception and for the devices
* with base class codes greater than 13h as they
* are reserved */
if ((acs_policy_get_pcie_skip_dp_nic_ms() &&
bool skip_by_flag = (skip_flag &&
((base_cc == UNCLAS_CC) || (base_cc == CNTRL_CC)
|| (base_cc == DP_CNTRL_CC) || (base_cc == MAS_CC)))
|| (base_cc > RES_CC))
|| (base_cc == DP_CNTRL_CC) || (base_cc == MAS_CC)));
if (skip_by_flag || (base_cc > RES_CC))
{
if (skip_by_flag)
skip_due_to_flag = true;
tbl_index++;
val_print(DEBUG, "\n Skipping DP/NIC/MAS/RES device.");
continue;
Expand Down Expand Up @@ -191,11 +195,13 @@ payload (void)
* descriptors is causing an exception and for the devices
* with base class codes greater than 13h as they
* are reserved */
if ((acs_policy_get_pcie_skip_dp_nic_ms() &&
skip_by_flag = (skip_flag &&
((base_cc == UNCLAS_CC) || (base_cc == CNTRL_CC)
|| (base_cc == DP_CNTRL_CC) || (base_cc == MAS_CC)))
|| (base_cc > RES_CC))
|| (base_cc == DP_CNTRL_CC) || (base_cc == MAS_CC)));
if (skip_by_flag || (base_cc > RES_CC))
{
if (skip_by_flag)
skip_due_to_flag = true;
val_print(DEBUG, "\n Skipping DP/NIC/MAS/RES device.");
tbl_index_next++;
continue;
Expand Down Expand Up @@ -247,8 +253,18 @@ payload (void)
}

if (test_skip) {
val_print(ERROR, "\n No MSI vectors found ");;
val_set_status (index, RESULT_SKIP(01));
if (skip_flag && skip_due_to_flag) {
val_print(WARN,
"\n DP/NIC/MAS/RES devices are skipped.");
val_print(WARN,
"\n Please individually run the test without");
val_print(WARN,
"\n --skip-dp-nic-ms to check the compliance.");
val_set_status (index, RESULT_WARNING(01));
} else {
val_print(ERROR, "\n No MSI vectors found ");
val_set_status (index, RESULT_SKIP(01));
}
} else if (!status) {
val_set_status (index, RESULT_PASS);
}
Expand Down
Loading