Index: drivers/bus/acpi/busmgr/utils.c =================================================================== --- drivers/bus/acpi/busmgr/utils.c (revision 74470) +++ drivers/bus/acpi/busmgr/utils.c (working copy) @@ -24,6 +24,9 @@ */ #include +#include +#include +#include #define NDEBUG #include @@ -369,4 +372,281 @@ return_ACPI_STATUS(status); } +NTSTATUS +acpi_dump_table_to_registry(HANDLE ParentKeyHandle, ACPI_STRING Signature, PCWSTR KeyName) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING HardwareKeyName, ValueName; + ANSI_STRING HardwareKeyNameA; + HANDLE KeyHandle = NULL, SubKeyHandle = NULL; + NTSTATUS Status; + ACPI_STATUS AcpiStatus; + ACPI_TABLE_HEADER *OutTable; + char OemId[7] = { 0 }; /* exactly one byte more than ACPI_TABLE_HEADER->OemId */ + char OemTableId[9] = { 0 }; /* exactly one byte more than ACPI_TABLE_HEADER->OemTableId */ + WCHAR OemRevision[9] = { 0 }; /* enough to accept hex DWORD */ + C_ASSERT(sizeof(OemId) == RTL_FIELD_SIZE(ACPI_TABLE_HEADER, OemId) + 1); + C_ASSERT(sizeof(OemTableId) == RTL_FIELD_SIZE(ACPI_TABLE_HEADER, OemTableId) + 1); + /* Read requested table */ + AcpiStatus = AcpiGetTable(Signature, 0, &OutTable); + if (ACPI_FAILURE(AcpiStatus)) + { + DPRINT1("AcpiGetTable() for %ws failed (Status 0x%08lx)\n", KeyName, AcpiStatus); + return STATUS_UNSUCCESSFUL; + } + /* Copy OEM data from the table */ + RtlCopyMemory(OemId, OutTable->OemId, sizeof(OutTable->OemId)); + RtlCopyMemory(OemTableId, OutTable->OemTableId, sizeof(OutTable->OemTableId)); + /* Create table subkey */ + RtlInitUnicodeString(&HardwareKeyName, KeyName); + InitializeObjectAttributes(&ObjectAttributes, + &HardwareKeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + ParentKeyHandle, + NULL); + Status = ZwCreateKey(&KeyHandle, + KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwCreateKey() for %ws failed (Status 0x%08lx)\n", KeyName, Status); + return Status; + } + + if (OutTable->OemRevision != 0) + { + /* We have OEM info in table, so create other OEM subkeys */ + RtlInitAnsiString(&HardwareKeyNameA, OemId); + RtlAnsiStringToUnicodeString(&HardwareKeyName, &HardwareKeyNameA, TRUE); + + InitializeObjectAttributes(&ObjectAttributes, + &HardwareKeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + KeyHandle, + NULL); + Status = ZwCreateKey(&SubKeyHandle, + KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + NULL); + RtlFreeUnicodeString(&HardwareKeyName); + ZwClose(KeyHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwCreateKey() for %ws failed (Status 0x%08lx)\n", KeyName, Status); + return Status; + } + KeyHandle = SubKeyHandle; + + RtlInitAnsiString(&HardwareKeyNameA, OemTableId); + RtlAnsiStringToUnicodeString(&HardwareKeyName, &HardwareKeyNameA, TRUE); + + InitializeObjectAttributes(&ObjectAttributes, + &HardwareKeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + KeyHandle, + NULL); + Status = ZwCreateKey(&SubKeyHandle, + KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + NULL); + RtlFreeUnicodeString(&HardwareKeyName); + ZwClose(KeyHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwCreateKey() for %ws failed (Status 0x%08lx)\n", KeyName, Status); + return Status; + } + KeyHandle = SubKeyHandle; + + RtlStringCbPrintfW(OemRevision, + sizeof(OemRevision), + L"%8.8X", + OutTable->OemRevision); + RtlInitUnicodeString(&HardwareKeyName, OemRevision); + + InitializeObjectAttributes(&ObjectAttributes, + &HardwareKeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + KeyHandle, + NULL); + Status = ZwCreateKey(&SubKeyHandle, + KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + NULL); + ZwClose(KeyHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwCreateKey() for %ws failed (Status 0x%08lx)\n", KeyName, Status); + return Status; + } + KeyHandle = SubKeyHandle; + } + /* Table reg value name is always '00000000' */ + RtlInitUnicodeString(&ValueName, + L"00000000"); + Status = ZwSetValueKey(KeyHandle, + &ValueName, + 0, + REG_BINARY, + OutTable, + OutTable->Length); + ZwClose(KeyHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwSetValueKey() failed (Status 0x%08lx)\n", Status); + return Status; + } + + return STATUS_SUCCESS; +} + +NTSTATUS +acpi_dump_registry() +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING HardwareKeyName; + HANDLE KeyHandle = NULL; + NTSTATUS Status; + ACPI_STATUS AcpiStatus; + ACPI_TABLE_HEADER *OutTable; + ACPI_PHYSICAL_ADDRESS RsdpAddress; + ACPI_TABLE_RSDP *Rsdp; + ACPI_PHYSICAL_ADDRESS Address; + UINT32 TableEntrySize; + UINT32 TableIndex; + + /* Create Main Hardware ACPI key*/ + RtlInitUnicodeString(&HardwareKeyName, + L"\\Registry\\Machine\\HARDWARE\\ACPI"); + InitializeObjectAttributes(&ObjectAttributes, + &HardwareKeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwCreateKey(&KeyHandle, + KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwCreateKey() for ACPI failed (Status 0x%08lx)\n", Status); + return Status; + } + /* Dump DSDT table */ + Status = acpi_dump_table_to_registry(KeyHandle, ACPI_SIG_DSDT, L"DSDT"); + if (!NT_SUCCESS(Status)) + { + DPRINT1("acpi_dump_table_to_registry() for DSDT failed (Status 0x%08lx)\n", Status); + goto done; + } + /* Dump FACS table */ + Status = acpi_dump_table_to_registry(KeyHandle, ACPI_SIG_FACS, L"FACS"); + if (!NT_SUCCESS(Status)) + { + DPRINT1("acpi_dump_table_to_registry() for FACS failed (Status 0x%08lx)\n", Status); + goto done; + } + /* Dump FADT table */ + Status = acpi_dump_table_to_registry(KeyHandle, ACPI_SIG_FADT, L"FADT"); + if (!NT_SUCCESS(Status)) + { + DPRINT1("acpi_dump_table_to_registry() for FADT failed (Status 0x%08lx)\n", Status); + goto done; + } + /* Add RSDT/XSDT table as normal table */ + if (ACPI_FAILURE(AcpiGetTable(ACPI_SIG_RSDT, 0, &OutTable)) && ACPI_FAILURE(AcpiGetTable(ACPI_SIG_XSDT, 0, &OutTable))) + { + /* This is a rough copy from ACPICA reading of RSDT/XSDT and added to avoid patching acpica */ + RsdpAddress = AcpiOsGetRootPointer(); + /* Map the entire RSDP and extract the address of the RSDT or XSDT */ + Rsdp = AcpiOsMapMemory(RsdpAddress, sizeof(ACPI_TABLE_RSDP)); + if (!Rsdp) + { + DPRINT1("AcpiOsMapMemory() failed\n"); + return STATUS_NO_MEMORY; + } + /* Use XSDT if present and not overridden. Otherwise, use RSDT */ + if ((Rsdp->Revision > 1) && + Rsdp->XsdtPhysicalAddress && + !AcpiGbl_DoNotUseXsdt) + { + /* + * RSDP contains an XSDT (64-bit physical addresses). We must use + * the XSDT if the revision is > 1 and the XSDT pointer is present, + * as per the ACPI specification. + */ + Address = (ACPI_PHYSICAL_ADDRESS)Rsdp->XsdtPhysicalAddress; + TableEntrySize = ACPI_XSDT_ENTRY_SIZE; + } + else + { + /* Root table is an RSDT (32-bit physical addresses) */ + Address = (ACPI_PHYSICAL_ADDRESS)Rsdp->RsdtPhysicalAddress; + TableEntrySize = ACPI_RSDT_ENTRY_SIZE; + } + /* + * It is not possible to map more than one entry in some environments, + * so unmap the RSDP here before mapping other tables + */ + AcpiOsUnmapMemory(Rsdp, sizeof(ACPI_TABLE_RSDP)); + OutTable = AcpiOsMapMemory(Address, TableEntrySize); + if (!OutTable) + { + DPRINT1("AcpiOsMapMemory() failed\n"); + return STATUS_NO_MEMORY; + } + + /* Validate the root table checksum */ + AcpiStatus = AcpiTbVerifyChecksum(OutTable, TableEntrySize); + AcpiOsUnmapMemory(OutTable, TableEntrySize); + if (ACPI_FAILURE(AcpiStatus)) + { + DPRINT1("AcpiTbVerifyChecksum() failed (Status 0x%08lx)\n", AcpiStatus); + } + else + { + AcpiStatus = AcpiTbInstallStandardTable(Address, + ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL, + FALSE, + TRUE, + &TableIndex); + if (ACPI_FAILURE(AcpiStatus)) + { + DPRINT1("AcpiTbInstallStandardTable() failed (Status 0x%08lx)\n", AcpiStatus); + } + } + } + /* Dump RSDT table */ + Status = acpi_dump_table_to_registry(KeyHandle, ACPI_SIG_RSDT, L"RSDT"); + if (!NT_SUCCESS(Status)) + { + DPRINT("acpi_dump_table_to_registry() for RSDT failed (Status 0x%08lx)\n", Status); + /* Dump XSDT table if we are using it in place of RSDT, but use the same key */ + Status = acpi_dump_table_to_registry(KeyHandle, ACPI_SIG_XSDT, L"RSDT"); + if (!NT_SUCCESS(Status)) + { + DPRINT1("acpi_dump_table_to_registry() for RSDT and XSDT failed (Status 0x%08lx)\n", Status); + } + } + +done: + ZwClose(KeyHandle); + return Status; +} Index: drivers/bus/acpi/include/acpi_bus.h =================================================================== --- drivers/bus/acpi/include/acpi_bus.h (revision 74470) +++ drivers/bus/acpi/include/acpi_bus.h (working copy) @@ -57,6 +57,8 @@ ACPI_STRING pathname, struct acpi_object_list *arguments, struct acpi_handle_list *list); +NTSTATUS +acpi_dump_registry(); enum acpi_bus_removal_type { ACPI_BUS_REMOVAL_NORMAL = 0, Index: drivers/bus/acpi/pnp.c =================================================================== --- drivers/bus/acpi/pnp.c (revision 74470) +++ drivers/bus/acpi/pnp.c (working copy) @@ -299,6 +299,12 @@ return STATUS_UNSUCCESSFUL; } + status = acpi_dump_registry(); + if (!NT_SUCCESS(status)) + { + DPRINT1("Unable to dump ACPI tables in registry\n"); + } + DPRINT("Acpi subsystem init\n"); /* Initialize ACPI bus manager */ AcpiStatus = acpi_init();