Changeset db6e419 in mainline for boot/arch/ia64/src/main.c

Timestamp:

2011-08-16T18:53:00Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

49160c4

Parents:

e0e922d (diff), 45058baa (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 mainline changes.

File:

• boot/arch/ia64/src/main.c (modified) (3 diffs)

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");