ShellPkg: acpiview: Add -r parameter for table requirements validation
Define a new command line parameter '-r' to enable checking if all mandatory ACPI tables listed in a specification are present. The -r parameter takes an integer value to specify which specification the validation should be performed against. The parameter is used to set two Acpiview variables. An interface to access these variables is implemented in this patch. The new functionality is aimed at Arm-based platforms, however, there are no restriction on extending it to other architectures. For the 32-bit and 64-bit Arm architectures, the possible values for the -r parameter are: 0: Arm Server Base Boot Requirements 1.0, March 2016 1: Arm Server Base Boot Requirements 1.1, May 2018 2: Arm Server Base Boot Requirements 1.2, September 2019 Signed-off-by: Krzysztof Koch <krzysztof.koch@arm.com> Reviewed-by: Sami Mujawar <Sami.Mujawar@arm.com> Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>
This commit is contained in:
committed by
mergify[bot]
parent
befd18fca6
commit
8af507c1f1
@ -1,6 +1,6 @@
|
||||
/** @file
|
||||
|
||||
Copyright (c) 2016 - 2019, ARM Limited. All rights reserved.
|
||||
Copyright (c) 2016 - 2020, ARM Limited. All rights reserved.
|
||||
SPDX-License-Identifier: BSD-2-Clause-Patent
|
||||
**/
|
||||
|
||||
@ -27,6 +27,8 @@ STATIC UINT32 mTableCount;
|
||||
STATIC UINT32 mBinTableCount;
|
||||
STATIC BOOLEAN mConsistencyCheck;
|
||||
STATIC BOOLEAN mColourHighlighting;
|
||||
STATIC BOOLEAN mMandatoryTableValidate;
|
||||
STATIC UINTN mMandatoryTableSpec;
|
||||
|
||||
/**
|
||||
An array of acpiview command line parameters.
|
||||
@ -37,6 +39,7 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
|
||||
{L"-h", TypeFlag},
|
||||
{L"-l", TypeFlag},
|
||||
{L"-s", TypeValue},
|
||||
{L"-r", TypeValue},
|
||||
{NULL, TypeMax}
|
||||
};
|
||||
|
||||
@ -94,6 +97,60 @@ SetConsistencyChecking (
|
||||
mConsistencyCheck = ConsistencyChecking;
|
||||
}
|
||||
|
||||
/**
|
||||
This function returns the ACPI table requirements validation flag.
|
||||
|
||||
@retval TRUE if check for mandatory table presence should be performed.
|
||||
**/
|
||||
BOOLEAN
|
||||
GetMandatoryTableValidate (
|
||||
VOID
|
||||
)
|
||||
{
|
||||
return mMandatoryTableValidate;
|
||||
}
|
||||
|
||||
/**
|
||||
This function sets the ACPI table requirements validation flag.
|
||||
|
||||
@param Validate Enable/Disable ACPI table requirements validation.
|
||||
**/
|
||||
VOID
|
||||
SetMandatoryTableValidate (
|
||||
BOOLEAN Validate
|
||||
)
|
||||
{
|
||||
mMandatoryTableValidate = Validate;
|
||||
}
|
||||
|
||||
/**
|
||||
This function returns the identifier of specification to validate ACPI table
|
||||
requirements against.
|
||||
|
||||
@return ID of specification listing mandatory tables.
|
||||
**/
|
||||
UINTN
|
||||
GetMandatoryTableSpec (
|
||||
VOID
|
||||
)
|
||||
{
|
||||
return mMandatoryTableSpec;
|
||||
}
|
||||
|
||||
/**
|
||||
This function sets the identifier of specification to validate ACPI table
|
||||
requirements against.
|
||||
|
||||
@param Spec ID of specification listing mandatory tables.
|
||||
**/
|
||||
VOID
|
||||
SetMandatoryTableSpec (
|
||||
UINTN Spec
|
||||
)
|
||||
{
|
||||
mMandatoryTableSpec = Spec;
|
||||
}
|
||||
|
||||
/**
|
||||
This function returns the report options.
|
||||
|
||||
@ -470,6 +527,7 @@ ShellCommandRunAcpiView (
|
||||
LIST_ENTRY* Package;
|
||||
CHAR16* ProblemParam;
|
||||
SHELL_FILE_HANDLE TmpDumpFileHandle;
|
||||
CONST CHAR16* MandatoryTableSpecStr;
|
||||
|
||||
// Set Defaults
|
||||
mReportType = ReportAll;
|
||||
@ -479,6 +537,8 @@ ShellCommandRunAcpiView (
|
||||
mSelectedAcpiTableName = NULL;
|
||||
mSelectedAcpiTableFound = FALSE;
|
||||
mConsistencyCheck = TRUE;
|
||||
mMandatoryTableValidate = FALSE;
|
||||
mMandatoryTableSpec = 0;
|
||||
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
Package = NULL;
|
||||
@ -537,6 +597,18 @@ ShellCommandRunAcpiView (
|
||||
L"-s"
|
||||
);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else if (ShellCommandLineGetFlag (Package, L"-r") &&
|
||||
ShellCommandLineGetValue (Package, L"-r") == NULL) {
|
||||
ShellPrintHiiEx (
|
||||
-1,
|
||||
-1,
|
||||
NULL,
|
||||
STRING_TOKEN (STR_GEN_NO_VALUE),
|
||||
gShellAcpiViewHiiHandle,
|
||||
L"acpiview",
|
||||
L"-r"
|
||||
);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else if ((ShellCommandLineGetFlag (Package, L"-s") &&
|
||||
ShellCommandLineGetFlag (Package, L"-l"))) {
|
||||
ShellPrintHiiEx (
|
||||
@ -568,6 +640,14 @@ ShellCommandRunAcpiView (
|
||||
// Surpress consistency checking if requested
|
||||
SetConsistencyChecking (!ShellCommandLineGetFlag (Package, L"-q"));
|
||||
|
||||
// Evaluate the parameters for mandatory ACPI table presence checks
|
||||
SetMandatoryTableValidate (ShellCommandLineGetFlag (Package, L"-r"));
|
||||
MandatoryTableSpecStr = ShellCommandLineGetValue (Package, L"-r");
|
||||
|
||||
if (MandatoryTableSpecStr != NULL) {
|
||||
SetMandatoryTableSpec (ShellHexStrToUintn (MandatoryTableSpecStr));
|
||||
}
|
||||
|
||||
if (ShellCommandLineGetFlag (Package, L"-l")) {
|
||||
mReportType = ReportTableList;
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user