Changeset 6b7c36f in mainline

Timestamp:

2005-07-18T11:23:39Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a26ddd1

Parents:

b4a4c5e3

Message:

Copyright owner of arch/mips/src/mm/asid.c is Martin Decky.

ACPI code now understands L_APIC and IO_APIC entries in MADT.

Location:

arch

Files:

• ia32/src/acpi/madt.c (modified) (4 diffs)
• mips/src/mm/asid.c (modified) (1 diff)

arch/ia32/src/acpi/madt.c

@@ -31 +31 @@
 #include <arch/acpi/madt.h>
 #include <arch/smp/apic.h>
+#include <mm/page.h>
+#include <panic.h>
 
 struct acpi_madt *acpi_madt = NULL;
 
 #ifdef __SMP__
+
+/*
+ * NOTE: it is currently not completely clear to the authors of SPARTAN whether
+ * MADT can exist in such a form that entries of the same type are not consecutive.
+ * Because of this uncertainity, some entry types are explicitly checked for
+ * being consecutive with other entries of the same kind. 
+ */
+
+static void madt_l_apic_entry(struct madt_l_apic *la, __u8 prev_type);
+static void madt_io_apic_entry(struct madt_io_apic *ioa, __u8 prev_type);
+
+struct madt_l_apic *madt_l_apic_entries = NULL;
+struct madt_io_apic *madt_io_apic_entries = NULL;
+
+int madt_l_apic_entry_cnt = 0;
+int madt_io_apic_entry_cnt = 0;
 
 char *entry[] = {
@@ -52 +70 @@
         struct madt_apic_header *end = (struct madt_apic_header *) (((__u8 *) acpi_madt) + acpi_madt->header.length);
         struct madt_apic_header *h = &acpi_madt->apic_header[0];
+        __u8 prev_type = 0; /* used to detect incosecutive entries */
+
 
         l_apic = (__u32 *) acpi_madt->l_apic_address;
@@ -58 +78 @@
                 switch (h->type) {
                         case MADT_L_APIC:
+                                madt_l_apic_entry((struct madt_l_apic *) h, prev_type);
+                                break;
                         case MADT_IO_APIC:
+                                madt_io_apic_entry((struct madt_io_apic *) h, prev_type);
+                                break;
                         case MADT_INTR_SRC_OVRD:
                         case MADT_NMI_SRC:
@@ -78 +102 @@
                                 break;
                 }
+                prev_type = h->type;
                 h = (struct madt_apic_header *) (((__u8 *) h) + h->length);
         }
 
 }
+ 
+void madt_l_apic_entry(struct madt_l_apic *la, __u8 prev_type)
+{
+        /* check for consecutiveness */
+        if (madt_l_apic_entry_cnt && prev_type != MADT_L_APIC)
+        panic("%s entries are not consecuitve\n", entry[MADT_L_APIC]);
+
+        if (!madt_l_apic_entry_cnt++)
+                madt_l_apic_entries = la;
+                
+        if (!(la->flags & 0x1)) {
+                /* Processor is unusable, skip it. */
+                return;
+        }
+                
+        apic_id_mask |= 1<<la->apic_id;
+}
+
+void madt_io_apic_entry(struct madt_io_apic *ioa, __u8 prev_type)
+{
+        /* check for consecutiveness */
+        if (madt_io_apic_entry_cnt && prev_type != MADT_IO_APIC)
+        panic("%s entries are not consecuitve\n", entry[MADT_IO_APIC]);
+
+        if (!madt_io_apic_entry_cnt++) {
+                madt_io_apic_entries = ioa;
+                io_apic = (__u32 *) ioa->io_apic_address;
+                map_page_to_frame((__address) io_apic, (__address) io_apic, PAGE_NOT_CACHEABLE, 0);
+        }
+        else {
+                /* currently not supported */
+                return;
+        }
+}
+
 
 #endif /* __SMP__ */

arch/mips/src/mm/asid.c

@@ -1 +1 @@
 /*
- * Copyright (C) 2005 HelenOS Project
+ * Copyright (C) 2005 Martin Decky
  * All rights reserved.
  *