Changeset ed0dd65 in mainline for arch/ia32/src

Timestamp:

2005-04-30T16:47:17Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

30ef8ce

Parents:

10a2e22

Message:

More ACPI work.
Initial MADT table parsing.

SMP renaming and reorganization to reflect there are more ways to bring SMP up.

Location:

arch/ia32/src

Files:

• acpi/acpi.c (modified) (1 diff)
• acpi/madt.c (modified) (1 diff)
• ia32.c (modified) (1 diff)
• mm/page.c (modified) (1 diff)
• smp/apic.c (modified) (5 diffs)
• smp/mps.c (moved) (moved from arch/ia32/src/smp/mp.c ) (16 diffs)
• smp/smp.c (added)

arch/ia32/src/acpi/acpi.c

@@ -79 +79 @@
 void map_sdt(struct acpi_sdt_header *sdt)
 {
+        int i, cnt, length;
+
         map_page_to_frame((__address) sdt, (__address) sdt, PAGE_NOT_CACHEABLE, 0);
+        
+        length = sdt->length + ((__address) sdt) - ((__address) sdt)&0xfffff000;
+        cnt = length/PAGE_SIZE + (length%PAGE_SIZE>0);
+        
+        for (i = 1; i < cnt; i++)
+                map_page_to_frame(((__address) sdt) + i*PAGE_SIZE, ((__address) sdt) + i*PAGE_SIZE, PAGE_NOT_CACHEABLE, 0);
 }
 

arch/ia32/src/acpi/madt.c

@@ -27 +27 @@
  */
 
+#include <arch/types.h>
 #include <arch/acpi/acpi.h>
 #include <arch/acpi/madt.h>
+#include <arch/smp/apic.h>
 
 struct acpi_madt *acpi_madt = NULL;
+
+#ifdef __SMP__
+
+char *entry[] = {
+        "L_APIC",
+        "IO_APIC",
+        "INTR_SRC_OVRD",
+        "NMI_SRC",
+        "L_APIC_NMI",
+        "L_APIC_ADDR_OVRD",
+        "IO_SAPIC",
+        "L_SAPIC",
+        "PLATFORM_INTR_SRC"
+};
+
+void acpi_madt_parse(void)
+{
+        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];
+
+        l_apic = (__u32 *) acpi_madt->l_apic_address;
+
+        while (h < end) {
+                switch (h->type) {
+                        case MADT_L_APIC:
+                        case MADT_IO_APIC:
+                        case MADT_INTR_SRC_OVRD:
+                        case MADT_NMI_SRC:
+                        case MADT_L_APIC_NMI:
+                        case MADT_L_APIC_ADDR_OVRD:
+                        case MADT_IO_SAPIC:
+                        case MADT_L_SAPIC:
+                        case MADT_PLATFORM_INTR_SRC:
+                                printf("MADT: skipping %s entry (type=%d)\n", entry[h->type], h->type);
+                                break;
+
+                        default:
+                                if (h->type >= MADT_RESERVED_SKIP_BEGIN && h->type <= MADT_RESERVED_SKIP_END) {
+                                        printf("MADT: skipping reserved entry (type=%d)\n", h->type);
+                                }
+                                if (h->type >= MADT_RESERVED_OEM_BEGIN) {
+                                        printf("MADT: skipping OEM entry (type=%d)\n", h->type);
+                                }
+                                break;
+                }
+                h = (struct madt_apic_header *) (((__u8 *) h) + h->length);
+        }
+
+}
+
+#endif /* __SMP__ */

arch/ia32/src/ia32.c

@@ -94 +94 @@
                 #ifdef __SMP__
                 acpi_init();
-                mp_init();
                 #endif /* __SMP__ */
         }

arch/ia32/src/mm/page.c

@@ -128 +128 @@
                 pd[pde].frame_address = newpt >> 12;
         }
+        
         pt = (struct page_specifier *) (pd[pde].frame_address << 12);
 

arch/ia32/src/smp/apic.c

@@ -30 +30 @@
 #include <arch/smp/apic.h>
 #include <arch/smp/ap.h>
-#include <arch/smp/mp.h>
+#include <arch/smp/mps.h>
 #include <mm/page.h>
 #include <time/delay.h>
@@ -44 +44 @@
  * Advanced Programmable Interrupt Controller for MP systems.
  * Tested on:
- *      Bochs 2.0.2 with 2-8 CPUs
+ *      Bochs 2.0.2 - Bochs 2.2-cvs with 2-8 CPUs
  *      ASUS P/I-P65UP5 + ASUS C-P55T2D REV. 1.41 with 2x 200Mhz Pentium CPUs
  */
@@ -83 +83 @@
                 int pin;
         
-                if ((pin = mp_irq_to_pin(i)) != -1)
+                if ((pin = mps_irq_to_pin(i)) != -1)
                         io_apic_change_ioredtbl(pin,0xf,IVT_IRQBASE+i,LOPRI);
         }
@@ -380 +380 @@
                          * mapping for the respective IRQ number.
                          */
-                        pin = mp_irq_to_pin(i);
+                        pin = mps_irq_to_pin(i);
                         if (pin != -1) {
                                 reglo = io_apic_read(IOREDTBL + pin*2);
@@ -402 +402 @@
                          * mapping for the respective IRQ number.
                          */
-                        pin = mp_irq_to_pin(i);
+                        pin = mps_irq_to_pin(i);
                         if (pin != -1) {
                                 reglo = io_apic_read(IOREDTBL + pin*2);

arch/ia32/src/smp/mps.c

@@ -1 +1 @@
 /*
- * Copyright (C) 2001-2004 Jakub Jermar
+ * Copyright (C) 2001-2005 Jakub Jermar
  * All rights reserved.
  *
@@ -33 +33 @@
 #include <print.h>
 #include <panic.h>
-#include <arch/smp/mp.h>
+#include <arch/smp/mps.h>
 #include <arch/smp/ap.h>
 #include <arch/smp/apic.h>
@@ -51 +51 @@
 
 /*
- * Multi-Processor Specification detection code.
+ * MultiProcessor Specification detection code.
  */
 
@@ -57 +57 @@
 #define CT_SIGNATURE    0x504d4350
 
-int mp_fs_check(__u8 *base);
-int mp_ct_check(void);
+int mps_fs_check(__u8 *base);
+int mps_ct_check(void);
 
 int configure_via_ct(void);
@@ -71 +71 @@
 void ct_extended_entries(void);
 
-static struct __mpfs *fs;
-static struct __mpct *ct;
+static struct mps_fs *fs;
+static struct mps_ct *ct;
 
 struct __processor_entry *processor_entries = NULL;
@@ -92 +92 @@
  * Used to check the integrity of the MP Floating Structure.
  */
-int mp_fs_check(__u8 *base)
+int mps_fs_check(__u8 *base)
 {
         int i;
@@ -106 +106 @@
  * Used to check the integrity of the MP Configuration Table.
  */
-int mp_ct_check(void)
+int mps_ct_check(void)
 {
         __u8 *base = (__u8 *) ct;
@@ -127 +127 @@
 }
 
-void mp_init(void)
+void mps_init(void)
 {
         __u8 *addr[2] = { NULL, (__u8 *) 0xf0000 };
@@ -143 +143 @@
         for (i = 0; i < 2; i++) {
                 for (j = 0; j < length[i]; j += 16) {
-                        if (*((__u32 *) &addr[i][j]) == FS_SIGNATURE && mp_fs_check(&addr[i][j])) {
-                                fs = (struct __mpfs *) &addr[i][j];
+                        if (*((__u32 *) &addr[i][j]) == FS_SIGNATURE && mps_fs_check(&addr[i][j])) {
+                                fs = (struct mps_fs *) &addr[i][j];
                                 goto fs_found;
                         }
@@ -153 +153 @@
         
 fs_found:
-        printf("%L: MP Floating Pointer Structure\n", fs);
+        printf("%L: MPS Floating Pointer Structure\n", fs);
 
         frame_not_free((__address) fs);
@@ -159 +159 @@
         if (fs->config_type == 0 && fs->configuration_table) {
                 if (fs->mpfib2 >> 7) {
-                        printf("mp_init: PIC mode not supported\n");
+                        printf("mps_init: PIC mode not supported\n");
                         return;
                 }
@@ -192 +192 @@
                 return 1;
         }
-        if (!mp_ct_check()) {
+        if (!mps_ct_check()) {
                 printf("configure_via_ct: bad ct checksum\n");
                 return 1;
@@ -288 +288 @@
 void ct_bus_entry(struct __bus_entry *bus)
 {
-#ifdef MPCT_VERBOSE
+#ifdef MPSCT_VERBOSE
         char buf[7];
         memcopy((__address) bus->bus_type, (__address) buf,6);
@@ -316 +316 @@
 }
 
-//#define MPCT_VERBOSE
+//#define MPSCT_VERBOSE
 void ct_io_intr_entry(struct __io_intr_entry *iointr)
 {
-#ifdef MPCT_VERBOSE
+#ifdef MPSCT_VERBOSE
         switch (iointr->intr_type) {
             case 0: printf("INT"); break;
@@ -350 +350 @@
 void ct_l_intr_entry(struct __l_intr_entry *lintr)
 {
-#ifdef MPCT_VERBOSE
+#ifdef MPSCT_VERBOSE
         switch (lintr->intr_type) {
             case 0: printf("INT"); break;
@@ -496 +496 @@
 }
 
-int mp_irq_to_pin(int irq)
+int mps_irq_to_pin(int irq)
 {
         int i;