Changeset 275 for trunk

Timestamp:

Jul 26, 2017, 1:20:36 PM (7 years ago)

Author:

max@…

Message:

Add a SRAT parser. For some reason, QEMU does not want to enable the
memory ranges...

Location:

trunk/hal/x86_64/core

Files:

• hal_acpi.c (modified) (3 diffs)
• hal_acpi.h (modified) (1 diff)

trunk/hal/x86_64/core/hal_acpi.c

@@ -173 +173 @@
 /* -------------------------------------------------------------------------- */
 
+static void hal_acpi_parse_srat(srat_t *srat)
+{
+        srat_cpu_affinity_t *cpu;
+        srat_mem_affinity_t *mem;
+        void *ptr, *end;
+        subheader_t *sub;
+        uint32_t dom;
+
+        ptr = (void *)(srat + 1);
+        end = (void *)srat + srat->Header.Length;
+
+        while (ptr < end) {
+                sub = (subheader_t *)ptr;
+                if (sub->Type == ACPI_SRAT_TYPE_CPU_AFFINITY) {
+                        cpu = (srat_cpu_affinity_t *)sub;
+                        if (cpu->Flags & ACPI_SRAT_CPU_USE_AFFINITY) {
+                                dom = ((uint32_t)cpu->ProximityDomainHi[2] << 24) |
+                                      ((uint32_t)cpu->ProximityDomainHi[1] << 16) |
+                                      ((uint32_t)cpu->ProximityDomainHi[0] << 8) |
+                                       (uint32_t)cpu->ProximityDomainLo;
+                                x86_printf("-> found CPU affinity: %z->%z\n",
+                                    (uint64_t)cpu->ApicId, (uint64_t)dom);
+                        }
+                } else if (sub->Type == ACPI_SRAT_TYPE_MEMORY_AFFINITY) {
+                        mem = (srat_mem_affinity_t *)sub;
+//                      if (mem->Flags & ACPI_SRAT_MEM_ENABLED)
+                                x86_printf("-> found MEM affinity: %z->[%Z,%Z,%Z]\n",
+                                    mem->ProximityDomain,
+                                    mem->BaseAddress, mem->Length,(uint64_t)mem->Flags);
+                } 
+
+                ptr += sub->Length;
+        }
+
+}
+
+static srat_t *hal_acpi_map_srat(rsdt_t *rsdt)
+{
+        vaddr_t va;
+        paddr_t pa;
+        uint32_t *ent;
+        size_t i, n;
+
+        n = RSDT_NENTRIES(rsdt);
+        ent = RSDT_ENTRIES(rsdt);
+
+        for (i = 0; i < n; i++) {
+                pa = (paddr_t)ent[i];
+                va = hal_acpi_map_table(pa, "SRAT");
+                if (va == 0)
+                        continue;
+
+                return (srat_t *)va;
+        }
+
+        return NULL;
+}
+
+/* -------------------------------------------------------------------------- */
+
 static rsdt_t *hal_acpi_map_rsdt(rsdp_t *rsdp)
 {
@@ -242 +302 @@
         rsdt_t *rsdt;
         madt_t *madt;
+        srat_t *srat;
         paddr_t bios_min = 0x0E0000;
         paddr_t bios_max = 0x100000;
@@ -262 +323 @@
                 x86_panic("RSDT not found");
 
-        /* Now, map MADT */
+        /* Map MADT and parse it */
         madt = hal_acpi_map_madt(rsdt);
         if (madt == NULL)
                 x86_panic("MADT not found");
-
-        /* Parse it */
         hal_acpi_parse_madt(madt);
-}
-
+
+        /* Map SRAT and parse it */
+        srat = hal_acpi_map_srat(rsdt);
+        if (srat != NULL)
+                hal_acpi_parse_srat(srat);
+        else
+                x86_printf("-> SRAT not found, single cluster\n");
+}
+

trunk/hal/x86_64/core/hal_acpi.h

@@ -192 +192 @@
 typedef struct acpi_madt_io_apic madt_ioapic_t;
 
+/*******************************************************************************
+ * SRAT - System Resource Affinity Table
+ *        Version 3
+ ******************************************************************************/
+
+struct acpi_table_srat {
+        header_t Header;        /* Common ACPI table header */
+        uint32_t TableRevision; /* Must be value '1' */
+        uint64_t Reserved;      /* Reserved, must be zero */
+};
+typedef struct acpi_table_srat  srat_t;
+
+/*******************************************************************************
+ * SRAT structures
+ ******************************************************************************/
+
+enum AcpiSratType {
+        ACPI_SRAT_TYPE_CPU_AFFINITY        = 0,
+        ACPI_SRAT_TYPE_MEMORY_AFFINITY     = 1,
+        ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY = 2,
+        ACPI_SRAT_TYPE_GICC_AFFINITY       = 3,
+        ACPI_SRAT_TYPE_RESERVED            = 4  /* 4 and greater are reserved */
+};
+
+#define ACPI_SRAT_CPU_USE_AFFINITY  (1) /* 00: Use affinity structure */
+
+struct acpi_srat_cpu_affinity {
+        subheader_t Header;
+        uint8_t ProximityDomainLo;
+        uint8_t ApicId;
+        uint32_t Flags;
+        uint8_t LocalSapicEid;
+        uint8_t ProximityDomainHi[3];
+        uint32_t ClockDomain;
+};
+typedef struct acpi_srat_cpu_affinity   srat_cpu_affinity_t;
+
+#define ACPI_SRAT_MEM_ENABLED       (1)    /* 00: Use affinity structure */
+#define ACPI_SRAT_MEM_HOT_PLUGGABLE (1<<1) /* 01: Memory region is hot pluggable */
+#define ACPI_SRAT_MEM_NON_VOLATILE  (1<<2) /* 02: Memory region is non-volatile */
+
+struct acpi_srat_mem_affinity {
+        subheader_t Header;
+        uint32_t ProximityDomain;
+        uint16_t Reserved;        /* Reserved, must be zero */
+        uint64_t BaseAddress;
+        uint64_t Length;
+        uint32_t Reserved1;
+        uint32_t Flags;
+        uint64_t Reserved2;       /* Reserved, must be zero */
+};
+typedef struct acpi_srat_mem_affinity   srat_mem_affinity_t;
+