Organized timer code. Started to work on HPET.

Author: pbalduino

include/kernel/apic.h

@@ -21,8 +21,22 @@
 #define LAPIC_TIMER_CURR    0x390
 #define LAPIC_TIMER_LVT     0x320
 
+#define DEFAULT_LAPIC_ADDRESS 0xfee00000
+
+#define DIV_BY_2    0x00
+#define DIV_BY_4    0x01
+#define DIV_BY_8    0x02
+#define DIV_BY_16   0x03
+#define DIV_BY_32   0x08
+#define DIV_BY_64   0x09
+#define DIV_BY_128  0x0a
+#define DIV_BY_1    0x0b
+
 void apic_init();
+void lapic_timer_init();
+void timer_frequency(uint32_t freq);
 void write_lapic(uintptr_t reg, uint32_t value);
+
 uint32_t read_lapic(uintptr_t reg);
 
 #endif

include/kernel/hpet.h

@@ -0,0 +1,44 @@
+#ifndef MENIOS_INCLUDE_KERNEL_HPET_H
+#define MENIOS_INCLUDE_KERNEL_HPET_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <types.h>
+
+#define HPET_BASE_ADDRESS 0xF1000000
+#define HPET_REG_CAPABILITIES 0x00
+#define HPET_REG_CONFIGURATION 0x10
+#define HPET_REG_INTERRUPT_STATUS 0x20
+#define HPET_REG_MAIN_COUNTER 0xF0
+#define HPET_REG_TIMER0_CONFIG 0x100
+#define HPET_REG_TIMER0_COMPARATOR 0x108
+#define HPET_REG_TIMER0_COUNTER 0x110
+#define HPET_REG_TIMER1_CONFIG 0x120
+#define HPET_REG_TIMER1_COMPARATOR 0x128
+#define HPET_REG_TIMER1_COUNTER 0x130
+#define HPET_REG_TIMER2_CONFIG 0x140
+#define HPET_REG_TIMER2_COMPARATOR 0x148
+#define HPET_REG_TIMER2_COUNTER 0x150
+#define HPET_REG_TIMER3_CONFIG 0x160
+#define HPET_REG_TIMER3_COMPARATOR 0x168
+#define HPET_REG_TIMER3_COUNTER 0x170
+#define HPET_REG_TIMER4_CONFIG 0x180
+#define HPET_REG_TIMER4_COMPARATOR 0x188
+#define HPET_REG_TIMER4_COUNTER 0x190
+#define HPET_REG_TIMER5_CONFIG 0x1A0
+#define HPET_REG_TIMER5_COMPARATOR 0x1A8
+#define HPET_REG_TIMER5_COUNTER 0x1B0
+
+#define HPET_OK 0
+#define HPET_ERROR -1
+typedef int hpet_status_t;
+
+hpet_status_t hpet_timer_init();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //MENIOS_INCLUDE_KERNEL_HPET_H

include/kernel/pmm.h

@@ -1,7 +1,7 @@
 #ifndef MENIOS_INCLUDE_KERNEL_PMM_H
 #define MENIOS_INCLUDE_KERNEL_PMM_H
 
-#include <stdint.h>
+#include <types.h>
 
 // good enough for 16GB - it can be increased later
 #define PAGE_BITMAP_SIZE 0x10000
@@ -16,6 +16,15 @@
 
 #define VADDR_UNUSED (0xffff000000000000)
 
+typedef struct {
+  uint64_t error_code;       // Error code pushed by the CPU
+  uint64_t rip;              // Instruction pointer at the time of the fault
+  uint64_t cs;               // Code segment at the time of the fault
+  uint64_t rflags;           // Flags register at the time of the fault
+  uint64_t rsp;              // Stack pointer at the time of the fault
+  uint64_t faulting_address; // The address that caused the page fault (from CR2)
+} page_fault_info_t;
+
 // Page Map Level 4 (PML4) Entry
 typedef struct {
   uint64_t present:              1; // Page present in memory
@@ -113,17 +122,17 @@ uintptr_t read_cr3();
 
 void debug_heap();
 void pmm_init();
-void write_cr3(uint64_t value);
+void write_cr3(phys_addr_t value);
 
 uint64_t get_first_free_page();
 
-void pml4_map(uintptr_t vaddr, pml4_map_t* map);
+void pml4_map(virt_addr_t vaddr, pml4_map_t* map);
 
-uintptr_t get_first_free_virtual_address(uintptr_t offset);
+virt_addr_t get_first_free_virtual_address(virt_addr_t offset);
 
-uintptr_t physical_to_virtual(uintptr_t physical_address);
-uintptr_t virtual_to_physical(uintptr_t virtual_to_physical);
+virt_addr_t physical_to_virtual(phys_addr_t physical_address);
+phys_addr_t virtual_to_physical(virt_addr_t virtual_address);
 
-void set_page_used(uintptr_t physical_address);
+void set_page_used(phys_addr_t physical_address);
 
 #endif

include/kernel/rtc.h

@@ -10,6 +10,16 @@ extern "C" {
 #define RTC_INDEX_PORT 0x70
 #define RTC_DATA_PORT  0x71
 
+#define RTC_SECONDS    0x00
+#define RTC_MINUTES    0x02
+#define RTC_HOURS      0x04
+#define RTC_DAY        0x07
+#define RTC_MONTH      0x08
+#define RTC_YEAR       0x09
+#define RTC_CENTURY    0x32
+#define RTC_REGISTER_B 0x0b
+#define RTC_WEEKDAY    0x06
+
 typedef struct rtc_time_t {
   uint8_t seconds;
   uint8_t minutes;

include/kernel/timer.h

@@ -7,16 +7,8 @@ extern "C" {
 
 #include <types.h>
 
-#define DIV_BY_2    0x00
-#define DIV_BY_4    0x01
-#define DIV_BY_8    0x02
-#define DIV_BY_16   0x03
-#define DIV_BY_32   0x08
-#define DIV_BY_64   0x09
-#define DIV_BY_128  0x0a
-#define DIV_BY_1    0x0b
-
 void timer_init();
+void timer_eoi();
 
 uint64_t unix_time();
 

include/types.h

@@ -23,6 +23,9 @@ typedef long long off_t;
 	(typeof(a)) (ROUNDDOWN((uint32_t) (a) + __n - 1, __n));	\
 })
 
+typedef uintptr_t phys_addr_t;
+typedef uintptr_t virt_addr_t;
+
 #ifdef __cplusplus
 }
 #endif

src/kernel/mem/mem.c

@@ -10,9 +10,9 @@
 uint8_t arena[PAGE_SIZE * HEAP_SIZE];
 
 void mem_init() {
-    serial_puts("\n- Initing memory management:\n");
-    // init the physical memory management
-    pmm_init();
+  serial_puts("\n- Initing memory management:\n");
+  // init the physical memory management
+  pmm_init();
 
-    init_heap((void*)arena, PAGE_SIZE * HEAP_SIZE);
+  init_heap((void*)arena, PAGE_SIZE * HEAP_SIZE);
 }

src/kernel/timer/hpet.c

@@ -0,0 +1,5 @@
+#include <kernel/hpet.h>
+
+hpet_status_t hpet_timer_init() {
+  return HPET_ERROR;
+}

src/kernel/timer/lapic.c

@@ -0,0 +1,26 @@
+#include <kernel/apic.h>
+#include <kernel/pmm.h>
+#include <kernel/serial.h>
+
+static uintptr_t addr;
+
+static uint64_t timer_freq = 126582;
+
+void lapic_timer_init() {
+  addr = physical_to_virtual(DEFAULT_LAPIC_ADDRESS);
+  serial_printf("lapic address: %lx - virt: %lx\n", DEFAULT_LAPIC_ADDRESS, addr);
+  write_lapic(addr + LAPIC_SVR, read_lapic(addr + LAPIC_SVR) | 0x100);
+  write_lapic(addr + LAPIC_TIMER_DIV, DIV_BY_128);
+  timer_frequency(timer_freq);
+  write_lapic(addr + LAPIC_TIMER_LVT, 0x20020);
+}
+
+void timer_frequency(uint32_t freq) {
+  timer_freq = freq;
+  serial_printf("timer frequency: %d\n", timer_freq);
+  write_lapic(addr + LAPIC_TIMER_INIT, timer_freq);
+}
+
+void timer_eoi() {
+  write_lapic(addr + LAPIC_EOI, 0);  // End Of Interrupt (EOI) to acknowledge
+}

src/kernel/rtc.c src/kernel/timer/rtc.csrc/kernel/rtc.c renamed to src/kernel/timer/rtc.c

@@ -10,22 +10,22 @@ uint8_t rtc_read(uint8_t reg) {
 }
 
 uint8_t bcd_to_binary(uint8_t bcd) {
-  return (bcd >> 4) * 10 + (bcd & 0x0F);
+  return (bcd >> 4) * 10 + (bcd & 0x0f);
 }
 
 void rtc_time(rtc_time_t* time) {
   time->register_b = rtc_read(0x0b);
 
   bool bcd = !(time->register_b & 0x04);
 
-  uint8_t seconds = rtc_read(0x00); // Read seconds
-  uint8_t minutes = rtc_read(0x02); // Read minutes
-  uint8_t weekday = rtc_read(0x06);
-  uint8_t hours = rtc_read(0x04);   // Read hours
-  uint8_t day = rtc_read(0x07);     // Read day of the month
-  uint8_t month = rtc_read(0x08);   // Read month
-  uint8_t year = rtc_read(0x09);    // Read year (offset from 1900)
-  uint8_t century = rtc_read(0x32);
+  uint8_t seconds = rtc_read(RTC_SECONDS);
+  uint8_t minutes = rtc_read(RTC_MINUTES);
+  uint8_t weekday = rtc_read(RTC_WEEKDAY);
+  uint8_t hours   = rtc_read(RTC_HOURS);
+  uint8_t day     = rtc_read(RTC_DAY);
+  uint8_t month   = rtc_read(RTC_MONTH);
+  uint8_t year    = rtc_read(RTC_YEAR);
+  uint8_t century = rtc_read(RTC_CENTURY);
 
   time->seconds = bcd ? bcd_to_binary(seconds) : seconds;
   time->minutes = bcd ? bcd_to_binary(minutes) : minutes;