:new: 引入APIC驱动，完成local apic的初始化

.vscode/settings.json

@@ -16,6 +16,8 @@
         "irq.h": "c",
         "multiboot2.h": "c",
         "kprint.h": "c",
-        "8259a.h": "c"
-    }
+        "8259a.h": "c",
+        "ptrace.h": "c"
+    },
+    "C_Cpp.errorSquiggles": "Enabled"
 }

kernel/Makefile

@@ -8,6 +8,11 @@ lib_patterns := *.a
 LIB_FILES := $(foreach DIR,$(DIR_LIB),$(addprefix $(DIR)/,$(lib_patterns)))
 
 CFLAGS := -mcmodel=large -fno-builtin -m64
+
+# 控制操作系统使用的中断控制器 _INTR_8259A_ _INTR_APIC_
+PIC := _INTR_APIC_
+CFLAGS += -D $(PIC)
+
 ASFLAGS := --64
 
 all: kernel
@@ -15,10 +20,10 @@ all: kernel
 # cp kernel ../bin/kernel/kernel.elf
 
 
-kernel: head.o entry.o main.o printk.o trap.o mm.o slab.o irq.o 8259A.o process.o syscall.o multiboot2.o cpu.o
+kernel: head.o entry.o main.o printk.o trap.o mm.o slab.o irq.o pic.o process.o syscall.o multiboot2.o cpu.o
 	ld -b elf64-x86-64 -z muldefs -o kernel head.o exception/entry.o main.o common/printk.o exception/trap.o exception/irq.o mm/mm.o mm/slab.o process/process.o syscall/syscall.o driver/multiboot2/multiboot2.o \
 	common/cpu.o	\
-	driver/interrupt/8259A/8259A.o	\
+	driver/interrupt/pic.o	\
 	-T link.lds
 
 head.o: head.S
@@ -60,15 +65,23 @@ process.o: process/process.c
 syscall.o: syscall/syscall.c
 	gcc $(CFLAGS) -c syscall/syscall.c -o syscall/syscall.o
 
-multiboot2.o: driver/multiboot2/multiboot2.c 
-	gcc $(CFLAGS) -c driver/multiboot2/multiboot2.c  -o driver/multiboot2/multiboot2.o
+
 
 cpu.o: common/cpu.c 
 	gcc $(CFLAGS) -c common/cpu.c -o common/cpu.o
 
-
 # 驱动程序
-8259A.o: driver/interrupt/8259A/8259A.c
-	gcc $(CFLAGS) -c driver/interrupt/8259A/8259A.c -o driver/interrupt/8259A/8259A.o
+# 中断处理芯片的驱动程序
+ifeq ($(PIC), _INTR_8259A_))
+pic.o: driver/interrupt/8259A/8259A.c
+	gcc $(CFLAGS) -c driver/interrupt/8259A/8259A.c -o driver/interrupt/pic.o
+else ifeq($(PIC), _INTR_APIC_)
+pic.o: driver/interrupt/apic/apic.c
+	gcc $(CFLAGS) -c driver/interrupt/apic/apic.c -o driver/interrupt/pic.o
+endif
+
+multiboot2.o: driver/multiboot2/multiboot2.c 
+	gcc $(CFLAGS) -c driver/multiboot2/multiboot2.c  -o driver/multiboot2/multiboot2.o
+
 clean: 
 	rm -rf $(GARBAGE)

kernel/common/glib.h

@@ -359,7 +359,7 @@ void wrmsr(ul address, ul value)
 
 /**
  * @brief 从msr寄存器组的address地址处读取值
- *
+ * rdmsr返回高32bits在edx，低32bits在eax
  * @param address 地址
  * @return ul address处的寄存器的值
  */

kernel/common/printk.c

@@ -34,14 +34,14 @@ int printk_init(const int char_size_x, const int char_size_y)
     pos.max_y = calculate_max_charNum(pos.height, char_size_y);
 
     // @todo:将来需要将帧缓冲区物理地址填写到这个地址的页表项中
-    VBE_FB_phys_addr = (ul *)info.framebuffer_addr;
+    VBE_FB_phys_addr = (ul)info.framebuffer_addr;
     pos.FB_address = (uint *)0x0000000003000000;
     pos.FB_length = pos.width * pos.height;
 
     // ======== 临时的将物理地址填写到0x0000000003000000处 之后会在mm内将帧缓存区重新映射=====
 
     global_CR3 = get_CR3();
-    ul fb_virt_addr = pos.FB_address;
+    ul fb_virt_addr = (ul)pos.FB_address;
     ul fb_phys_addr = VBE_FB_phys_addr;
 
     // 计算帧缓冲区的线性地址对应的pml4页表项的地址

kernel/driver/interrupt/8259A/8259A.c

@@ -1,7 +1,9 @@
 #include "8259A.h"
 #include "../../../common/printk.h"
 #include "../../../common/kprint.h"
+#include "../../../exception/gate.h"
 
+// 导出定义在irq.c中的中段门表
 extern void (*interrupt_table[24])(void);
 
 void init_8259A()
@@ -34,3 +36,31 @@ void init_8259A()
 
 }
 
+/**
+ * @brief 中断服务程序
+ * 
+ * @param rsp 中断栈指针
+ * @param number 中断号
+ */
+void do_IRQ(struct pt_regs *regs, ul number)
+{
+    unsigned char x;
+    switch (number)
+    {
+    case 0x20:  // 时钟中断信号
+        
+        break;
+    case 0x21:  // 键盘中断
+        
+        x = io_in8(0x60);
+        printk_color(ORANGE, BLACK, "Received key irq, key code:%#018lx\n", x);
+        break;
+    default:
+        break;
+    }
+    if(number!=0x20)
+    printk_color(ORANGE, BLACK, "Received irq:%#018x\n", number);
+
+    // 向主芯片发送中断结束信号
+    io_out8(PIC_master, PIC_EOI);
+}

kernel/driver/interrupt/8259A/8259A.h

@@ -12,6 +12,7 @@
 #pragma once
 
 #include "../../../common/glib.h"
+#include "../../../exception/irq.h"
 
 #define PIC_EOI		0x20
 #define PIC_master		0x20		/* IO base address for master PIC */
@@ -20,6 +21,13 @@
 // 初始化8259A芯片的中断服务
 void init_8259A();
 
+/**
+ * @brief 中断服务程序
+ * 
+ * @param rsp 中断栈指针
+ * @param number 中断号
+ */
+void do_IRQ(struct pt_regs* rsp, ul number);
 
 
 

kernel/driver/interrupt/apic/apic.c

@@ -0,0 +1,200 @@
+#include "apic.h"
+#include "../../../common/kprint.h"
+#include "../../../common/printk.h"
+#include "../../../common/cpu.h"
+#include "../../../common/glib.h"
+#include "../../../exception/gate.h"
+
+// 导出定义在irq.c中的中段门表
+extern void (*interrupt_table[24])(void);
+
+bool flag_support_apic = false;
+bool flag_support_x2apic = false;
+uint local_apic_version;
+uint local_apic_max_LVT_entries;
+
+/**
+ * @brief 初始化io_apic
+ *
+ */
+void apic_io_apic_init()
+{
+    // 初始化中断门， 中断使用第二个ist
+    for (int i = 32; i <= 55; ++i)
+        set_intr_gate(i, 2, interrupt_table[i - 32]);
+
+    // 屏蔽类8259A芯片
+    io_out8(0x21, 0xff);
+    io_out8(0xa1, 0xff);
+    kdebug("8259A Masked.");
+
+    apic_local_apic_init();
+    sti();
+}
+
+/**
+ * @brief 初始化local apic
+ *
+ */
+void apic_local_apic_init()
+{
+    uint a, b, c, d;
+
+    cpu_cpuid(1, 0, &a, &b, &c, &d);
+
+    kdebug("CPUID 0x01, eax:%#010lx, ebx:%#010lx, ecx:%#010lx, edx:%#010lx", a, b, c, d);
+
+    // 判断是否支持APIC和xAPIC
+    if ((1 << 9) & d)
+    {
+        flag_support_apic = true;
+        kdebug("This computer support APIC&xAPIC");
+    }
+    else
+    {
+        flag_support_apic = false;
+        kerror("This computer does not support APIC&xAPIC");
+        while (1)
+            ;
+    }
+
+    // 判断是否支持x2APIC
+    if ((1 << 21) & c)
+    {
+        flag_support_x2apic = true;
+        kdebug("This computer support x2APIC");
+    }
+    else
+    {
+        kerror("This computer does not support x2APIC");
+    }
+
+    uint eax, edx;
+    // 启用xAPIC 和x2APIC
+    __asm__ __volatile__("movq  $0x1b, %%rcx   \n\t" // 读取IA32_APIC_BASE寄存器
+                         "rdmsr  \n\t"
+                         "bts $10,   %%rax  \n\t"
+                         "bts $11,   %%rax   \n\t"
+                         "wrmsr  \n\t"
+                         "movq $0x1b,    %%rcx   \n\t"
+                         "rdmsr  \n\t"
+                         : "=a"(eax), "=d"(edx)::"memory");
+
+    kdebug("After enable xAPIC and x2APIC: edx=%#010x, eax=%#010x", edx, eax);
+
+    // 检测是否成功启用xAPIC和x2APIC
+    if (eax & 0xc00)
+        kinfo("xAPIC & x2APIC enabled!");
+
+    // 设置SVR寄存器，开启local APIC、禁止EOI广播
+
+    __asm__ __volatile__("movq 0x80f, %%rcx    \n\t"
+                         "rdmsr  \n\t"
+                         "bts $8, %%rax  \n\t"
+                         "bts $12, %%rax \n\t"
+                         "movq 0x80f, %%rcx    \n\t"
+                         "wrmsr  \n\t"
+                         "movq $0x80f , %%rcx   \n\t"
+                         "rdmsr \n\t"
+                         : "=a"(eax), "=d"(edx)::"memory", "rcx");
+
+    /*
+   //enable SVR[8]
+    __asm__ __volatile__(	"movq 	$0x80f,	%%rcx	\n\t"
+                "rdmsr	\n\t"
+                "bts	$8,	%%rax	\n\t"
+                "bts	$12,%%rax\n\t"
+                "wrmsr	\n\t"
+                "movq 	$0x80f,	%%rcx	\n\t"
+                "rdmsr	\n\t"
+                :"=a"(eax),"=d"(edx)
+                :
+                :"memory");
+                */
+    kdebug("After setting SVR: edx=%#010x, eax=%#010x", edx, eax);
+
+    if (eax & 0x100)
+        kinfo("APIC Software Enabled.");
+    if (eax & 0x1000)
+        kinfo("EOI-Broadcast Suppression Enabled.");
+
+    // 获取Local APIC的基础信息 （参见英特尔开发手册Vol3A 10-39）
+    //                          Table 10-6. Local APIC Register Address Map Supported by x2APIC
+    // 获取 Local APIC ID
+    // 0x802处是x2APIC ID 位宽32bits 的 Local APIC ID register
+    __asm__ __volatile__("movq $0x802, %%rcx    \n\t"
+                         "rdmsr  \n\t"
+                         : "=a"(eax), "=d"(edx)::"memory");
+
+    kdebug("get Local APIC ID: edx=%#010x, eax=%#010x", edx, eax);
+
+    // 获取Local APIC Version
+    // 0x803处是 Local APIC Version register
+    __asm__ __volatile__("movq $0x803, %%rcx    \n\t"
+                         "rdmsr  \n\t"
+                         : "=a"(eax), "=d"(edx)::"memory");
+
+    local_apic_max_LVT_entries = ((eax >> 16) & 0xff) + 1;
+    local_apic_version = eax & 0xff;
+
+    kdebug("local APIC Version:%#010x,Max LVT Entry:%#010x,SVR(Suppress EOI Broadcast):%#04x\t", local_apic_version, local_apic_max_LVT_entries, (eax >> 24) & 0x1);
+
+    if ((eax & 0xff) < 0x10)
+    {
+        kdebug("82489DX discrete APIC");
+    }
+    else if (((eax & 0xff) >= 0x10) && ((eax & 0xff) <= 0x15))
+        kdebug("Integrated APIC.");
+
+    // 由于尚未配置LVT对应的处理程序，因此先屏蔽所有的LVT
+
+    __asm__ __volatile__(
+        "movq 	$0x82f,	%%rcx	\n\t" // CMCI
+        "wrmsr	\n\t"
+        "movq 	$0x832,	%%rcx	\n\t" // Timer
+        "wrmsr	\n\t"
+        "movq 	$0x833,	%%rcx	\n\t" // Thermal Monitor
+        "wrmsr	\n\t"
+        "movq 	$0x834,	%%rcx	\n\t" // Performance Counter
+        "wrmsr	\n\t"
+        "movq 	$0x835,	%%rcx	\n\t" // LINT0
+        "wrmsr	\n\t"
+        "movq 	$0x836,	%%rcx	\n\t" // LINT1
+        "wrmsr	\n\t"
+        "movq 	$0x837,	%%rcx	\n\t" // Error
+        "wrmsr	\n\t"
+        :
+        : "a"(0x10000), "d"(0x00)
+        : "memory");
+    kdebug("All LVT Masked");
+
+    // 获取TPR寄存器的值
+    __asm__ __volatile__("movq $0x808, %%rcx    \n\t"
+                         "rdmsr  \n\t"
+                         : "=a"(eax), "=d"(edx)::"memory");
+    kdebug("LVT_TPR=%#010x", eax);
+
+    // 获取PPR寄存器的值
+    __asm__ __volatile__("movq $0x80a, %%rcx    \n\t"
+                         "rdmsr  \n\t"
+                         : "=a"(eax), "=d"(edx)::"memory");
+    kdebug("LVT_PPR=%#010x", eax);
+}
+
+/**
+ * @brief 初始化apic控制器
+ *
+ */
+void apic_init()
+{
+    apic_io_apic_init();
+}
+/**
+ * @brief 中断服务程序
+ *
+ * @param rsp 中断栈指针
+ * @param number 中断号
+ */
+void do_IRQ(struct pt_regs *rsp, ul number)
+{
+}

kernel/driver/interrupt/apic/apic.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include "../../../common/asm.h"
+#include"../../../process/ptrace.h"
+#include"../../../exception/irq.h"
+
+/**
+ * @brief 中断服务程序
+ * 
+ * @param rsp 中断栈指针
+ * @param number 中断号
+ */
+void do_IRQ(struct pt_regs* rsp, ul number);
+
+/**
+ * @brief 初始化apic控制器
+ * 
+ */
+void apic_init();

kernel/exception/irq.c

@@ -1,11 +1,18 @@
 #include "irq.h"
+
+// 对进行
+#if _INTR_8259A_
 #include "../driver/interrupt/8259A/8259A.h"
+#else
+#include "../driver/interrupt/apic/apic.h"
+#endif
+
 #include "../common/asm.h"
-#include"../common/printk.h"
+#include "../common/printk.h"
 #include "gate.h"
 
 // 保存函数调用现场的寄存器
-#define SAVE_ALL_REGS      \
+#define SAVE_ALL_REGS       \
     "cld; \n\t"             \
     "pushq %rax;    \n\t"   \
     "pushq %rax;     \n\t"  \
@@ -32,7 +39,6 @@
     "movq %rdx, %ds; \n\t"  \
     "movq %rdx, %es; \n\t"
 
-
 // 定义IRQ处理函数的名字格式：IRQ+中断号+interrupt
 #define IRQ_NAME2(name1) name1##interrupt(void)
 #define IRQ_NAME(number) IRQ_NAME2(IRQ##number)
@@ -42,107 +48,77 @@
 
 #define Build_IRQ(number)                                                     \
     void IRQ_NAME(number);                                                    \
-    __asm__ (SYMBOL_NAME_STR(IRQ)#number"interrupt:   \n\t"                 \
-                                         "pushq $0x00 \n\t" \
-                                         SAVE_ALL_REGS     \
+    __asm__(SYMBOL_NAME_STR(IRQ) #number "interrupt:   \n\t"                  \
+                                         "pushq $0x00 \n\t" SAVE_ALL_REGS     \
                                          "movq %rsp, %rdi\n\t"                \
                                          "leaq ret_from_intr(%rip), %rax\n\t" \
                                          "pushq %rax \n\t"                    \
-                                         "movq	$"#number",	%rsi			\n\t"	\
+                                         "movq	$" #number ",	%rsi			\n\t"    \
                                          "jmp do_IRQ\n\t");
-                                         
-
 
 // 构造中断入口
-Build_IRQ(0x20)
-Build_IRQ(0x21)
-Build_IRQ(0x22)
-Build_IRQ(0x23)
-Build_IRQ(0x24)
-Build_IRQ(0x25)
-Build_IRQ(0x26)
-Build_IRQ(0x27)
-Build_IRQ(0x28)
-Build_IRQ(0x29)
-Build_IRQ(0x2a)
-Build_IRQ(0x2b)
-Build_IRQ(0x2c)
-Build_IRQ(0x2d)
-Build_IRQ(0x2e)
-Build_IRQ(0x2f)
-Build_IRQ(0x30)
-Build_IRQ(0x31)
-Build_IRQ(0x32)
-Build_IRQ(0x33)
-Build_IRQ(0x34)
-Build_IRQ(0x35)
-Build_IRQ(0x36)
-Build_IRQ(0x37)
+Build_IRQ(0x20);
+Build_IRQ(0x21);
+Build_IRQ(0x22);
+Build_IRQ(0x23);
+Build_IRQ(0x24);
+Build_IRQ(0x25);
+Build_IRQ(0x26);
+Build_IRQ(0x27);
+Build_IRQ(0x28);
+Build_IRQ(0x29);
+Build_IRQ(0x2a);
+Build_IRQ(0x2b);
+Build_IRQ(0x2c);
+Build_IRQ(0x2d);
+Build_IRQ(0x2e);
+Build_IRQ(0x2f);
+Build_IRQ(0x30);
+Build_IRQ(0x31);
+Build_IRQ(0x32);
+Build_IRQ(0x33);
+Build_IRQ(0x34);
+Build_IRQ(0x35);
+Build_IRQ(0x36);
+Build_IRQ(0x37);
 
 // 初始化中断数组
-void (*interrupt_table[24])(void)=
-{
-    IRQ0x20interrupt,
-    IRQ0x21interrupt,
-    IRQ0x22interrupt,
-    IRQ0x23interrupt,
-    IRQ0x24interrupt,
-    IRQ0x25interrupt,
-    IRQ0x26interrupt,
-    IRQ0x27interrupt,
-    IRQ0x28interrupt,
-    IRQ0x29interrupt,
-    IRQ0x2ainterrupt,
-    IRQ0x2binterrupt,
-    IRQ0x2cinterrupt,
-    IRQ0x2dinterrupt,
-    IRQ0x2einterrupt,
-    IRQ0x2finterrupt,
-    IRQ0x30interrupt,
-    IRQ0x31interrupt,
-    IRQ0x32interrupt,
-    IRQ0x33interrupt,
-    IRQ0x34interrupt,
-    IRQ0x35interrupt,
-    IRQ0x36interrupt,
-    IRQ0x37interrupt,
+void (*interrupt_table[24])(void) =
+    {
+        IRQ0x20interrupt,
+        IRQ0x21interrupt,
+        IRQ0x22interrupt,
+        IRQ0x23interrupt,
+        IRQ0x24interrupt,
+        IRQ0x25interrupt,
+        IRQ0x26interrupt,
+        IRQ0x27interrupt,
+        IRQ0x28interrupt,
+        IRQ0x29interrupt,
+        IRQ0x2ainterrupt,
+        IRQ0x2binterrupt,
+        IRQ0x2cinterrupt,
+        IRQ0x2dinterrupt,
+        IRQ0x2einterrupt,
+        IRQ0x2finterrupt,
+        IRQ0x30interrupt,
+        IRQ0x31interrupt,
+        IRQ0x32interrupt,
+        IRQ0x33interrupt,
+        IRQ0x34interrupt,
+        IRQ0x35interrupt,
+        IRQ0x36interrupt,
+        IRQ0x37interrupt,
 };
 
-
 /**
  * @brief 初始化中断模块
  */
 void irq_init()
 {
+#if _INTR_8259A_
     init_8259A();
+#else
+    apic_init();
+#endif
 }
-
-
-/**
- * @brief 中断服务程序
- * 
- * @param rsp 中断栈指针
- * @param number 中断号
- */
-void do_IRQ(struct pt_regs *regs, ul number)
-{
-    unsigned char x;
-    switch (number)
-    {
-    case 0x20:  // 时钟中断信号
-        
-        break;
-    case 0x21:  // 键盘中断
-        
-        x = io_in8(0x60);
-        printk_color(ORANGE, BLACK, "Received key irq, key code:%#018lx\n", x);
-        break;
-    default:
-        break;
-    }
-    if(number!=0x20)
-    printk_color(ORANGE, BLACK, "Received irq:%#018x\n", number);
-
-    // 向主芯片发送中断结束信号
-    io_out8(PIC_master, PIC_EOI);
-}

kernel/exception/irq.h

@@ -21,10 +21,3 @@
 void irq_init();
 
 
-/**
- * @brief 中断服务程序
- * 
- * @param rsp 中断栈指针
- * @param number 中断号
- */
-void do_IRQ(struct pt_regs* rsp, ul number);