修正 NeoACPI 日志系统格式问题, 增加 FADT 模式检查与 FACT 表获取.

Author: xiaoyi1212

src/include/lib/neoacpi/neoacpi.h

@@ -18,6 +18,7 @@ typedef struct neo_acpi_handle {
     size_t                   entries_length;
     aml_context_t           *aml_context;
     struct acpi_fadt         global_fadt;
+    acpi_table_facs_t       *global_facs;
     bool                     reduced_hardware;
 } neo_acpi_handle_t;
 

src/include/lib/neoacpi/neotable.h

@@ -192,5 +192,19 @@ typedef struct acpi_generic_address {
     uint64_t address;      /* 64-bit address of struct or register */
 } acpi_generic_address_t;
 
+typedef struct acpi_table_facs {
+    char     signature[4];       /* ASCII table signature */
+    uint32_t length;             /* Length of structure, in bytes */
+    uint32_t hard_signature;     /* Hardware configuration signature */
+    uint32_t firm_waking_vector; /* 32-bit physical address of the Firmware Waking Vector */
+    uint32_t global_lock;        /* Global Lock for shared hardware resources */
+    uint32_t flags;
+    uint64_t x_firm_waking_vector; /* 64-bit version of the Firmware Waking Vector (ACPI 2.0+) */
+    uint8_t  version;              /* Version of this table (ACPI 2.0+) */
+    uint8_t  _reserved[3];         /* Reserved, must be zero */
+    uint32_t ospm_flags;           /* Flags to be set by OSPM (ACPI 4.0) */
+    uint8_t  _reserved1[24];       /* Reserved, must be zero */
+} __attribute__((packed)) acpi_table_facs_t;
+
 void dump_table_header(neo_acpi_phys_addr phys_addr, void *hdr);
 bool verify_table_checksum(void *table, size_t size);

src/lib/neoacpi/fadt.c

@@ -64,13 +64,16 @@ static void acpi_gas_init_system_io(struct acpi_gas *gas, uint64_t address, uint
     gas->access_size         = 0;
 }
 
-static void acpi_fixup_fadt(struct acpi_fadt *fadt) {
+static void acpi_fixup_fadt(neo_acpi_handle_t *handle, struct acpi_fadt *fadt) {
     size_t i;
 
     if (!fadt->x_dsdt) { fadt->x_dsdt = fadt->dsdt; }
     if (fadt->firmware_ctrl) { fadt->x_firmware_ctrl = fadt->firmware_ctrl; }
+    if (fadt->hdr.revision >= 5 && fadt->hdr.length >= 116 && fadt->flags & ACPI_FADT_HW_REDUCED) {
+        return;
+    }
 
-    if (fadt->flags & ACPI_FADT_HW_REDUCED) { return; }
+    log_info("legacy ACPI model, acpi enabling...");
 
     for (i = 0; i < ACPI_FADT_INFO_ENTRIES; i++) {
         const acpi_fadt_info_t *info        = &fadt_info_table[i];
@@ -121,9 +124,9 @@ neo_acpi_handle_t *acpi_load_fadt(neo_acpi_handle_t *handle) {
     }
 
     fadt->hdr.length = sizeof(struct acpi_fadt);
-    fadt->x_dsdt     = neo_acpi_fadt_select("DSDT", fadt->dsdt, fadt->x_dsdt);
+    fadt->x_dsdt     = neo_acpi_fadt_select(ACPI_DSDT_SIGNATURE, fadt->dsdt, fadt->x_dsdt);
 
-    acpi_fixup_fadt(fadt);
+    acpi_fixup_fadt(handle, fadt);
 
     handle->aml_context = neo_acpi_malloc(sizeof(aml_context_t));
     struct acpi_dsdt *dsdt =
@@ -135,6 +138,17 @@ neo_acpi_handle_t *acpi_load_fadt(neo_acpi_handle_t *handle) {
     size_t dsdt_length = dsdt->hdr.length;
     neo_acpi_kernel_unmap(dsdt, sizeof(struct acpi_sdt_hdr));
 
+    uintptr_t phys_addr =
+        neo_acpi_fadt_select(ACPI_FACS_SIGNATURE, fadt->firmware_ctrl, fadt->x_firmware_ctrl);
+    struct acpi_sdt_hdr *hdr = neo_acpi_kernel_map(phys_addr, sizeof(struct acpi_sdt_hdr));
+
+    size_t facs_length = hdr->length;
+    neo_acpi_kernel_unmap(hdr, sizeof(struct acpi_sdt_hdr));
+    handle->global_facs = neo_acpi_kernel_map(phys_addr, facs_length);
+    if (handle->global_facs == NULL) {
+        log_error("cannot mmap dsdt header table.");
+        return NULL;
+    }
     dsdt = neo_acpi_kernel_map(handle->global_fadt.x_dsdt, dsdt_length);
     if (!verify_table_checksum(dsdt, dsdt->hdr.length)) { return NULL; }
     aml_context_initialize(handle, dsdt);

src/lib/neoacpi/neo_logger.c

@@ -40,7 +40,7 @@ void neo_acpi_logger_failed(const char *str, ...) {
     neo_acpi_va_list vlist;
     neo_acpi_va_start(vlist, str);
 
-    ret = neo_acpi_vsnprintf(buf + 11, sizeof(buf), str, vlist);
+    ret = neo_acpi_vsnprintf(buf, sizeof(buf), str, vlist);
     if (ret < 0) return;
 
     neo_acpi_kernel_logger(FAILED, buf);

src/lib/neoacpi/neo_table.c

@@ -61,7 +61,7 @@ static bool check_table_signature(void *table, const char *expect) {
     if (!signatures_match(table, expect)) {
         struct acpi_sdt_hdr *hdr = table;
         log_error("invalid table '%.4s' (OEM ID '%.6s' OEM Table ID '%.8s') signature (expected "
-                  "'%.4s')\n",
+                  "'%.4s')",
                   hdr->signature, hdr->oemid, hdr->oem_table_id, expect);
         return false;
     }
@@ -73,7 +73,7 @@ bool verify_table_checksum(void *table, size_t size) {
 
     if (csum != 0) {
         struct acpi_sdt_hdr *hdr = table;
-        log_error("invalid table '%.4s' (OEM ID '%.6s' OEM Table ID '%.8s') checksum %d!\n",
+        log_error("invalid table '%.4s' (OEM ID '%.6s' OEM Table ID '%.8s') checksum %d!",
                   (hdr)->signature, (hdr)->oemid, (hdr)->oem_table_id, csum);
         return false;
     }