refactor: decouple i386 specific instruction invocation

[lunaix-os.git] / lunaix-os / kernel / time / timer.c

diff --git a/lunaix-os/kernel/time/timer.c b/lunaix-os/kernel/time/timer.c
index 7d9a391ee3624f1f2f3227d361ed745aed5b10b7..2aca8d588014eba5517808863523226651958c58 100644 (file)
--- a/lunaix-os/kernel/time/timer.c
+++ b/lunaix-os/kernel/time/timer.c
@@ -9,10 +9,11 @@
  * @copyright Copyright (c) 2022
  *
  */
  * @copyright Copyright (c) 2022
  *
  */

-#include <arch/x86/interrupts.h>
+#include <arch/i386/interrupts.h>

 #include <hal/apic.h>
 #include <hal/rtc.h>
 
 #include <hal/apic.h>
 #include <hal/rtc.h>
 

+#include <lunaix/isrm.h>

 #include <lunaix/mm/cake.h>
 #include <lunaix/mm/valloc.h>
 #include <lunaix/sched.h>
 #include <lunaix/mm/cake.h>
 #include <lunaix/mm/valloc.h>
 #include <lunaix/sched.h>


@@ -20,6 +21,8 @@
 #include <lunaix/syslog.h>
 #include <lunaix/timer.h>
 
 #include <lunaix/syslog.h>
 #include <lunaix/timer.h>
 

+#include <hal/acpi/acpi.h>
+

 #define LVT_ENTRY_TIMER(vector, mode) (LVT_DELIVERY_FIXED | mode | vector)
 
 LOG_MODULE("TIMER");
 #define LVT_ENTRY_TIMER(vector, mode) (LVT_DELIVERY_FIXED | mode | vector)
 
 LOG_MODULE("TIMER");


@@ -37,11 +40,11 @@ static volatile struct lx_timer_context* timer_ctx = NULL;
 
 // Don't optimize them! Took me an half hour to figure that out...
 
 
 // Don't optimize them! Took me an half hour to figure that out...
 

-static volatile uint32_t rtc_counter = 0;
-static volatile uint8_t apic_timer_done = 0;
+static volatile u32_t rtc_counter = 0;
+static volatile u8_t apic_timer_done = 0;

 
 

-static volatile uint32_t sched_ticks = 0;
-static volatile uint32_t sched_ticks_counter = 0;
+static volatile u32_t sched_ticks = 0;
+static volatile u32_t sched_ticks_counter = 0;

 
 static struct cake_pile* timer_pile;
 
 
 static struct cake_pile* timer_pile;
 


@@ -61,7 +64,7 @@ timer_init_context()
 }
 
 void
 }
 
 void

-timer_init(uint32_t frequency)
+timer_init(u32_t frequency)

 {
     timer_init_context();
 
 {
     timer_init_context();
 


@@ -69,10 +72,20 @@ timer_init(uint32_t frequency)
 
     // Setup APIC timer
 
 
     // Setup APIC timer
 

+    // Remap the IRQ 8 (rtc timer's vector) to RTC_TIMER_IV in ioapic
+    //       (Remarks IRQ 8 is pin INTIN8)
+    //       See IBM PC/AT Technical Reference 1-10 for old RTC IRQ
+    //       See Intel's Multiprocessor Specification for IRQ - IOAPIC INTIN
+    //       mapping config.
+
+    // grab ourselves these irq numbers
+    u32_t iv_rtc = isrm_bindirq(PC_AT_IRQ_RTC, temp_intr_routine_rtc_tick);
+    u32_t iv_timer = isrm_ivexalloc(temp_intr_routine_apic_timer);
+

     // Setup a one-shot timer, we will use this to measure the bus speed. So we
     // can then calibrate apic timer to work at *nearly* accurate hz
     apic_write_reg(APIC_TIMER_LVT,
     // Setup a one-shot timer, we will use this to measure the bus speed. So we
     // can then calibrate apic timer to work at *nearly* accurate hz
     apic_write_reg(APIC_TIMER_LVT,

-                   LVT_ENTRY_TIMER(APIC_TIMER_IV, LVT_TIMER_ONESHOT));
+                   LVT_ENTRY_TIMER(iv_timer, LVT_TIMER_ONESHOT));

 
     // Set divider to 64
     apic_write_reg(APIC_TIMER_DCR, APIC_TIMER_DIV64);
 
     // Set divider to 64
     apic_write_reg(APIC_TIMER_DCR, APIC_TIMER_DIV64);


@@ -110,9 +123,6 @@ timer_init(uint32_t frequency)
     rtc_counter = 0;
     apic_timer_done = 0;
 
     rtc_counter = 0;
     apic_timer_done = 0;
 

-    intr_subscribe(APIC_TIMER_IV, temp_intr_routine_apic_timer);
-    intr_subscribe(RTC_TIMER_IV, temp_intr_routine_rtc_tick);
-

     rtc_enable_timer();                                     // start RTC timer
     apic_write_reg(APIC_TIMER_ICR, APIC_CALIBRATION_CONST); // start APIC timer
 
     rtc_enable_timer();                                     // start RTC timer
     apic_write_reg(APIC_TIMER_ICR, APIC_CALIBRATION_CONST); // start APIC timer
 


@@ -123,18 +133,19 @@ timer_init(uint32_t frequency)
 
     assert_msg(timer_ctx->base_frequency, "Fail to initialize timer (NOFREQ)");
 
 
     assert_msg(timer_ctx->base_frequency, "Fail to initialize timer (NOFREQ)");
 

-    kprintf(KINFO "Base frequency: %u Hz\n", timer_ctx->base_frequency);
+    kprintf(
+      KINFO "hw: %u Hz; os: %u Hz\n", timer_ctx->base_frequency, frequency);

 
     timer_ctx->running_frequency = frequency;
     timer_ctx->tphz = timer_ctx->base_frequency / frequency;
 
     // cleanup
 
     timer_ctx->running_frequency = frequency;
     timer_ctx->tphz = timer_ctx->base_frequency / frequency;
 
     // cleanup

-    intr_unsubscribe(APIC_TIMER_IV, temp_intr_routine_apic_timer);
-    intr_unsubscribe(RTC_TIMER_IV, temp_intr_routine_rtc_tick);
+    isrm_ivfree(iv_timer);
+    isrm_ivfree(iv_rtc);

 
 

-    apic_write_reg(APIC_TIMER_LVT,
-                   LVT_ENTRY_TIMER(APIC_TIMER_IV, LVT_TIMER_PERIODIC));
-    intr_subscribe(APIC_TIMER_IV, timer_update);
+    apic_write_reg(
+      APIC_TIMER_LVT,
+      LVT_ENTRY_TIMER(isrm_ivexalloc(timer_update), LVT_TIMER_PERIODIC));

 
     apic_write_reg(APIC_TIMER_ICR, timer_ctx->tphz);
 
 
     apic_write_reg(APIC_TIMER_ICR, timer_ctx->tphz);
 


@@ -143,20 +154,20 @@ timer_init(uint32_t frequency)
 }
 
 struct lx_timer*
 }
 
 struct lx_timer*

-timer_run_second(uint32_t second,
+timer_run_second(u32_t second,

                  void (*callback)(void*),
                  void* payload,
                  void (*callback)(void*),
                  void* payload,

-                 uint8_t flags)
+                 u8_t flags)

 {
     return timer_run(
       second * timer_ctx->running_frequency, callback, payload, flags);
 }
 
 struct lx_timer*
 {
     return timer_run(
       second * timer_ctx->running_frequency, callback, payload, flags);
 }
 
 struct lx_timer*

-timer_run_ms(uint32_t millisecond,
+timer_run_ms(u32_t millisecond,

              void (*callback)(void*),
              void* payload,
              void (*callback)(void*),
              void* payload,

-             uint8_t flags)
+             u8_t flags)

 {
     return timer_run(timer_ctx->running_frequency / 1000 * millisecond,
                      callback,
 {
     return timer_run(timer_ctx->running_frequency / 1000 * millisecond,
                      callback,


@@ -165,7 +176,7 @@ timer_run_ms(uint32_t millisecond,
 }
 
 struct lx_timer*
 }
 
 struct lx_timer*

-timer_run(ticks_t ticks, void (*callback)(void*), void* payload, uint8_t flags)
+timer_run(ticks_t ticks, void (*callback)(void*), void* payload, u8_t flags)

 {
     struct lx_timer* timer = (struct lx_timer*)cake_grab(timer_pile);
 
 {
     struct lx_timer* timer = (struct lx_timer*)cake_grab(timer_pile);
 


@@ -236,5 +247,5 @@ temp_intr_routine_apic_timer(const isr_param* param)
 struct lx_timer_context*
 timer_context()
 {
 struct lx_timer_context*
 timer_context()
 {

-    return timer_ctx;
+    return (struct lx_timer_context*)timer_ctx;

 }
\ No newline at end of file
 }
\ No newline at end of file