Merge pull request #539 from SchmErik/win-acpidump

acpidump: windows: use GetSystemFirmwareTable API for all tables exce…
This commit is contained in:
Robert Moore 2020-01-17 08:52:09 -08:00 committed by GitHub
commit 7bf96d5003
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 351 additions and 190 deletions

View File

@ -179,20 +179,17 @@ static char KeyBuffer[LOCAL_BUFFER_SIZE];
static char ErrorBuffer[LOCAL_BUFFER_SIZE];
/*
* Tables supported in the Windows registry. Zero or more SSDTs are assumed to
* follow these tables.
* List of table signatures reported by EnumSystemFirmwareTables ()
*/
static char *SupportedTables[] =
{
"DSDT",
"RSDT",
"FACS",
"FACP"
};
UINT32 *Gbl_AvailableTableSignatures;
UINT32 Gbl_TableCount = 0;
UINT32 Gbl_SsdtInstance = 0;
/* Number of table names for the table above. */
BOOLEAN Gbl_TableListInitialized = FALSE;
#define ACPI_OS_NUM_TABLE_ENTRIES 4
static ACPI_STATUS
OslTableInitialize (
void);
/******************************************************************************
@ -264,7 +261,8 @@ AcpiOsGetTableByAddress (
* DESCRIPTION: Get an ACPI table via an index value (0 through n). Returns
* AE_LIMIT when an invalid index is reached. Index is not
* necessarily an index into the RSDT/XSDT.
* Table is obtained from the Windows registry.
* SSDT tables are obtained from the Windows registry. All other
* tables are obtained through GetSystemFirmwareTable ().
*
* NOTE: Cannot get the physical address from the windows registry;
* zero is returned instead.
@ -280,35 +278,327 @@ AcpiOsGetTableByIndex (
{
ACPI_STATUS Status;
char *Signature;
UINT32 CurrentInstance;
if (Index < ACPI_OS_NUM_TABLE_ENTRIES)
/* Enumerate all ACPI table signatures on first invocation of this function */
Status = OslTableInitialize ();
if (ACPI_FAILURE (Status))
{
Signature = SupportedTables[Index];
Index = 0;
return (Status);
}
/* Validate Index */
if (Index < Gbl_TableCount)
{
Signature = malloc (ACPI_NAMESEG_SIZE + 1);
if (!Signature)
{
return (AE_NO_MEMORY);
}
Signature = memmove (Signature, &Gbl_AvailableTableSignatures[Index], ACPI_NAMESEG_SIZE);
}
else
{
Signature = ACPI_SIG_SSDT;
Index -= ACPI_OS_NUM_TABLE_ENTRIES;
return (AE_LIMIT);
}
Status = AcpiOsGetTableByName (Signature, Index, Table, Address);
if (ACPI_COMPARE_NAMESEG (Signature, ACPI_SIG_SSDT))
{
CurrentInstance = Gbl_SsdtInstance;
Gbl_SsdtInstance++;
}
else
{
CurrentInstance = 0;
}
Status = AcpiOsGetTableByName (Signature, CurrentInstance, Table, Address);
if (ACPI_SUCCESS (Status))
{
*Instance = Index;
*Instance = CurrentInstance;
}
else if (Status == AE_NOT_FOUND &&
ACPI_COMPARE_NAMESEG (Signature, ACPI_SIG_SSDT))
{
/* Treat SSDTs that are not found as invalid index. */
Status = (AE_LIMIT);
Status = AE_LIMIT;
}
free (Signature);
return (Status);
}
/******************************************************************************
*
* FUNCTION: OslTableInitialize
*
* PARAMETERS: None
*
* RETURN: Status
*
* DESCRIPTION: Initialize ACPI table data. Enumerate all ACPI table signatures
* and save them to a global list.
*
*****************************************************************************/
static ACPI_STATUS
OslTableInitialize (
void)
{
UINT32 ResultSize;
UINT32 DataSize;
if (Gbl_TableListInitialized)
{
return (AE_OK);
}
/*
* ACPI table signatures are always 4 characters. Therefore, the data size
* buffer should be a multipe of 4
*/
DataSize = EnumSystemFirmwareTables ('ACPI', NULL, 0);
if (DataSize % ACPI_NAMESEG_SIZE)
{
return (AE_ERROR);
}
/*
* EnumSystemFirmwareTables () does not report the DSDT or XSDT. Work around this
* by adding these entries manually.
*/
Gbl_TableCount = 2 + DataSize / ACPI_NAMESEG_SIZE;
Gbl_AvailableTableSignatures = malloc (Gbl_TableCount * ACPI_NAMESEG_SIZE);
if (!Gbl_AvailableTableSignatures)
{
return (AE_NO_MEMORY);
}
ResultSize = EnumSystemFirmwareTables ('ACPI', Gbl_AvailableTableSignatures, DataSize);
if (ResultSize > DataSize)
{
return (AE_ERROR);
}
/* Insert the DSDT and XSDT tables signatures */
Gbl_AvailableTableSignatures [Gbl_TableCount - 1] = 'TDSD';
Gbl_AvailableTableSignatures [Gbl_TableCount - 2] = 'TDSX';
Gbl_TableListInitialized = TRUE;
return (AE_OK);
}
/******************************************************************************
*
* FUNCTION: WindowsGetTableFromRegistry
*
* PARAMETERS: Signature - ACPI Signature for desired table. Must be
* a null terminated 4-character string.
* Instance - For SSDTs (0...n). Use 0 otherwise.
* Table - Where a pointer to the table is returned
* Address - Where the table physical address is returned
*
* RETURN: Status; Table buffer and physical address returned if AE_OK.
* AE_LIMIT: Instance is beyond valid limit
* AE_NOT_FOUND: A table with the signature was not found
*
* DESCRIPTION: Get an ACPI table via a table signature (4 ASCII characters).
* Returns AE_LIMIT when an invalid instance is reached.
* Table is obtained from the Windows registry.
*
* NOTE: Assumes the input signature is uppercase.
* Cannot get the physical address from the windows registry;
* zero is returned instead.
*
*****************************************************************************/
static ACPI_STATUS
WindowsGetTableFromRegistry (
char *Signature,
UINT32 Instance,
ACPI_TABLE_HEADER **Table,
ACPI_PHYSICAL_ADDRESS *Address)
{
HKEY Handle = NULL;
LONG WinStatus;
ULONG Type;
ULONG NameSize;
ULONG DataSize;
HKEY SubKey;
ULONG i;
ACPI_TABLE_HEADER *ReturnTable;
ACPI_STATUS Status = AE_OK;
/* Get a handle to the table key */
while (1)
{
strcpy(KeyBuffer, "HARDWARE\\ACPI\\");
if (AcpiUtSafeStrcat(KeyBuffer, sizeof(KeyBuffer), Signature))
{
return (AE_BUFFER_OVERFLOW);
}
/*
* Windows stores SSDT at SSDT, SSD1, ..., SSD9, SSDA, ..., SSDS, SSDT,
* SSDU, ..., SSDY. If the first (0th) and the 29th tables have the same
* OEM ID, Table ID and Revision, then the 29th entry will overwrite the
* first entry... Let's hope that we do not have that many entries.
*/
if (Instance > 0 && ACPI_COMPARE_NAMESEG(Signature, ACPI_SIG_SSDT))
{
if (Instance < 10)
{
KeyBuffer[strlen(KeyBuffer) - 1] = '0' + (char)Instance;
}
else if (Instance < 29)
{
KeyBuffer[strlen(KeyBuffer) - 1] = 'A' + (char)(Instance - 10);
}
else
{
return (AE_LIMIT);
}
}
WinStatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, KeyBuffer,
0L, KEY_READ, &Handle);
if (WinStatus != ERROR_SUCCESS)
{
/*
* Somewhere along the way, MS changed the registry entry for
* the FADT from
* HARDWARE/ACPI/FACP to
* HARDWARE/ACPI/FADT.
*
* This code allows for both.
*/
if (ACPI_COMPARE_NAMESEG(Signature, "FACP"))
{
Signature = "FADT";
}
else if (ACPI_COMPARE_NAMESEG(Signature, "XSDT"))
{
Signature = "RSDT";
}
else if (ACPI_COMPARE_NAMESEG(Signature, ACPI_SIG_SSDT))
{
/*
* SSDT may not be present on older Windows versions, but it is
* also possible that the index is not found.
*/
return (AE_NOT_FOUND);
}
else
{
fprintf(stderr,
"Could not find %s in registry at %s: %s (WinStatus=0x%X)\n",
Signature, KeyBuffer, WindowsFormatException(WinStatus), WinStatus);
return (AE_NOT_FOUND);
}
}
else
{
break;
}
}
/* Actual data for the table is down a couple levels */
for (i = 0; ;)
{
WinStatus = RegEnumKey(Handle, i, KeyBuffer, sizeof(KeyBuffer));
i++;
if (WinStatus == ERROR_NO_MORE_ITEMS)
{
break;
}
WinStatus = RegOpenKey(Handle, KeyBuffer, &SubKey);
if (WinStatus != ERROR_SUCCESS)
{
fprintf(stderr, "Could not open %s entry: %s\n",
Signature, WindowsFormatException(WinStatus));
Status = AE_ERROR;
goto Cleanup;
}
RegCloseKey(Handle);
Handle = SubKey;
i = 0;
}
/* Find the (binary) table entry */
for (i = 0; ; i++)
{
NameSize = sizeof(KeyBuffer);
WinStatus = RegEnumValue(Handle, i, KeyBuffer, &NameSize, NULL,
&Type, NULL, 0);
if (WinStatus != ERROR_SUCCESS)
{
fprintf(stderr, "Could not get %s registry entry: %s\n",
Signature, WindowsFormatException(WinStatus));
Status = AE_ERROR;
goto Cleanup;
}
if (Type == REG_BINARY)
{
break;
}
}
/* Get the size of the table */
WinStatus = RegQueryValueEx(Handle, KeyBuffer, NULL, NULL,
NULL, &DataSize);
if (WinStatus != ERROR_SUCCESS)
{
fprintf(stderr, "Could not read the %s table size: %s\n",
Signature, WindowsFormatException(WinStatus));
Status = AE_ERROR;
goto Cleanup;
}
/* Allocate a new buffer for the table */
ReturnTable = malloc(DataSize);
if (!ReturnTable)
{
Status = AE_NO_MEMORY;
goto Cleanup;
}
/* Get the actual table from the registry */
WinStatus = RegQueryValueEx(Handle, KeyBuffer, NULL, NULL,
(UCHAR *)ReturnTable, &DataSize);
if (WinStatus != ERROR_SUCCESS)
{
fprintf(stderr, "Could not read %s data: %s\n",
Signature, WindowsFormatException(WinStatus));
free(ReturnTable);
Status = AE_ERROR;
goto Cleanup;
}
*Table = ReturnTable;
*Address = 0;
Cleanup:
RegCloseKey(Handle);
return (Status);
}
/******************************************************************************
*
@ -335,189 +625,60 @@ AcpiOsGetTableByIndex (
*****************************************************************************/
ACPI_STATUS
AcpiOsGetTableByName (
char *Signature,
UINT32 Instance,
ACPI_TABLE_HEADER **Table,
ACPI_PHYSICAL_ADDRESS *Address)
AcpiOsGetTableByName(
char *Signature,
UINT32 Instance,
ACPI_TABLE_HEADER **Table,
ACPI_PHYSICAL_ADDRESS *Address)
{
HKEY Handle = NULL;
LONG WinStatus;
ULONG Type;
ULONG NameSize;
ULONG DataSize;
HKEY SubKey;
ULONG i;
ACPI_TABLE_HEADER *ReturnTable;
ACPI_STATUS Status = AE_OK;
LONG Result;
ACPI_STATUS Status = AE_OK;
UINT32 DataSize;
ACPI_TABLE_HEADER *ReturnTable;
UINT32 UIntSignature = 0;
/* Multiple instances are only supported for SSDT tables. */
if (Instance > 0 && !ACPI_COMPARE_NAMESEG (Signature, ACPI_SIG_SSDT))
{
return (AE_LIMIT);
}
if (Instance > 0 && !ACPI_COMPARE_NAMESEG (Signature, ACPI_SIG_SSDT))
{
return (AE_LIMIT);
}
/* Get a handle to the table key */
if (ACPI_COMPARE_NAMESEG (Signature, ACPI_SIG_SSDT))
{
Status = WindowsGetTableFromRegistry ("SSDT", Instance, Table, Address);
return (Status);
}
while (1)
{
strcpy (KeyBuffer, "HARDWARE\\ACPI\\");
if (AcpiUtSafeStrcat (KeyBuffer, sizeof (KeyBuffer), Signature))
{
return (AE_BUFFER_OVERFLOW);
}
/* GetSystemFirmwareTable requires the table signature to be UINT32 */
/*
* Windows stores SSDT at SSDT, SSD1, ..., SSD9, SSDA, ..., SSDS, SSDT,
* SSDU, ..., SSDY. If the first (0th) and the 29th tables have the same
* OEM ID, Table ID and Revision, then the 29th entry will overwrite the
* first entry... Let's hope that we do not have that many entries.
*/
if (Instance > 0 && ACPI_COMPARE_NAMESEG (Signature, ACPI_SIG_SSDT))
{
if (Instance < 10)
{
KeyBuffer[strlen (KeyBuffer) - 1] = '0' + (char) Instance;
}
else if (Instance < 29)
{
KeyBuffer[strlen (KeyBuffer) - 1] = 'A' + (char) (Instance - 10);
}
else
{
return (AE_LIMIT);
}
}
UIntSignature = *ACPI_CAST_PTR (UINT32, Signature);
DataSize = GetSystemFirmwareTable('ACPI', UIntSignature, NULL, 0);
if (!DataSize)
{
fprintf(stderr, "The table signature %s does not exist.", Signature);
return (AE_ERROR);
}
WinStatus = RegOpenKeyEx (HKEY_LOCAL_MACHINE, KeyBuffer,
0L, KEY_READ, &Handle);
ReturnTable = malloc(DataSize);
if (!ReturnTable)
{
return (AE_NO_MEMORY);
}
if (WinStatus != ERROR_SUCCESS)
{
/*
* Somewhere along the way, MS changed the registry entry for
* the FADT from
* HARDWARE/ACPI/FACP to
* HARDWARE/ACPI/FADT.
*
* This code allows for both.
*/
if (ACPI_COMPARE_NAMESEG (Signature, "FACP"))
{
Signature = "FADT";
}
else if (ACPI_COMPARE_NAMESEG (Signature, "XSDT"))
{
Signature = "RSDT";
}
else if (ACPI_COMPARE_NAMESEG (Signature, ACPI_SIG_SSDT))
{
/* SSDT may not be present on older Windows versions, but it is
* also possible that the index is not found. */
return (AE_NOT_FOUND);
}
else
{
fprintf (stderr,
"Could not find %s in registry at %s: %s (WinStatus=0x%X)\n",
Signature, KeyBuffer, WindowsFormatException (WinStatus), WinStatus);
return (AE_NOT_FOUND);
}
}
else
{
break;
}
}
Result = GetSystemFirmwareTable('ACPI', UIntSignature, ReturnTable, DataSize);
if (Result > (LONG) DataSize)
{
/* Clean up */
/* Actual data for the table is down a couple levels */
for (i = 0; ;)
{
WinStatus = RegEnumKey (Handle, i, KeyBuffer, sizeof (KeyBuffer));
i++;
if (WinStatus == ERROR_NO_MORE_ITEMS)
{
break;
}
WinStatus = RegOpenKey (Handle, KeyBuffer, &SubKey);
if (WinStatus != ERROR_SUCCESS)
{
fprintf (stderr, "Could not open %s entry: %s\n",
Signature, WindowsFormatException (WinStatus));
Status = AE_ERROR;
goto Cleanup;
}
RegCloseKey (Handle);
Handle = SubKey;
i = 0;
}
/* Find the (binary) table entry */
for (i = 0; ; i++)
{
NameSize = sizeof (KeyBuffer);
WinStatus = RegEnumValue (Handle, i, KeyBuffer, &NameSize, NULL,
&Type, NULL, 0);
if (WinStatus != ERROR_SUCCESS)
{
fprintf (stderr, "Could not get %s registry entry: %s\n",
Signature, WindowsFormatException (WinStatus));
Status = AE_ERROR;
goto Cleanup;
}
if (Type == REG_BINARY)
{
break;
}
}
/* Get the size of the table */
WinStatus = RegQueryValueEx (Handle, KeyBuffer, NULL, NULL,
NULL, &DataSize);
if (WinStatus != ERROR_SUCCESS)
{
fprintf (stderr, "Could not read the %s table size: %s\n",
Signature, WindowsFormatException (WinStatus));
Status = AE_ERROR;
goto Cleanup;
}
/* Allocate a new buffer for the table */
ReturnTable = malloc (DataSize);
if (!ReturnTable)
{
Status = AE_NO_MEMORY;
goto Cleanup;
}
/* Get the actual table from the registry */
WinStatus = RegQueryValueEx (Handle, KeyBuffer, NULL, NULL,
(UCHAR *) ReturnTable, &DataSize);
if (WinStatus != ERROR_SUCCESS)
{
fprintf (stderr, "Could not read %s data: %s\n",
Signature, WindowsFormatException (WinStatus));
free (ReturnTable);
Status = AE_ERROR;
goto Cleanup;
}
fprintf (stderr, "Could not read %s data\n", Signature);
free (ReturnTable);
return (AE_ERROR);
}
*Table = ReturnTable;
*Address = 0;
Cleanup:
RegCloseKey (Handle);
return (Status);
return (Status);
}