summaryrefslogtreecommitdiff
path: root/ShellPkg
diff options
context:
space:
mode:
authorAbdul Lateef Attar <abdattar@amd.com>2022-03-18 20:59:00 +0800
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2022-03-28 09:38:30 +0000
commit40004ff9d5e11441bb970dfc701e552801060b1b (patch)
treefd2ec70be77b36f6f5ee263b264ea1e53950b971 /ShellPkg
parent691b1786670d17f7dc5ad717925210f1f62ddd8a (diff)
downloadedk2-40004ff9d5e11441bb970dfc701e552801060b1b.zip
edk2-40004ff9d5e11441bb970dfc701e552801060b1b.tar.gz
edk2-40004ff9d5e11441bb970dfc701e552801060b1b.tar.bz2
ShellPkg/AcpiView: PrintFormatter for FADT Flags field
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3839 Adds PrintFormatter function to the FADT flags field. Prints indivisual flag name along with flag value. Cc: Ray Ni <ray.ni@intel.com> Cc: Zhichao Gao <zhichao.gao@intel.com> Cc: Sami Mujawar <sami.mujawar@arm.com> Signed-off-by: Abdul Lateef Attar <abdattar@amd.com> Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>
Diffstat (limited to 'ShellPkg')
-rw-r--r--ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c2
-rw-r--r--ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c167
2 files changed, 113 insertions, 56 deletions
diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c
index fcc56c1..eac9286 100644
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c
@@ -884,7 +884,7 @@ ParseAcpiBitFields (
}
// extract Bitfield data for the current item
- Data = (BitsData >> Parser[Index].Offset) & ~(~0ULL << Parser[Index].Length);
+ Data = RShiftU64 (BitsData, Parser[Index].Offset) & ~(LShiftU64 (~0ULL, Parser[Index].Length));
if (Trace) {
// if there is a Formatter function let the function handle
diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c
index f8fbb4b..abc58d6 100644
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c
@@ -2,6 +2,7 @@
FADT table parser
Copyright (c) 2016 - 2020, ARM Limited. All rights reserved.
+ Copyright (c) 2022, AMD Incorporated. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent
@par Reference(s):
@@ -130,69 +131,125 @@ ValidateFlags (
#endif
}
+STATIC CONST ACPI_PARSER FadtFlagParser[] = {
+ { L"WBINVD", 1, 0, L"%d", NULL, NULL, NULL, NULL },
+ { L"WBINVD_FLUSH", 1, 1, L"%d", NULL, NULL, NULL, NULL },
+ { L"PROC_C1", 1, 2, L"%d", NULL, NULL, NULL, NULL },
+ { L"P_LVL2_UP", 1, 3, L"%d", NULL, NULL, NULL, NULL },
+ { L"PWR_BUTTON", 1, 4, L"%d", NULL, NULL, NULL, NULL },
+ { L"SLP_BUTTON", 1, 5, L"%d", NULL, NULL, NULL, NULL },
+ { L"FIX_RTC", 1, 6, L"%d", NULL, NULL, NULL, NULL },
+ { L"RTC_S4", 1, 7, L"%d", NULL, NULL, NULL, NULL },
+ { L"TMR_VAL_EXT", 1, 8, L"%d", NULL, NULL, NULL, NULL },
+ { L"DCK_CAP", 1, 9, L"%d", NULL, NULL, NULL, NULL },
+ { L"RESET_REG_SUP", 1, 10, L"%d", NULL, NULL, NULL, NULL },
+ { L"SEALED_CASE", 1, 11, L"%d", NULL, NULL, NULL, NULL },
+ { L"HEADLESS", 1, 12, L"%d", NULL, NULL, NULL, NULL },
+ { L"CPU_SW_SLP", 1, 13, L"%d", NULL, NULL, NULL, NULL },
+ { L"PCI_EXP_WAK", 1, 14, L"%d", NULL, NULL, NULL, NULL },
+ { L"USE_PLATFORM_CLOCK", 1, 15, L"%d", NULL, NULL, NULL, NULL },
+ { L"S4_RTC_STS_VALID", 1, 16, L"%d", NULL, NULL, NULL, NULL },
+ { L"REMOTE_POWER_ON_CAPABLE", 1, 17, L"%d", NULL, NULL, NULL, NULL },
+ { L"FORCE_APIC_CLUSTER_MODEL", 1, 18, L"%d", NULL, NULL, NULL, NULL },
+ { L"FORCE_APIC_PHYSICAL_DESTINATION_MODE", 1, 19, L"%d", NULL, NULL, NULL, NULL },
+ { L"HW_REDUCED_ACPI", 1, 20, L"%d", NULL, NULL, NULL, NULL },
+ { L"LOW_POWER_S0_IDLE_CAPABLE", 1, 21, L"%d", NULL, NULL, NULL, NULL },
+ { L"Reserved", 10, 22, L"%d", NULL, NULL, NULL, NULL }
+};
+
+/**
+ This function traces FADT Flags fields.
+ If no format string is specified the Format must be NULL.
+
+ @param [in] Format Optional format string for tracing the data.
+ @param [in] Ptr Pointer to the start of the buffer.
+**/
+VOID
+EFIAPI
+DumpFadtFlags (
+ IN CONST CHAR16 *Format OPTIONAL,
+ IN UINT8 *Ptr
+ )
+{
+ if (Format != NULL) {
+ Print (Format, *(UINT32 *)Ptr);
+ return;
+ }
+
+ Print (L"0x%X\n", *(UINT32 *)Ptr);
+ ParseAcpiBitFields (
+ TRUE,
+ 2,
+ NULL,
+ Ptr,
+ 4,
+ PARSER_PARAMS (FadtFlagParser)
+ );
+}
+
/**
An ACPI_PARSER array describing the ACPI FADT Table.
**/
STATIC CONST ACPI_PARSER FadtParser[] = {
PARSE_ACPI_HEADER (&AcpiHdrInfo),
- { L"FIRMWARE_CTRL", 4, 36, L"0x%x", NULL, (VOID **)&FirmwareCtrl,
+ { L"FIRMWARE_CTRL", 4, 36, L"0x%x", NULL, (VOID **)&FirmwareCtrl,
ValidateFirmwareCtrl, NULL },
- { L"DSDT", 4, 40, L"0x%x", NULL, (VOID **)&DsdtAddress, NULL, NULL },
- { L"Reserved", 1, 44, L"%x", NULL, NULL, NULL, NULL },
- { L"Preferred_PM_Profile", 1, 45, L"0x%x", NULL, NULL, NULL, NULL },
- { L"SCI_INT", 2, 46, L"0x%x", NULL, NULL, NULL, NULL },
- { L"SMI_CMD", 4, 48, L"0x%x", NULL, NULL, NULL, NULL },
- { L"ACPI_ENABLE", 1, 52, L"0x%x", NULL, NULL, NULL, NULL },
- { L"ACPI_DISABLE", 1, 53, L"0x%x", NULL, NULL, NULL, NULL },
- { L"S4BIOS_REQ", 1, 54, L"0x%x", NULL, NULL, NULL, NULL },
- { L"PSTATE_CNT", 1, 55, L"0x%x", NULL, NULL, NULL, NULL },
- { L"PM1a_EVT_BLK", 4, 56, L"0x%x", NULL, NULL, NULL, NULL },
- { L"PM1b_EVT_BLK", 4, 60, L"0x%x", NULL, NULL, NULL, NULL },
- { L"PM1a_CNT_BLK", 4, 64, L"0x%x", NULL, NULL, NULL, NULL },
- { L"PM1b_CNT_BLK", 4, 68, L"0x%x", NULL, NULL, NULL, NULL },
- { L"PM2_CNT_BLK", 4, 72, L"0x%x", NULL, NULL, NULL, NULL },
- { L"PM_TMR_BLK", 4, 76, L"0x%x", NULL, NULL, NULL, NULL },
- { L"GPE0_BLK", 4, 80, L"0x%x", NULL, NULL, NULL, NULL },
- { L"GPE1_BLK", 4, 84, L"0x%x", NULL, NULL, NULL, NULL },
- { L"PM1_EVT_LEN", 1, 88, L"0x%x", NULL, NULL, NULL, NULL },
- { L"PM1_CNT_LEN", 1, 89, L"0x%x", NULL, NULL, NULL, NULL },
- { L"PM2_CNT_LEN", 1, 90, L"0x%x", NULL, NULL, NULL, NULL },
- { L"PM_TMR_LEN", 1, 91, L"0x%x", NULL, NULL, NULL, NULL },
- { L"GPE0_BLK_LEN", 1, 92, L"0x%x", NULL, NULL, NULL, NULL },
- { L"GPE1_BLK_LEN", 1, 93, L"0x%x", NULL, NULL, NULL, NULL },
- { L"GPE1_BASE", 1, 94, L"0x%x", NULL, NULL, NULL, NULL },
- { L"CST_CNT", 1, 95, L"0x%x", NULL, NULL, NULL, NULL },
- { L"P_LVL2_LAT", 2, 96, L"0x%x", NULL, NULL, NULL, NULL },
- { L"P_LVL3_LAT", 2, 98, L"0x%x", NULL, NULL, NULL, NULL },
- { L"FLUSH_SIZE", 2, 100, L"0x%x", NULL, NULL, NULL, NULL },
- { L"FLUSH_STRIDE", 2, 102, L"0x%x", NULL, NULL, NULL, NULL },
- { L"DUTY_OFFSET", 1, 104, L"0x%x", NULL, NULL, NULL, NULL },
- { L"DUTY_WIDTH", 1, 105, L"0x%x", NULL, NULL, NULL, NULL },
- { L"DAY_ALRM", 1, 106, L"0x%x", NULL, NULL, NULL, NULL },
- { L"MON_ALRM", 1, 107, L"0x%x", NULL, NULL, NULL, NULL },
- { L"CENTURY", 1, 108, L"0x%x", NULL, NULL, NULL, NULL },
- { L"IAPC_BOOT_ARCH", 2, 109, L"0x%x", NULL, NULL, NULL, NULL },
- { L"Reserved", 1, 111, L"0x%x", NULL, NULL, NULL, NULL },
- { L"Flags", 4, 112, L"0x%x", NULL, (VOID **)&Flags, ValidateFlags, NULL },
- { L"RESET_REG", 12, 116, NULL, DumpGas, NULL, NULL, NULL },
- { L"RESET_VALUE", 1, 128, L"0x%x", NULL, NULL, NULL, NULL },
- { L"ARM_BOOT_ARCH", 2, 129, L"0x%x", NULL, NULL, NULL, NULL },
- { L"FADT Minor Version", 1, 131, L"0x%x", NULL, (VOID **)&FadtMinorRevision,
+ { L"DSDT", 4, 40, L"0x%x", NULL, (VOID **)&DsdtAddress, NULL, NULL },
+ { L"Reserved", 1, 44, L"%x", NULL, NULL, NULL, NULL },
+ { L"Preferred_PM_Profile", 1, 45, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"SCI_INT", 2, 46, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"SMI_CMD", 4, 48, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"ACPI_ENABLE", 1, 52, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"ACPI_DISABLE", 1, 53, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"S4BIOS_REQ", 1, 54, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"PSTATE_CNT", 1, 55, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"PM1a_EVT_BLK", 4, 56, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"PM1b_EVT_BLK", 4, 60, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"PM1a_CNT_BLK", 4, 64, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"PM1b_CNT_BLK", 4, 68, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"PM2_CNT_BLK", 4, 72, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"PM_TMR_BLK", 4, 76, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"GPE0_BLK", 4, 80, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"GPE1_BLK", 4, 84, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"PM1_EVT_LEN", 1, 88, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"PM1_CNT_LEN", 1, 89, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"PM2_CNT_LEN", 1, 90, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"PM_TMR_LEN", 1, 91, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"GPE0_BLK_LEN", 1, 92, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"GPE1_BLK_LEN", 1, 93, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"GPE1_BASE", 1, 94, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"CST_CNT", 1, 95, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"P_LVL2_LAT", 2, 96, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"P_LVL3_LAT", 2, 98, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"FLUSH_SIZE", 2, 100, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"FLUSH_STRIDE", 2, 102, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"DUTY_OFFSET", 1, 104, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"DUTY_WIDTH", 1, 105, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"DAY_ALRM", 1, 106, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"MON_ALRM", 1, 107, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"CENTURY", 1, 108, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"IAPC_BOOT_ARCH", 2, 109, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"Reserved", 1, 111, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"Flags", 4, 112, NULL, DumpFadtFlags, (VOID **)&Flags, ValidateFlags, NULL },
+ { L"RESET_REG", 12, 116, NULL, DumpGas, NULL, NULL, NULL },
+ { L"RESET_VALUE", 1, 128, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"ARM_BOOT_ARCH", 2, 129, L"0x%x", NULL, NULL, NULL, NULL },
+ { L"FADT Minor Version", 1, 131, L"0x%x", NULL, (VOID **)&FadtMinorRevision,
NULL, NULL },
- { L"X_FIRMWARE_CTRL", 8, 132, L"0x%lx", NULL, (VOID **)&X_FirmwareCtrl,
+ { L"X_FIRMWARE_CTRL", 8, 132, L"0x%lx", NULL, (VOID **)&X_FirmwareCtrl,
ValidateXFirmwareCtrl, NULL },
- { L"X_DSDT", 8, 140, L"0x%lx", NULL, (VOID **)&X_DsdtAddress, NULL, NULL },
- { L"X_PM1a_EVT_BLK", 12, 148, NULL, DumpGas, NULL, NULL, NULL },
- { L"X_PM1b_EVT_BLK", 12, 160, NULL, DumpGas, NULL, NULL, NULL },
- { L"X_PM1a_CNT_BLK", 12, 172, NULL, DumpGas, NULL, NULL, NULL },
- { L"X_PM1b_CNT_BLK", 12, 184, NULL, DumpGas, NULL, NULL, NULL },
- { L"X_PM2_CNT_BLK", 12, 196, NULL, DumpGas, NULL, NULL, NULL },
- { L"X_PM_TMR_BLK", 12, 208, NULL, DumpGas, NULL, NULL, NULL },
- { L"X_GPE0_BLK", 12, 220, NULL, DumpGas, NULL, NULL, NULL },
- { L"X_GPE1_BLK", 12, 232, NULL, DumpGas, NULL, NULL, NULL },
- { L"SLEEP_CONTROL_REG", 12, 244, NULL, DumpGas, NULL, NULL, NULL },
- { L"SLEEP_STATUS_REG", 12, 256, NULL, DumpGas, NULL, NULL, NULL },
- { L"Hypervisor VendorIdentity", 8, 268, L"%lx", NULL, NULL, NULL, NULL }
+ { L"X_DSDT", 8, 140, L"0x%lx", NULL, (VOID **)&X_DsdtAddress, NULL, NULL },
+ { L"X_PM1a_EVT_BLK", 12, 148, NULL, DumpGas, NULL, NULL, NULL },
+ { L"X_PM1b_EVT_BLK", 12, 160, NULL, DumpGas, NULL, NULL, NULL },
+ { L"X_PM1a_CNT_BLK", 12, 172, NULL, DumpGas, NULL, NULL, NULL },
+ { L"X_PM1b_CNT_BLK", 12, 184, NULL, DumpGas, NULL, NULL, NULL },
+ { L"X_PM2_CNT_BLK", 12, 196, NULL, DumpGas, NULL, NULL, NULL },
+ { L"X_PM_TMR_BLK", 12, 208, NULL, DumpGas, NULL, NULL, NULL },
+ { L"X_GPE0_BLK", 12, 220, NULL, DumpGas, NULL, NULL, NULL },
+ { L"X_GPE1_BLK", 12, 232, NULL, DumpGas, NULL, NULL, NULL },
+ { L"SLEEP_CONTROL_REG", 12, 244, NULL, DumpGas, NULL, NULL, NULL },
+ { L"SLEEP_STATUS_REG", 12, 256, NULL, DumpGas, NULL, NULL, NULL },
+ { L"Hypervisor VendorIdentity", 8, 268, L"%lx", NULL, NULL, NULL, NULL }
};
/**
generated by cgit v1.1 at 2024-11-03 20:46:07 +0000