Changeset 1025d28 in mainline

Timestamp:

2008-11-13T07:54:48Z (16 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

37e518b

Parents:

aa8d0f7

Message:

IA64: Support for real frequency

Files:

• boot/arch/ia64/loader/gefi/HelenOS/hello.c (modified) (4 diffs)
• kernel/arch/ia64/include/bootinfo.h (modified) (1 diff)
• kernel/arch/ia64/include/drivers/it.h (modified) (1 diff)
• kernel/arch/ia64/src/drivers/it.c (modified) (2 diffs)

boot/arch/ia64/loader/gefi/HelenOS/hello.c

@@ -154 +154 @@
 
         rArg rSAL;
+        rArg rPAL;
+
         //Setup AP's wake up address
-
         LibSalProc(0x01000000,2,0x4400200,0,0,0,0,0,&rSAL);
+
+
+        //Get System Frequency
+        UINT64 sys_freq;
+        LibSalProc(0x01000012,0,0,0,0,0,0,0,&rSAL);
+        sys_freq=rSAL.p1;
+        
+
+        UINT64 freq_scale;
+        //Get CPU Frequency to System Frequency ratio
+        LibPalProc(14,0,0,0,&rPAL);
+        freq_scale=rPAL.p1;
 
 
@@ -162 +175 @@
         LibGetSalIpiBlock(&sapic);
         Print (L"SAPIC:%X\n", sapic);
-        bootinfo->sapic=sapic;
+        //bootinfo->sapic=sapic;
 
 
@@ -168 +181 @@
         wakeup_intno=0xf0;
         Print (L"WAKEUP INTNO:%X\n", wakeup_intno);
-        bootinfo->wakeup_intno=wakeup_intno;
+        //bootinfo->wakeup_intno=wakeup_intno;
 
 
@@ -213 +226 @@
         bootinfo->sapic=(unsigned long *)sapic;
         bootinfo->wakeup_intno=wakeup_intno;
+        bootinfo->sys_freq=sys_freq;
+        bootinfo->freq_scale=freq_scale;
         
         //Run Kernel

kernel/arch/ia64/include/bootinfo.h

@@ -49 +49 @@
 
         unsigned long * sapic;
+        unsigned long sys_freq;
+        unsigned long freq_scale;
         unsigned int wakeup_intno;
 

kernel/arch/ia64/include/drivers/it.h

@@ -42 +42 @@
  *
  */
-#define IT_DELTA        100000
+#define IT_DELTA        it_delta
 
 extern void it_init(void);

kernel/arch/ia64/src/drivers/it.c

@@ -47 +47 @@
 #define IT_SERVICE_CLOCKS 64
 
+#define FREQ_NUMERATOR_SHIFT 32
+#define FREQ_NUMERATOR_MASK 0xffffffff00000000LL
+
+#define FREQ_DENOMINATOR_SHIFT 0
+#define FREQ_DENOMINATOR_MASK 0xffffffffLL
+
+
+uint64_t it_delta;
+
+
 static irq_t it_irq;
 
@@ -65 +75 @@
                 it_irq.handler = it_interrupt;
                 irq_register(&it_irq);
+                
+                uint64_t base_freq;
+                base_freq  = ((bootinfo->freq_scale) & FREQ_NUMERATOR_MASK) >> FREQ_NUMERATOR_SHIFT;
+                base_freq *= bootinfo->sys_freq;
+                base_freq /= ((bootinfo->freq_scale) & FREQ_DENOMINATOR_MASK) >> FREQ_DENOMINATOR_SHIFT;
+                
+                it_delta = base_freq /HZ;
+                
         }