Changeset dba84ff in mainline

Timestamp:

2005-04-26T10:02:47Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

434f700

Parents:

85bfdcc8

Message:

Separate EBDA detection from MP Specification code. EBDA address will be needed during ACPI initialization.

Location:

arch/ia32

Files:

• Makefile.inc (modified) (1 diff)
• include/bios/bios.h (added)
• src/bios/bios.c (added)
• src/ia32.c (modified) (1 diff)
• src/smp/mp.c (modified) (3 diffs)

arch/ia32/Makefile.inc

@@ -25 +25 @@
         arch/proc/scheduler.c \
         arch/acpi/acpi.c \
+        arch/bios/bios.c \
         arch/smp/ap.S \
         arch/smp/apic.c \

arch/ia32/src/ia32.c

@@ -68 +68 @@
 
         if (config.cpu_active == 1) {
+                bios_init();
                 i8042_init();   /* a20 bit */
                 i8259_init();   /* PIC */

arch/ia32/src/smp/mp.c

@@ -47 +47 @@
 #include <arch/i8259.h>
 #include <arch/asm.h>
+#include <arch/bios/bios.h>
 #include <arch/acpi/madt.h>
 
@@ -133 +134 @@
 
         /*
-         * First place to search the MP Floating Pointer Structure is the Extended
-         * BIOS Data Area. We have to read EBDA segment address from the BIOS Data
-         * Area. Unfortunatelly, this memory is in page 0, which has intentionally no
-         * mapping.
-         */
-        frame = frame_alloc(FRAME_KA);
-        map_page_to_frame(frame,0,PAGE_CACHEABLE,0);
-        addr = *((__u16 *) (frame + 0x40e)) * 16;
-        map_page_to_frame(frame,frame,PAGE_CACHEABLE,0);
-        frame_free(frame);      
-
-        /*
          * EBDA can be undefined. In that case addr would be 0. 
          */
-        if (addr >= 0x1000) {
+        addr = ebda;
+        if (addr) {
                 cnt = 1024;
                 while (addr = __u32_search(addr,cnt,FS_SIGNATURE)) {
@@ -156 +146 @@
                 }
         }
-        
-        /*
-         * Second place where the MP Floating Pointer Structure may live is the last
-         * kilobyte of base memory.
-         */
-        addr = 639*1024;
-        cnt = 1024;
-        while (addr = __u32_search(addr,cnt,FS_SIGNATURE)) {
-                if (mp_fs_check((__u8 *) addr))
-                        goto fs_found;
-                addr++;
-                cnt--;
+        else {
+                /*
+                 * Second place where the MP Floating Pointer Structure may live is the last
+                 * kilobyte of base memory.
+                 */
+                addr = 639*1024;
+                cnt = 1024;
+                while (addr = __u32_search(addr,cnt,FS_SIGNATURE)) {
+                        if (mp_fs_check((__u8 *) addr))
+                                goto fs_found;
+                        addr++;
+                        cnt--;
+                }
         }