From a879bada0aaeb13ae9c1058a01a31666470ba9b7 Mon Sep 17 00:00:00 2001 From: fslongjin Date: Sun, 13 Mar 2022 12:53:32 +0800 Subject: [PATCH] =?UTF-8?q?:new:=20=E4=BB=8Emultiboot2=E8=8E=B7=E5=8F=96RS?= =?UTF-8?q?DT=E7=BB=93=E6=9E=84=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/driver/acpi/acpi.c | 51 +++++++++++++++++++++------ kernel/driver/acpi/acpi.h | 2 ++ kernel/driver/multiboot2/multiboot2.c | 5 +-- kernel/driver/multiboot2/multiboot2.h | 19 +++++----- kernel/main.c | 2 +- kernel/mm/mm.c | 46 ++++++++++++++++++++++++ kernel/mm/mm.h | 13 +++++-- 7 files changed, 115 insertions(+), 23 deletions(-) diff --git a/kernel/driver/acpi/acpi.c b/kernel/driver/acpi/acpi.c index 3a43a7de..f4f7dbbd 100644 --- a/kernel/driver/acpi/acpi.c +++ b/kernel/driver/acpi/acpi.c @@ -2,33 +2,64 @@ #include "../../common/printk.h" #include "../../common/kprint.h" #include "../multiboot2/multiboot2.h" +#include "../../mm/mm.h" -static struct acpi_RSDP_t *rsdp; +static struct acpi_RSDP_t *rsdpv1; +static struct acpi_RSDP_2_t *rsdpv2; +static struct acpi_RSDT_Structure_t *rsdt; + +static ul acpi_RSDT_offset = 0; +static uint acpi_RSDT_Entry_num = 0; /** * @brief 迭代器，用于迭代描述符头（位于ACPI标准文件的Table 5-29） * @param _fun 迭代操作调用的函数 * @param _data 数据 */ void acpi_iter_SDT(bool (*_fun)(const struct acpi_iter_SDT_header_t *, void *), - void *_data) + void *_data) { - } /** * @brief 初始化acpi模块 - * + * */ void acpi_init() { kinfo("Initializing ACPI..."); - struct multiboot_tag_old_acpi_t* tmp1; + + // 获取rsdp + struct multiboot_tag_old_acpi_t tmp1; + int reserved; - kdebug("yyyy"); - multiboot2_iter(multiboot2_get_acpi_old_RSDP, tmp1, &reserved); - kdebug("1"); - *rsdp = *(struct acpi_RSDP_t*)(tmp1->rsdp); + multiboot2_iter(multiboot2_get_acpi_old_RSDP, &tmp1, &reserved); - kdebug("RsdtAddress=%#018lx", rsdp->RsdtAddress); + *rsdpv1 = (tmp1.rsdp); + + kdebug("Rsdt_phys_Address=%#018lx", rsdpv1->RsdtAddress); + kdebug("RSDP_Revision=%d", rsdpv1->Revision); + + // 映射RSDT区域的物理地址到页表 + // 暂定字节数为2MB + // 由于页表映射的原因，需要清除低21位地址，才能填入页表 + ul base = rsdpv1->RsdtAddress & (~(0x1fffff)); + acpi_RSDT_offset = rsdpv1->RsdtAddress - base; + mm_map_phys_addr(ACPI_RSDT_VIRT_ADDR_BASE, base, PAGE_2M_SIZE, PAGE_KERNEL_PAGE | PAGE_PWT | PAGE_PCD); + kdebug("RSDT mapped!"); + + struct multiboot_tag_new_acpi_t tmp2; + multiboot2_iter(multiboot2_get_acpi_new_RSDP, &tmp2, &reserved); + *rsdpv2 = tmp2.rsdp; + kdebug("Rsdt_v2_phys_Address=%#018lx", rsdpv2->rsdp1.RsdtAddress); + kdebug("RSDP_v2_Revision=%d", rsdpv2->rsdp1.Revision); + + rsdt = ACPI_RSDT_VIRT_ADDR_BASE + acpi_RSDT_offset; + + // 计算RSDT Entry的数量 + acpi_RSDT_Entry_num = (rsdt->header.Length - 32) / 4; + + printk_color(ORANGE, BLACK, "%s\n", rsdt->header.Signature); + printk_color(ORANGE, BLACK, "RSDT Length=%dbytes.\n", rsdt->header.Length); + printk_color(ORANGE, BLACK, "RSDT Entry num=%d\n", acpi_RSDT_Entry_num); } \ No newline at end of file diff --git a/kernel/driver/acpi/acpi.h b/kernel/driver/acpi/acpi.h index 335add7d..3e545065 100644 --- a/kernel/driver/acpi/acpi.h +++ b/kernel/driver/acpi/acpi.h @@ -25,6 +25,8 @@ // 0x10-0x7f Reserved. OSPM skips structures of the reserved type. // 0x80-0xff Reserved for OEM use +#define ACPI_RSDT_VIRT_ADDR_BASE 0xffff80000a000000UL + struct acpi_RSDP_t { unsigned char Signature[8]; diff --git a/kernel/driver/multiboot2/multiboot2.c b/kernel/driver/multiboot2/multiboot2.c index df679e99..969ea123 100644 --- a/kernel/driver/multiboot2/multiboot2.c +++ b/kernel/driver/multiboot2/multiboot2.c @@ -2,7 +2,7 @@ #include "assert.h" #include "../../common/glib.h" -#include"../../common/kprint.h" +#include "../../common/kprint.h" uintptr_t boot_info_addr; unsigned int multiboot2_magic; unsigned int boot_info_size; @@ -115,8 +115,9 @@ bool multiboot2_get_acpi_old_RSDP(const struct iter_data_t *_iter_data, void *da { if (_iter_data->type != MULTIBOOT_TAG_TYPE_ACPI_OLD) return false; - kdebug("xxx=%#018lx",((struct multiboot_tag_old_acpi_t *)_iter_data)->rsdp); + *(struct multiboot_tag_old_acpi_t *)data = *(struct multiboot_tag_old_acpi_t *)_iter_data; + return true; } diff --git a/kernel/driver/multiboot2/multiboot2.h b/kernel/driver/multiboot2/multiboot2.h index f33498c1..776724ea 100644 --- a/kernel/driver/multiboot2/multiboot2.h +++ b/kernel/driver/multiboot2/multiboot2.h @@ -8,6 +8,7 @@ #include "stdint.h" #include "stdbool.h" #include "../../common/boot_info.h" +#include "../acpi/acpi.h" /// @see Multiboot2 Specification version 2.0.pdf // 启动后，在 32 位内核进入点，机器状态如下： @@ -358,13 +359,15 @@ struct multiboot_tag_smbios_t struct multiboot_tag_old_acpi_t { struct multiboot_tag_t tag_t; - uint8_t rsdp[0]; + //uint8_t rsdp[0]; + struct acpi_RSDP_t rsdp; }; struct multiboot_tag_new_acpi_t { struct multiboot_tag_t tag_t; - uint8_t rsdp[0]; + //uint8_t rsdp[0]; + struct acpi_RSDP_2_t rsdp; }; struct multiboot_tag_network_t @@ -420,7 +423,7 @@ static bool multiboot2_init(void); * @param _data 数据 */ void multiboot2_iter(bool (*_fun)(const struct iter_data_t *, void *, unsigned int *), - void *_data, unsigned int *count); + void *_data, unsigned int *count); /** * @brief 获取multiboot2协议提供的内存区域信息 @@ -451,20 +454,20 @@ bool multiboot2_get_Framebuffer_info(const struct iter_data_t *_iter_data, void /** * @brief 获取acpi旧版RSDP - * + * * @param _iter_data 要被迭代的信息的结构体 * @param _data old RSDP的结构体指针 - * @param reserved - * @return uint8_t* + * @param reserved + * @return uint8_t* */ bool multiboot2_get_acpi_old_RSDP(const struct iter_data_t *_iter_data, void *data, unsigned int *reserved); /** * @brief 获取acpi新版RSDP - * + * * @param _iter_data 要被迭代的信息的结构体 * @param _data old RSDP的结构体指针 - * @param reserved + * @param reserved * @return uint8_t* struct multiboot_tag_old_acpi_t */ bool multiboot2_get_acpi_new_RSDP(const struct iter_data_t *_iter_data, void *data, unsigned int *reserved); \ No newline at end of file diff --git a/kernel/main.c b/kernel/main.c index 3d106518..f246f235 100644 --- a/kernel/main.c +++ b/kernel/main.c @@ -152,6 +152,7 @@ void system_initialize() // 初始化内存管理单元 mm_init(); + acpi_init(); // 初始化中断模块 irq_init(); @@ -160,7 +161,6 @@ void system_initialize() cpu_init(); - acpi_init(); // test_slab(); // test_mm(); diff --git a/kernel/mm/mm.c b/kernel/mm/mm.c index 6cbaed7a..2b7d4bc5 100644 --- a/kernel/mm/mm.c +++ b/kernel/mm/mm.c @@ -526,4 +526,50 @@ void init_frame_buffer() set_pos_VBE_FB_addr((uint*)fb_virt_addr); flush_tlb(); kinfo("VBE frame buffer successfully Re-mapped!"); +} + + +/** + * @brief 将物理地址映射到页表的函数 + * + * @param virt_addr_start 要映射到的虚拟地址的起始位置 + * @param phys_addr_start 物理地址的起始位置 + * @param length 要映射的区域的长度（字节） + */ +void mm_map_phys_addr(ul virt_addr_start, ul phys_addr_start, ul length, ul flags) +{ + global_CR3 = get_CR3(); + + // 计算帧缓冲区的线性地址对应的pml4页表项的地址 + ul *tmp = phys_2_virt((ul *)((ul)global_CR3 & (~0xfffUL)) + ((virt_addr_start >> PAGE_GDT_SHIFT) & 0x1ff)); + if (*tmp == 0) + { + ul *virt_addr = kmalloc(PAGE_4K_SIZE, 0); + set_pml4t(tmp, mk_pml4t(virt_2_phys(virt_addr), PAGE_KERNEL_PGT)); + } + + tmp = phys_2_virt((ul *)(*tmp & (~0xfffUL)) + ((virt_addr_start >> PAGE_1G_SHIFT) & 0x1ff)); + + if (*tmp == 0) + { + ul *virt_addr = kmalloc(PAGE_4K_SIZE, 0); + set_pdpt(tmp, mk_pdpt(virt_2_phys(virt_addr), PAGE_KERNEL_DIR)); + } + + ul *tmp1; + // 初始化2M物理页 + int js = 0; + for (ul i = 0; i < (length); i += PAGE_2M_SIZE) + { + // 计算当前2M物理页对应的pdt的页表项的物理地址 + tmp1 = phys_2_virt((ul *)(*tmp & (~0xfffUL)) + (((ul)(virt_addr_start + i) >> PAGE_2M_SHIFT) & 0x1ff)); + + // 页面写穿，禁止缓存 + set_pdt(tmp1, mk_pdt((ul)phys_addr_start+i, flags)); + ++js; + } + kdebug("js=%d", js); + + + flush_tlb(); } \ No newline at end of file diff --git a/kernel/mm/mm.h b/kernel/mm/mm.h index a6267bf1..dd189f86 100644 --- a/kernel/mm/mm.h +++ b/kernel/mm/mm.h @@ -339,6 +339,15 @@ void page_table_init(); /** * @brief VBE帧缓存区的地址重新映射 - * 将帧缓存区映射到地址0xffff800003000000处 + * 将帧缓存区映射到地址0xffff800008000000处 */ -void init_frame_buffer(); \ No newline at end of file +void init_frame_buffer(); + +/** + * @brief 将物理地址映射到页表的函数 + * + * @param virt_addr_start 要映射到的虚拟地址的起始位置 + * @param phys_addr_start 物理地址的起始位置 + * @param length 要映射的区域的长度（字节） + */ +void mm_map_phys_addr(ul virt_addr_start, ul phys_addr_start, ul length, ul flags); \ No newline at end of file