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

Timestamp:

2011-08-07T22:09:26Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

699f3bc

Parents:

26fb118a

Message:

Support for calling SAL procedures from the loader.

• Added sal_call() to perform and wrap around calls to SAL.
• Added sal_base_clock_frequency() to read the system base frequency.

File:

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

boot/arch/ia64/src/main.c

@@ -118 +118 @@
 }
 
-static void read_sal_configuration(void)
-{
-        if (bootpar && bootpar->efi_system_table) {
-                /* TODO: read the real values from SAL */
+static void read_pal_configuration(void)
+{
+        if (bootpar) {
+                /* TODO: read the real value from PAL */
                 bootinfo.freq_scale = DEFAULT_FREQ_SCALE;
-                bootinfo.sys_freq = DEFAULT_SYS_FREQ;
-                
-                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);
         } else {
                 /* Configure default values for simulators. */
                 bootinfo.freq_scale = DEFAULT_FREQ_SCALE;
+        }
+}
+
+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 {
+                /* Configure default values for simulators. */
                 bootinfo.sys_freq = DEFAULT_SYS_FREQ;
         }
@@ -198 +206 @@
         read_efi_memmap();
         read_sal_configuration();
+        read_pal_configuration();
         
         printf("Booting the kernel ...\n");