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
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
diff --git a/src/smccc/smccc.c b/src/smccc/smccc.c
index 307e7ebd..196cf7da 100644
--- a/src/smccc/smccc.c
+++ b/src/smccc/smccc.c
@@ -263,10 +263,10 @@ static int smccc_version_test(fwts_framework *fw)
/* Bit 31 should not be 1. Bits 30...0 should be non 0 */
if((arg.w[0] >> 31) & 0x1 || ((arg.w[0] & 0x7FFFFFFF) == 0))
{
- fwts_log_error(fw, "SMCCC_TEST_VERSION return value is invalid."
- "arg.w[0] = 0x%8.8" PRIx32,
+ fwts_warning(fw,
+ "SMCCC_TEST_VERSION return value is invalid. arg.w[0] = 0x%8.8" PRIx32 "\n",
arg.w[0]);
- return FWTS_ERROR;
+ return FWTS_OK;
}

smccc_major_version = arg.w[0] >> 16;
@@ -427,9 +427,9 @@ static int smccc_version_test(fwts_framework *fw)
{
if (smccc_arch_features_bbr_check(fw) == FWTS_ERROR)
{
- fwts_failed(fw, LOG_LEVEL_HIGH, "smccc_arch_features check ",
+ fwts_warning(fw, "smccc_arch_features check "
"for Arm BBR specification rules failed\n");
- return (FWTS_ERROR);
+ return (FWTS_OK);
}
}

@@ -469,9 +469,9 @@ static int smccc_arch_soc_id_test_type0(fwts_framework *fw)
fwts_log_error(fw, "SMCCC_TEST_ARCH_SOC_ID return value is invalid."
"arg.w[0] = 0x%8.8" PRIx32,
arg.w[0]);
- fwts_failed(fw, LOG_LEVEL_HIGH, "Arm SMCCC_ARCH_SOC_ID test for ",
+ fwts_warning(fw, "Arm SMCCC_ARCH_SOC_ID test for "
" SoC_ID_Type = 0 failed\n");
- return FWTS_ERROR;
+ return FWTS_OK;
}

uint32_t SoC_ID = arg.w[0] & 0x0000ffff;
@@ -519,9 +519,9 @@ static int smccc_arch_soc_id_test_type1(fwts_framework *fw)
fwts_log_error(fw, "SMCCC_TEST_ARCH_SOC_ID return value is invalid."
"arg.w[0] = 0x%8.8" PRIx16,
arg.w[0]);
- fwts_failed(fw, LOG_LEVEL_HIGH, "Arm SMCCC_ARCH_SOC_ID test for ",
+ fwts_warning(fw, "Arm SMCCC_ARCH_SOC_ID test for "
" SoC_ID_Type = 1 failed\n");
- return FWTS_ERROR;
+ return FWTS_OK;
}

fwts_log_info_verbatim(fw, " SMCCC conduit type: 0x%x ('%s')",
@@ -568,7 +568,7 @@ static int smccc_pci_features_test(fwts_framework *fw)
ret = ioctl(smccc_fd, SMCCC_TEST_PCI_FEATURES, &arg);
if (ret < 0) {
passed = false;
- fwts_failed(fw, LOG_LEVEL_HIGH, "SMCCC_PCI_VERSION",
+ fwts_warning(fw, "SMCCC_PCI_VERSION: "
"SMCCC test driver ioctl SMCCC_TEST_PCI_FEATURES "
"failed, errno=%d (%s)\n", errno, strerror(errno));
} else {
@@ -625,7 +625,7 @@ static int smccc_pci_get_seg_info(fwts_framework *fw)
ret = ioctl(smccc_fd, SMCCC_TEST_PCI_GET_SEG_INFO, &arg);
if (ret < 0) {
passed = false;
- fwts_failed(fw, LOG_LEVEL_HIGH, "SMCCC_PCI_VERSION",
+ fwts_warning(fw, "SMCCC_PCI_VERSION: "
"SMCCC test driver ioctl PCI_GET_SEG_INFO "
"failed, errno=%d (%s)\n", errno, strerror(errno));
break;
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ SRC_URI = "https://fwts.ubuntu.com/release/fwts-V${PV}.tar.gz;subdir=${BP} \
file://0004-Define-__SWORD_TYPE-if-not-defined-by-libc.patch \
file://0005-Undefine-PAGE_SIZE.patch \
file://0001-uefi-esrt-Added-esrt_test2-for-EBBR.patch \
file://0007-smccc-downgrade-fails-to-warnings.patch \
"

SRC_URI[sha256sum] = "25565fd007b378bf29581eb0bc36a03a2f0c49326bb6084f980fee9c5921f289"
Expand Down
4 changes: 2 additions & 2 deletions common/log_parser/test_categoryDT.json
Original file line number Diff line number Diff line change
Expand Up @@ -509,8 +509,8 @@
"Test Suite": "smccc",
"specName": "BBR",
"rel Import. to main readiness": "Minor",
"Waivable": "no",
"SRS scope": "Required",
"Waivable": "yes",
"SRS scope": "Recommended",
"FunctionID": 4,
"Main Readiness Grouping": "security readiness"
}
Expand Down