Changeset 577fe9b6 in mainline

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.

Location:

boot/arch/ia64

Files:

• Makefile.inc (modified) (1 diff)
• include/sal.h (modified) (2 diffs)
• src/main.c (modified) (2 diffs)
• src/sal.c (modified) (3 diffs)
• src/sal_asm.S (added)

boot/arch/ia64/Makefile.inc

@@ -46 +46 @@
         arch/$(BARCH)/src/main.c \
         arch/$(BARCH)/src/sal.c \
+        arch/$(BARCH)/src/sal_asm.S \
         arch/$(BARCH)/src/putchar.c \
         $(COMPS_C) \

boot/arch/ia64/include/sal.h

@@ -32 +32 @@
 #include <arch/types.h>
 #include <typedefs.h>
+
+/*
+ * Essential SAL procedures' IDs
+ */
+#define SAL_FREQ_BASE   0x1000012
 
 typedef struct {
@@ -103 +108 @@
 extern void sal_system_table_parse(sal_system_table_header_t *);
 
+extern uint64_t sal_base_clock_frequency(void);
+
+#define sal_call_1_1(id, arg1, ret1) \
+        sal_call((id), (arg1), 0, 0, 0, 0, 0, 0, (ret1), NULL, NULL)
+
+extern uint64_t sal_call(uint64_t, uint64_t, uint64_t, uint64_t, uint64_t,
+    uint64_t, uint64_t, uint64_t, uint64_t *, uint64_t *, uint64_t *);
+
 #endif

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

boot/arch/ia64/src/sal.c

@@ -30 +30 @@
 #include <arch/types.h>
 
-static sal_entrypoint_desc_t *sal_entrypoints;
 static sal_ap_wakeup_desc_t *sal_ap_wakeup;
+
+uint64_t pal_proc = 0;
+
+uint64_t sal_proc = 0;
+uint64_t sal_proc_gp = 0;
 
 void sal_system_table_parse(sal_system_table_header_t *sst)
@@ -41 +45 @@
                 switch ((sal_sst_type_t) *cur) {
                 case SSTT_ENTRYPOINT_DESC:
-                        sal_entrypoints = (sal_entrypoint_desc_t *) cur;
+                        pal_proc = ((sal_entrypoint_desc_t *) cur)->pal_proc;
+                        sal_proc = ((sal_entrypoint_desc_t *) cur)->sal_proc;
+                        sal_proc_gp = ((sal_entrypoint_desc_t *) cur)->sal_proc_gp;
                         cur += sizeof(sal_entrypoint_desc_t);
                         break;
@@ -66 +72 @@
 }
 
+uint64_t sal_base_clock_frequency(void)
+{
+        uint64_t freq;
+        
+        sal_call_1_1(SAL_FREQ_BASE, 0, &freq);
+        
+        return freq;
+}