From 88ec6b9350840afd17580ddef15b8d01e2b93c0b Mon Sep 17 00:00:00 2001 From: ajayswar-s <139959004+ajayswar-s@users.noreply.github.com> Date: Wed, 23 Oct 2024 19:18:51 +0530 Subject: [PATCH] Errata 743 and 663 (#500) * ERRATA - 743: Remove S_L7PE_03 duplicate - The rule and test case for S_L7PE_03 is removed - It is duplicate of S_L5PE_04 in level 5 Signed-off-by: Ajayswar S Change-Id: I37da52e6536a998702bdd6d54142659f246e101e * ERRATA - 663: Remove S_L7PE_08, S_l7PE_09 - The test case for S_L7PE_08, S_L7PE_09 will not compile - THe above rule is also removed from checklist but the test file is there. Signed-off-by: Ajayswar S Change-Id: I6bcd14d0f093089020f60eab56cd1d4f36ce445f --------- Signed-off-by: Ajayswar S --- docs/arm_sbsa_testcase_checklist.rst | 6 --- test_pool/pe/operating_system/test_c011.c | 2 + test_pool/pe/operating_system/test_c030.c | 64 ----------------------- uefi_app/SbsaAvs.inf | 3 -- uefi_app/SbsaAvsNist.inf | 3 -- 5 files changed, 2 insertions(+), 76 deletions(-) delete mode 100644 test_pool/pe/operating_system/test_c030.c diff --git a/docs/arm_sbsa_testcase_checklist.rst b/docs/arm_sbsa_testcase_checklist.rst index 951fa1d0..5f6b3465 100644 --- a/docs/arm_sbsa_testcase_checklist.rst +++ b/docs/arm_sbsa_testcase_checklist.rst @@ -71,8 +71,6 @@ The below table provides the following details +-------+--------------------------------------------+-----+----------------------------------------------------+----------------+----+----------+-----+-------------------+ |29 |Check for ECV support |L7 |S_L7PE_02 |Yes |Yes |Yes |No |No | +-------+--------------------------------------------+-----+----------------------------------------------------+----------------+----+----------+-----+-------------------+ -|30 |Check for AMU Support |L7 |S_L7PE_03 |Yes |Yes |Yes |No |No | -+-------+--------------------------------------------+-----+----------------------------------------------------+----------------+----+----------+-----+-------------------+ |31 |Checks ASIMD Int8 matrix multiplc |L7 |S_L7PE_04 |Yes |Yes |Yes |No |No | +-------+--------------------------------------------+-----+----------------------------------------------------+----------------+----+----------+-----+-------------------+ |32 |Check for BFLOAT16 extension |L7 |S_L7PE_05 |Yes |Yes |Yes |No |No | @@ -81,10 +79,6 @@ The below table provides the following details +-------+--------------------------------------------+-----+----------------------------------------------------+----------------+----+----------+-----+-------------------+ |34 |Check for SVE Int8 matrix multiplc |L7 |S_L7PE_07 |Yes |Yes |Yes |No |No | +-------+--------------------------------------------+-----+----------------------------------------------------+----------------+----+----------+-----+-------------------+ -|35 |Check for data gathering hint |L7 |S_L7PE_08 |Yes |Yes |Yes |No |No | -+-------+--------------------------------------------+-----+----------------------------------------------------+----------------+----+----------+-----+-------------------+ -|36 |Check WFE Fine tune delay feature |L7 |S_L7PE_09 |Yes |Yes |Yes |No |No | -+-------+--------------------------------------------+-----+----------------------------------------------------+----------------+----+----------+-----+-------------------+ |37 |Check for enhanced PAN feature |FR |S_L8PE_04 |Yes |Yes |Yes |No |No | +-------+--------------------------------------------+-----+----------------------------------------------------+----------------+----+----------+-----+-------------------+ |38 |Check XS attribute functionality |FR |S_L8PE_01 |Yes |Yes |Yes |No |No | diff --git a/test_pool/pe/operating_system/test_c011.c b/test_pool/pe/operating_system/test_c011.c index c6478094..e676a2ca 100644 --- a/test_pool/pe/operating_system/test_c011.c +++ b/test_pool/pe/operating_system/test_c011.c @@ -36,6 +36,8 @@ static void payload(void) /* Read ID_AA64PFR0_EL1[47:44] for Activity monitors extension */ data = VAL_EXTRACT_BITS(val_pe_reg_read(ID_AA64PFR0_EL1), 44, 47); + val_print_primary_pe(ACS_PRINT_DEBUG, "\n ID_AA64PFR0_EL1.AMU[47:44] = %llx", + data, index); if (data != 0) val_set_status(index, RESULT_PASS(TEST_NUM, 01)); else diff --git a/test_pool/pe/operating_system/test_c030.c b/test_pool/pe/operating_system/test_c030.c deleted file mode 100644 index 736c3cb5..00000000 --- a/test_pool/pe/operating_system/test_c030.c +++ /dev/null @@ -1,64 +0,0 @@ -/** @file - * Copyright (c) 2023-2024, Arm Limited or its affiliates. All rights reserved. - * SPDX-License-Identifier : Apache-2.0 - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - **/ - -#include "val/common/include/acs_val.h" -#include "val/common/include/acs_pe.h" -#include "val/sbsa/include/sbsa_acs_pe.h" -#include "val/sbsa/include/sbsa_val_interface.h" - -#define TEST_NUM (ACS_PE_TEST_NUM_BASE + 30) -#define TEST_RULE "S_L7PE_03" -#define TEST_DESC "Check for AMU Support " - -static void payload(void) -{ - uint64_t data = 0; - uint32_t index = val_pe_get_index_mpid(val_pe_get_mpid()); - uint32_t primary_pe_idx = val_pe_get_primary_index(); - - if (g_sbsa_level < 7) { - val_set_status(index, RESULT_SKIP(TEST_NUM, 01)); - return; - } - - /* ID_AA64PFR0_EL1.AMU[47:44] >= 0b0001 indicate AMU Support */ - data = VAL_EXTRACT_BITS(val_pe_reg_read(ID_AA64PFR0_EL1), 44, 47); - if (index == primary_pe_idx) { - val_print(ACS_PRINT_DEBUG, "\n ID_AA64PFR0_EL1.AMU[47:44] = %llx", data); - } - - if (data >= 1) - val_set_status(index, RESULT_PASS(TEST_NUM, 01)); - else - val_set_status(index, RESULT_FAIL(TEST_NUM, 01)); -} - -uint32_t c030_entry(uint32_t num_pe) -{ - uint32_t status = ACS_STATUS_FAIL; - - status = val_initialize_test(TEST_NUM, TEST_DESC, num_pe); - /* This check is when user is forcing us to skip this test */ - if (status != ACS_STATUS_SKIP) - val_run_test_payload(TEST_NUM, num_pe, payload, 0); - - /* get the result from all PE and check for failure */ - status = val_check_for_error(TEST_NUM, num_pe, TEST_RULE); - val_report_status(0, ACS_END(TEST_NUM), TEST_RULE); - - return status; -} diff --git a/uefi_app/SbsaAvs.inf b/uefi_app/SbsaAvs.inf index e64512ae..06193040 100644 --- a/uefi_app/SbsaAvs.inf +++ b/uefi_app/SbsaAvs.inf @@ -60,13 +60,10 @@ ../test_pool/pe/operating_system/test_c027.c ../test_pool/pe/operating_system/test_c028.c ../test_pool/pe/operating_system/test_c029.c - ../test_pool/pe/operating_system/test_c030.c ../test_pool/pe/operating_system/test_c031.c ../test_pool/pe/operating_system/test_c032.c ../test_pool/pe/operating_system/test_c033.c ../test_pool/pe/operating_system/test_c034.c - ../test_pool/pe/operating_system/test_c035.c - ../test_pool/pe/operating_system/test_c036.c ../test_pool/pe/operating_system/test_c037.c ../test_pool/pe/operating_system/test_c038.c ../test_pool/pe/operating_system/test_c039.c diff --git a/uefi_app/SbsaAvsNist.inf b/uefi_app/SbsaAvsNist.inf index 4a258481..438c0b02 100644 --- a/uefi_app/SbsaAvsNist.inf +++ b/uefi_app/SbsaAvsNist.inf @@ -60,13 +60,10 @@ ../test_pool/pe/operating_system/test_c027.c ../test_pool/pe/operating_system/test_c028.c ../test_pool/pe/operating_system/test_c029.c - ../test_pool/pe/operating_system/test_c030.c ../test_pool/pe/operating_system/test_c031.c ../test_pool/pe/operating_system/test_c032.c ../test_pool/pe/operating_system/test_c033.c ../test_pool/pe/operating_system/test_c034.c - ../test_pool/pe/operating_system/test_c035.c - ../test_pool/pe/operating_system/test_c036.c ../test_pool/pe/operating_system/test_c037.c ../test_pool/pe/operating_system/test_c038.c ../test_pool/pe/operating_system/test_c039.c