Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 12 additions & 7 deletions test_pool/memory_map/m004.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@ check_peripheral_dma_capability (void)
pcie_bdf_list_t *pcie_peripherals_bdf_list = val_pcie_get_pcie_peripheral_bdf_list();

if (pcie_peripherals_bdf_list == NULL || pcie_peripherals_bdf_list->count == 0) {
val_print(DEBUG, "\n Skip as no peripherals detected ");
val_set_status(index, RESULT_SKIP(1));
val_print(WARN, "\n ACS could not detect any PCIe peripherals with driver support.");
val_print(WARN, "\n if the system has peripherals devices, "
"manually review the rule.");
val_set_status(index, RESULT_WARNING(1));
return;
}

Expand Down Expand Up @@ -84,9 +86,10 @@ payload_check_dev_dma_if_behind_smmu (void)
pcie_bdf_list_t *pcie_peripherals_bdf_list = val_pcie_get_pcie_peripheral_bdf_list();

if (pcie_peripherals_bdf_list == NULL || pcie_peripherals_bdf_list->count == 0) {
val_print(DEBUG, "\n Skip as no peripherals detected ");
val_set_status(index, RESULT_SKIP(1));
return;
val_print(WARN, "\n ACS could not detect any PCIe peripherals with driver support.");
val_print(WARN, "\n if the system has peripherals devices, "
"manually review the rule.");
val_set_status(index, RESULT_WARNING(1));
}

/* Check if a device is capable of accessing non secure address */
Expand Down Expand Up @@ -127,8 +130,10 @@ payload_check_if_non_dma_dev_behind_smmu (void)
pcie_bdf_list_t *pcie_peripherals_bdf_list = val_pcie_get_pcie_peripheral_bdf_list();

if (pcie_peripherals_bdf_list == NULL || pcie_peripherals_bdf_list->count == 0) {
val_print(DEBUG, "\n Skip as no peripherals detected ");
val_set_status(index, RESULT_SKIP(1));
val_print(WARN, "\n ACS could not detect any PCIe peripherals with driver support.");
val_print(WARN, "\n if the system has peripherals devices, "
"manually review the rule.");
val_set_status(index, RESULT_WARNING(1));
return;
}

Expand Down
8 changes: 5 additions & 3 deletions test_pool/pcie/p095.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ payload(void)
target_dev_index = val_dma_get_info(DMA_NUM_CTRL, 0);

if (!target_dev_index) {
val_print(DEBUG, "\n No DMA controllers detected... ");
val_set_status(index, RESULT_SKIP(1));
val_print(WARN, "\n ACS could not detect any DMA-capable devices.");
val_print(WARN, "\n If the platform includes DMA-capable devices, "
"manual validation is required.");
val_set_status(index, RESULT_WARNING(1));
return;
}

Expand Down Expand Up @@ -81,7 +83,7 @@ payload(void)
return;

test_warn_unimplemented:
val_set_status(index, RESULT_WARNING(1));
val_set_status(index, RESULT_WARNING(2));
}


Expand Down
8 changes: 5 additions & 3 deletions test_pool/pcie/p105.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@ payload(void)
target_dev_index = val_dma_get_info(DMA_NUM_CTRL, 0);

if (!target_dev_index) {
val_print(DEBUG, "\n No DMA controllers detected... ");
val_set_status(index, RESULT_SKIP(1));
val_print(WARN, "\n ACS could not detect any DMA-capable devices.");
val_print(WARN, "\n If the platform includes DMA-capable devices, "
"manual validation is required.");
val_set_status(index, RESULT_WARNING(1));
return;
}

Expand Down Expand Up @@ -82,7 +84,7 @@ payload(void)
return;

test_warn_unimplemented:
val_set_status(index, RESULT_WARNING(1));
val_set_status(index, RESULT_WARNING(2));

}

Expand Down
14 changes: 9 additions & 5 deletions test_pool/peripherals/d004.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,10 @@ payload_check_dma_mem_attribute(void)

if (!target_dev_index)
{
val_print(INFO, "\n No DMA controllers detected... ");
val_set_status(index, RESULT_SKIP(1));
val_print(WARN, "\n ACS could not detect any DMA-capable devices.");
val_print(WARN, "\n If the platform includes DMA-capable devices, "
"manual validation is required.");
val_set_status(index, RESULT_WARNING(1));
return;
}

Expand Down Expand Up @@ -107,7 +109,7 @@ payload_check_dma_mem_attribute(void)
return;

test_warn_unimplemented:
val_set_status(index, RESULT_WARNING(1));
val_set_status(index, RESULT_WARNING(2));
}

/* This test verifies I/O coherent DMA traffic must have the attribute
Expand All @@ -130,8 +132,10 @@ payload_check_io_coherent_dma_mem_attribute(void)

if (!target_dev_index)
{
val_print(INFO, "\n No DMA controllers detected... ");
val_set_status(index, RESULT_SKIP(1));
val_print(WARN, "\n ACS could not detect any DMA-capable devices.");
val_print(WARN, "\n If the platform includes DMA-capable devices, "
"manual validation is required.");
val_set_status(index, RESULT_WARNING(1));
return;
}

Expand Down
2 changes: 1 addition & 1 deletion val/src/acs_pcie.c
Original file line number Diff line number Diff line change
Expand Up @@ -2441,7 +2441,7 @@ pcie_bdf_list_t *val_pcie_get_pcie_peripheral_bdf_list(void)
}

if (!val_pcie_device_driver_present(dev_bdf)) {
val_print(DEBUG, "\n Driver not present for bdf 0x%x", dev_bdf);
val_print(WARN, "\n Driver not present for bdf 0x%x", dev_bdf);
continue;
}

Expand Down
Loading