Changeset ee24574 in mainline for boot

Timestamp:

2011-08-18T08:00:42Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

a92cf94f

Parents:

0f963cb (diff), c53a705 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge libposix changes.

Location:

boot

Files:

• Makefile.common (modified) (2 diffs)
• arch/ia64/Makefile.inc (modified) (1 diff)
• arch/ia64/include/pal.h (added)
• arch/ia64/include/sal.h (added)
• arch/ia64/src/main.c (modified) (3 diffs)
• arch/ia64/src/pal.c (moved) (moved from uspace/srv/hid/fb/ppm.h ) (2 diffs)
• arch/ia64/src/pal_asm.S (added)
• arch/ia64/src/sal.c (added)
• arch/ia64/src/sal_asm.S (added)
• arch/mips32/src/asm.S (modified) (1 diff)
• arch/mips64/src/asm.S (modified) (1 diff)
• genarch/include/efi.h (modified) (2 diffs)
• genarch/src/efi.c (added)

boot/Makefile.common

@@ -73 +73 @@
         $(USPACE_PATH)/srv/loader/loader \
         $(USPACE_PATH)/app/init/init \
-        $(USPACE_PATH)/srv/devmap/devmap \
+        $(USPACE_PATH)/srv/loc/loc \
         $(USPACE_PATH)/srv/bd/rd/rd \
         $(USPACE_PATH)/srv/vfs/vfs
@@ -93 +93 @@
         $(USPACE_PATH)/srv/hid/input/input \
         $(USPACE_PATH)/srv/hid/console/console \
-        $(USPACE_PATH)/srv/fs/devfs/devfs
+        $(USPACE_PATH)/srv/fs/locfs/locfs
 
 RD_SRVS_NON_ESSENTIAL = \

boot/arch/ia64/Makefile.inc

@@ -45 +45 @@
         arch/$(BARCH)/src/asm.S \
         arch/$(BARCH)/src/main.c \
+        arch/$(BARCH)/src/sal.c \
+        arch/$(BARCH)/src/sal_asm.S \
+        arch/$(BARCH)/src/pal.c \
+        arch/$(BARCH)/src/pal_asm.S \
         arch/$(BARCH)/src/putchar.c \
         $(COMPS_C) \
+        genarch/src/efi.c \
         genarch/src/division.c \
         generic/src/balloc.c \

boot/arch/ia64/src/main.c

@@ -35 +35 @@
 #include <arch/_components.h>
 #include <genarch/efi.h>
+#include <arch/sal.h>
+#include <arch/pal.h>
 #include <halt.h>
 #include <printf.h>
@@ -117 +119 @@
 }
 
-static void read_sal_configuration(void)
-{
-        if (!bootpar) {
+static void read_pal_configuration(void)
+{
+        if (bootpar) {
+                bootinfo.freq_scale = pal_proc_freq_ratio();
+        } else {
                 /* Configure default values for simulators. */
                 bootinfo.freq_scale = DEFAULT_FREQ_SCALE;
-                bootinfo.sys_freq = DEFAULT_SYS_FREQ;
+        }
+}
+
+static void read_sal_configuration(void)
+{
+        if (bootpar && bootpar->efi_system_table) {
+                efi_guid_t sal_guid = SAL_SYSTEM_TABLE_GUID;
+                sal_system_table_header_t *sal_st;
+                
+                sal_st = efi_vendor_table_find(
+                    (efi_system_table_t *) bootpar->efi_system_table, sal_guid);
+
+                sal_system_table_parse(sal_st);
+                
+                bootinfo.sys_freq = sal_base_clock_frequency();
         } else {
-                /* TODO: read the real values from SAL */
-                bootinfo.freq_scale = DEFAULT_FREQ_SCALE;
+                /* Configure default values for simulators. */
                 bootinfo.sys_freq = DEFAULT_SYS_FREQ;
         }
@@ -189 +206 @@
         read_efi_memmap();
         read_sal_configuration();
+        read_pal_configuration();
         
         printf("Booting the kernel ...\n");

boot/arch/ia64/src/pal.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Ondrej Palkovsky
+ * Copyright (c) 2011 Jakub Jermar
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#ifndef FB_PPM_H_
-#define FB_PPM_H_
+#include <arch/pal.h>
+#include <arch/types.h>
 
-#include "fb.h"
-#include <sys/types.h>
+uint64_t pal_proc = 0;
 
-extern int ppm_draw(unsigned char *, size_t, unsigned int, unsigned int, 
-    unsigned int, unsigned int, putpixel_cb_t, void *);
-extern int ppm_get_data(unsigned char *, size_t, unsigned int *, unsigned int *);
-
-#endif
+uint64_t pal_proc_freq_ratio(void)
+{
+        uint64_t proc_ratio;
+        
+        pal_static_call_0_1(PAL_FREQ_RATIOS, &proc_ratio);
+        
+        return proc_ratio;
+}

boot/arch/mips32/src/asm.S

@@ -44 +44 @@
          * Setup the CP0 configuration
          *  - Disable 64-bit kernel addressing mode
-         *  - DIsable 64-bit supervisor adressing mode
+         *  - Disable 64-bit supervisor adressing mode
          *  - Disable 64-bit user addressing mode
          */

boot/arch/mips64/src/asm.S

@@ -47 +47 @@
          *  - Enable 64-bit user addressing mode
          */
-        dmfc0 $a0, $status
+        mfc0 $a0, $status
         ori $a0, 0x00e0
-        dmtc0 $a0, $status
+        mtc0 $a0, $status
         
         /*

boot/genarch/include/efi.h

@@ -30 +30 @@
 #define BOOT_EFI_H_
 
+#include <arch/types.h>
+
+typedef struct {
+        uint64_t signature;
+        uint32_t revision;
+        uint32_t header_size;
+        uint32_t crc32;
+        uint32_t reserved;
+} efi_table_header_t;
+
+#define SAL_SYSTEM_TABLE_GUID \
+        { \
+                { \
+                        0x32, 0x2d, 0x9d, 0xeb, 0x88, 0x2d, 0xd3, 0x11, \
+                        0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d \
+                } \
+        }
+
+typedef union {
+        uint8_t bytes[16];
+        struct {
+                uint64_t low;
+                uint64_t high;
+        };
+} efi_guid_t;
+
+typedef struct {
+        efi_guid_t guid;
+        void *table;
+} efi_configuration_table_t;
+
+typedef struct {
+        efi_table_header_t hdr;
+        char *fw_vendor;
+        uint32_t fw_revision;
+        void *cons_in_handle;
+        void *cons_in;
+        void *cons_out_handle;
+        void *cons_out;
+        void *cons_err_handle;
+        void *cons_err;
+        void *runtime_services;
+        void *boot_services;
+        sysarg_t conf_table_entries;
+        efi_configuration_table_t *conf_table;
+} efi_system_table_t;
+
 typedef enum {
         EFI_RESERVED,
@@ -57 +104 @@
 #define EFI_PAGE_SIZE   4096
 
+extern void *efi_vendor_table_find(efi_system_table_t *, efi_guid_t);
+
 #endif