From 43dc65f7a4e44b5db71c63996945faabd9bf745f Mon Sep 17 00:00:00 2001 From: Manjunatha D Date: Wed, 4 Feb 2026 09:20:02 +0000 Subject: [PATCH] fwts: downgrade smccc test failures to warnings in dt - smccc is made as recommendation in dt - smccc tests failures are changed to warnings Signed-off-by: Manjunatha D Change-Id: I3d7e0043ce69e609ece34f671094376117f85cca --- ...07-smccc-downgrade-fails-to-warnings.patch | 72 +++++++++++++++++++ .../recipes-acs/fwts/fwts_26.01.00.bb | 1 + common/log_parser/test_categoryDT.json | 4 +- 3 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 SystemReady-devicetree-band/Yocto/meta-woden/recipes-acs/fwts/files/0007-smccc-downgrade-fails-to-warnings.patch diff --git a/SystemReady-devicetree-band/Yocto/meta-woden/recipes-acs/fwts/files/0007-smccc-downgrade-fails-to-warnings.patch b/SystemReady-devicetree-band/Yocto/meta-woden/recipes-acs/fwts/files/0007-smccc-downgrade-fails-to-warnings.patch new file mode 100644 index 00000000..84c1cb7c --- /dev/null +++ b/SystemReady-devicetree-band/Yocto/meta-woden/recipes-acs/fwts/files/0007-smccc-downgrade-fails-to-warnings.patch @@ -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; diff --git a/SystemReady-devicetree-band/Yocto/meta-woden/recipes-acs/fwts/fwts_26.01.00.bb b/SystemReady-devicetree-band/Yocto/meta-woden/recipes-acs/fwts/fwts_26.01.00.bb index 47263908..59a14fd7 100644 --- a/SystemReady-devicetree-band/Yocto/meta-woden/recipes-acs/fwts/fwts_26.01.00.bb +++ b/SystemReady-devicetree-band/Yocto/meta-woden/recipes-acs/fwts/fwts_26.01.00.bb @@ -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" diff --git a/common/log_parser/test_categoryDT.json b/common/log_parser/test_categoryDT.json index 3cff0813..8db976cf 100644 --- a/common/log_parser/test_categoryDT.json +++ b/common/log_parser/test_categoryDT.json @@ -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" }