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
Expand Up @@ -6,7 +6,7 @@ index 94cae289..5ecc0946 100644
#include "StandardTest.h"
#include <Library/EntsLib.h>

+#define ACS_VERSION "SystemReady devicetree ACS v3.1.0\nBBR ACS 2.2.1 (EBBR)"
+#define ACS_VERSION "SystemReady devicetree ACS v3.1.1 (RC0)\nBBR ACS 2.2.1 (EBBR)"
static EFI_TIME Epoch = { .Year = 1970, .Month = 1, .Day = 1 };

//
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ if [ $ADDITIONAL_CMD_OPTION != "noacs" ]; then
echo "Executing FWTS for EBBR"
test_list=`cat /usr/bin/ir_bbr_fwts_tests.ini | grep -v "^#" | awk '{print $1}' | xargs`
echo "Test Executed are $test_list"
echo "SystemReady devicetree band ACS v3.1.0" > /mnt/acs_results_template/acs_results/fwts/FWTSResults.log
echo "SystemReady devicetree band ACS v3.1.1 (RC0)" > /mnt/acs_results_template/acs_results/fwts/FWTSResults.log
/usr/bin/fwts --ebbr `echo $test_list` -r stdout >> /mnt/acs_results_template/acs_results/fwts/FWTSResults.log
echo -e -n "\n"
sync /mnt
Expand All @@ -146,7 +146,7 @@ if [ $ADDITIONAL_CMD_OPTION != "noacs" ]; then
if [ -f /lib/modules/*/kernel/bsa_acs/bsa_acs.ko ]; then
echo "Running Linux BSA tests"
insmod /lib/modules/*/kernel/bsa_acs/bsa_acs.ko
echo "SystemReady devicetree band ACS v3.1.0" > /mnt/acs_results_template/acs_results/linux_acs/bsa_acs_app/BSALinuxResults.log
echo "SystemReady devicetree band ACS v3.1.1 (RC0)" > /mnt/acs_results_template/acs_results/linux_acs/bsa_acs_app/BSALinuxResults.log
bsa --skip-dp-nic-ms >> /mnt/acs_results_template/acs_results/linux_acs/bsa_acs_app/BSALinuxResults.log
dmesg | sed -n 'H; /PE_INFO/h; ${g;p;}' > /mnt/acs_results_template/acs_results/linux_acs/bsa_acs_app/BsaResultsKernel.log
sync /mnt
Expand Down Expand Up @@ -189,7 +189,7 @@ if [ $ADDITIONAL_CMD_OPTION != "noacs" ]; then
if [ ! -s /mnt/acs_results_template/acs_results/linux_tools/dt-validate.log ]; then
echo "The FDT is compliant according to schema " >> /mnt/acs_results_template/acs_results/linux_tools/dt-validate.log
fi
sed -i '1s/^/SystemReady devicetree band ACS v3.1.0 \nDeviceTree bindings of Linux kernel version: 6.16 \ndtschema version: 2025.02 \n\n/' /mnt/acs_results_template/acs_results/linux_tools/dt-validate.log
sed -i '1s/^/SystemReady devicetree band ACS v3.1.1 (RC0) \nDeviceTree bindings of Linux kernel version: 6.16 \ndtschema version: 2025.02 \n\n/' /mnt/acs_results_template/acs_results/linux_tools/dt-validate.log
# Run dt parser on dt-validate log to categorize failures
/usr/bin/systemready-scripts/dt-parser.py /mnt/acs_results_template/acs_results/linux_tools/dt-validate.log --print 2>&1 | tee /mnt/acs_results_template/acs_results/linux_tools/dt-validate-parser.log
else
Expand Down
4 changes: 2 additions & 2 deletions common/config/acs_config_dt.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ACS version: ACS v25.10_3.1.0
ACS version: ACS v25.12_3.1.1 (RC0)
SRS version: SRS 3.1
BSA version: BSA v1.1
BSA version: BSA v1.2
PFDI version: PFDI 1.0 BET0
BBR version: BBR v2.1
EBBR version: EBBR v2.2.0
Expand Down
2 changes: 1 addition & 1 deletion common/linux_scripts/secure_init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ if [ -f /bin/bbsr_fwts_tests.ini ]; then
# Drop tpm2 for DT systems as these tests are ACPI checks
test_list=$(printf '%s\n' $test_list | grep -vw tpm2 | xargs)
echo "Test Executed are $test_list"
echo "SystemReady devicetree band ACS v3.1.0" > $RESULTS_DIR/bbsr/fwts/FWTSResults.log
echo "SystemReady devicetree band ACS v3.1.1 (RC0)" > $RESULTS_DIR/bbsr/fwts/FWTSResults.log
fwts `echo $test_list` -f -r stdout >> $RESULTS_DIR/bbsr/fwts/FWTSResults.log
else
if [ "$automation_enabled" == "True" ] && [ "$bbsr_fwts_enabled" == "False" ]; then
Expand Down
4 changes: 2 additions & 2 deletions common/uefi_scripts/bsa.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ if exist FS%i:\acs_tests\bsa\Bsa.efi then
stall 200000
if exist BsaVerboseTempResults.log then
if exist FS%i:\acs_tests\bsa\bsa_dt.flag then
echo " SystemReady devicetree band ACS v3.1.0" > BsaVerboseResults.log
echo " SystemReady devicetree band ACS v3.1.1 (RC0)" > BsaVerboseResults.log
else
echo " SystemReady band ACS v3.1.0" > BsaVerboseResults.log
endif
Expand Down Expand Up @@ -150,7 +150,7 @@ if exist FS%i:\acs_tests\bsa\Bsa.efi then
:BsaEE
if exist BsaTempResults.log then
if exist FS%i:\acs_tests\bsa\bsa_dt.flag then
echo " SystemReady devicetree band ACS v3.1.0" > BsaResults.log
echo " SystemReady devicetree band ACS v3.1.1 (RC0)" > BsaResults.log
else
echo " SystemReady band ACS v3.1.0" > BsaResults.log
endif
Expand Down
6 changes: 3 additions & 3 deletions common/uefi_scripts/pfdi.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ if exist FS%i:\acs_tests\pfdi\pfdi.efi then
stall 200000
if exist pfdiverbosetempresults.log then
if exist FS%i:\acs_tests\bsa\bsa_dt.flag then
echo " SystemReady devicetree band ACS v3.1.0" > pfdiverboseresults.log
echo " SystemReady devicetree band ACS v3.1.1 (RC0)" > pfdiverboseresults.log
else
echo " SystemReady band ACS v3.1.0" > pfdiverboseresults.log
endif
Expand Down Expand Up @@ -101,7 +101,7 @@ if exist FS%i:\acs_tests\pfdi\pfdi.efi then
stall 200000
if exist pfditempresults.log then
if exist FS%i:\acs_tests\bsa\bsa_dt.flag then
echo " SystemReady devicetree band ACS v3.1.0" > pfdiresults.log
echo " SystemReady devicetree band ACS v3.1.1 (RC0)" > pfdiresults.log
else
echo " SystemReady band ACS v3.1.0" > pfdiresults.log
endif
Expand All @@ -116,4 +116,4 @@ if exist FS%i:\acs_tests\pfdi\pfdi.efi then
else
echo "pfdi.efi not present"
endif
:Done
:Done