Changeset 8ff0bd2 in mainline for boot/arch/ia64/src/sal.c

Timestamp:

2011-09-04T11:30:58Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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/sal.c (moved) (moved from kernel/genarch/include/ofw/fhc.h ) (2 diffs)

boot/arch/ia64/src/sal.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Jakub Jermar
+ * Copyright (c) 2011 Jakub Jermar
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#ifndef KERN_FHC_H_
-#define KERN_FHC_H_
+#include <arch/sal.h>
+#include <arch/types.h>
 
-#include <genarch/ofw/ofw_tree.h>
-#include <typedefs.h>
-#include <ddi/irq.h>
-#include <typedefs.h>
+static sal_ap_wakeup_desc_t *sal_ap_wakeup;
 
-typedef struct {
-        uint64_t addr;
-        uint32_t size;
-} __attribute__ ((packed)) ofw_fhc_reg_t;
+extern uint64_t pal_proc;
 
-typedef struct {
-        uint64_t child_base;
-        uint64_t parent_base;
-        uint32_t size;
-} __attribute__ ((packed)) ofw_fhc_range_t;
+uint64_t sal_proc = 0;
+uint64_t sal_proc_gp = 0;
 
-typedef struct {
-        uint64_t addr;
-        uint32_t size;
-} __attribute__ ((packed)) ofw_central_reg_t;
+void sal_system_table_parse(sal_system_table_header_t *sst)
+{
+        uint8_t *cur = (uint8_t *) &sst[1];
+        uint16_t entry;
 
-typedef struct {
-        uint64_t child_base;
-        uint64_t parent_base;
-        uint32_t size;
-} __attribute__ ((packed)) ofw_central_range_t;
+        for (entry = 0; entry < sst->entry_count; entry++) {
+                switch ((sal_sst_type_t) *cur) {
+                case SSTT_ENTRYPOINT_DESC:
+                        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;
+                case SSTT_MEMORY_DESC:
+                        cur += sizeof(sal_memory_desc_t);
+                        break;
+                case SSTT_PLATFORM_FEATURES_DESC:
+                        cur += sizeof(sal_platform_features_desc_t);
+                        break;
+                case SSTT_TR_DESC:
+                        cur += sizeof(sal_tr_desc_t);
+                        break;
+                case SSTT_PTC_COHERENCE_DOMAIN_DESC:
+                        cur += sizeof(sal_ptc_coherence_domain_desc_t);
+                        break;
+                case SSTT_AP_WAKEUP_DESC:
+                        sal_ap_wakeup = (sal_ap_wakeup_desc_t *) cur;
+                        cur += sizeof(sal_ap_wakeup_desc_t);
+                        break;
+                default:
+                        return;
+                }
+        }
+}
 
-extern bool ofw_fhc_apply_ranges(ofw_tree_node_t *, ofw_fhc_reg_t *,
-    uintptr_t *);
-extern bool ofw_central_apply_ranges(ofw_tree_node_t *, ofw_central_reg_t *,
-    uintptr_t *);
-
-extern bool ofw_fhc_map_interrupt(ofw_tree_node_t *, ofw_fhc_reg_t *,
-    uint32_t, int *, cir_t *, void **);
-
-#endif
+uint64_t sal_base_clock_frequency(void)
+{
+        uint64_t freq;
+        
+        sal_call_1_1(SAL_FREQ_BASE, 0, &freq);
+        
+        return freq;
+}