From 2dbf529c33aa3e24beff944758d586bb0608c1be Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Tue, 15 Apr 2025 22:20:59 -0400 Subject: expand memory manager work with userspace (more then one ctx) --- kernel/drivers/acpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kernel/drivers/acpi.c') diff --git a/kernel/drivers/acpi.c b/kernel/drivers/acpi.c index b4bb805..bd9fe54 100644 --- a/kernel/drivers/acpi.c +++ b/kernel/drivers/acpi.c @@ -287,10 +287,10 @@ static void acpi_load_table(uint64_t addr) struct acpi_header *temp, *mapped; uint32_t length; temp = (struct acpi_header *)(uintptr_t)addr; - mapped = kmapaddr(temp, sizeof(struct acpi_header)); + mapped = kmapaddr(temp, NULL, sizeof(struct acpi_header), 0); length = mapped->length; kunmapaddr(mapped); - mapped = kmapaddr(temp, length); + mapped = kmapaddr(temp, NULL, length, 0); if (!checksum((uint8_t *)mapped, mapped->length)) { kunmapaddr(mapped); return; -- cgit v1.2.3-freya From 730aafc1758e4096853c2491345901a296b4cc3e Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Wed, 16 Apr 2025 16:48:56 -0400 Subject: remove all printing to report functions --- kernel/drivers/acpi.c | 37 +++++++++++++++++++++++++++---- kernel/drivers/pci.c | 4 ++++ kernel/include/comus/drivers/acpi.h | 5 +++++ kernel/include/comus/drivers/pci.h | 5 +++++ kernel/include/comus/memory.h | 6 ++++++ kernel/main.c | 14 ++++++++++++ kernel/mboot/mmap.c | 15 +------------ kernel/memory/physalloc.c | 43 +++++++++++++++++++++++++++++++------ 8 files changed, 105 insertions(+), 24 deletions(-) (limited to 'kernel/drivers/acpi.c') diff --git a/kernel/drivers/acpi.c b/kernel/drivers/acpi.c index bd9fe54..41f7ba1 100644 --- a/kernel/drivers/acpi.c +++ b/kernel/drivers/acpi.c @@ -1,7 +1,9 @@ +#include "lib/kio.h" #include #include #include #include +#include struct acpi_header { uint32_t signature; @@ -295,7 +297,6 @@ static void acpi_load_table(uint64_t addr) kunmapaddr(mapped); return; } - kprintf("%.*s: %#016lx\n", 4, (char *)&mapped->signature, (size_t)temp); acpi_handle_table(mapped); } @@ -311,20 +312,48 @@ void acpi_init(void *rootsdp) } if (rsdp->revision == 0) { state.version = 0; - kprintf("ACPI 1.0\n"); acpi_load_table(rsdp->rsdt_addr); } else if (rsdp->revision == 2) { state.version = 2; struct xsdp *xsdp = (struct xsdp *)rsdp; - kprintf("ACPI 2.0\n"); acpi_load_table(xsdp->xsdt_addr); } else { panic("invalid acpi rev: %d\n", rsdp->revision); } - kprintf("\n"); outb(state.fadt->smi_command_port, state.fadt->acpi_enable); } +void acpi_report(void) +{ + if (state.version == 0) { + kprintf("ACPI 1.0\n"); + kprintf("%.*s: %#016lx\n", 4, (char *) &state.sdt.rsdt->h.signature, + (uintptr_t) state.sdt.rsdt); + } else { + kprintf("ACPI 2.0\n"); + kprintf("%.*s: %#016lx\n", 4, (char *) &state.sdt.xsdt->h.signature, + (uintptr_t) state.sdt.xsdt); + } + + if (state.fadt) + kprintf("%.*s: %#016lx\n", 4, (char *) &state.fadt->h.signature, + (uintptr_t) state.fadt); + if (state.dsdt) + kprintf("%.*s: %#016lx\n", 4, (char *) &state.dsdt->h.signature, + (uintptr_t) state.dsdt); + if (state.apic) + kprintf("%.*s: %#016lx\n", 4, (char *) &state.apic->h.signature, + (uintptr_t) state.apic); + if (state.hept) + kprintf("%.*s: %#016lx\n", 4, (char *) &state.hept->h.signature, + (uintptr_t) state.hept); + if (state.waet) + kprintf("%.*s: %#016lx\n", 4, (char *) &state.waet->h.signature, + (uintptr_t) state.waet); + + kprintf("\n"); +} + void acpi_shutdown(void) { outw((unsigned int)state.fadt->pm1_a_control_block, diff --git a/kernel/drivers/pci.c b/kernel/drivers/pci.c index e84ca11..ce2583f 100644 --- a/kernel/drivers/pci.c +++ b/kernel/drivers/pci.c @@ -134,6 +134,10 @@ void pci_init(void) } } } +} + +void pci_report(void) +{ kprintf("PCI DEVICES\n"); for (size_t i = 0; i < pci_table_next; i++) { print_device(&pci_table[i]); diff --git a/kernel/include/comus/drivers/acpi.h b/kernel/include/comus/drivers/acpi.h index bb11860..f4948f7 100644 --- a/kernel/include/comus/drivers/acpi.h +++ b/kernel/include/comus/drivers/acpi.h @@ -14,6 +14,11 @@ */ void acpi_init(void *rsdp); +/** + * Report ACPI tables + */ +void acpi_report(void); + /** * Shutdowns down the system */ diff --git a/kernel/include/comus/drivers/pci.h b/kernel/include/comus/drivers/pci.h index 34bcdda..b06aca9 100644 --- a/kernel/include/comus/drivers/pci.h +++ b/kernel/include/comus/drivers/pci.h @@ -56,6 +56,11 @@ struct pci_device { */ void pci_init(void); +/** + * Report all PCI devices + */ +void pci_report(void); + bool pci_findby_class(struct pci_device *dest, uint8_t class, uint8_t subclass, size_t *offset); bool pci_findby_id(struct pci_device *dest, uint16_t device, uint16_t vendor, diff --git a/kernel/include/comus/memory.h b/kernel/include/comus/memory.h index dec872d..ceca4aa 100644 --- a/kernel/include/comus/memory.h +++ b/kernel/include/comus/memory.h @@ -29,6 +29,7 @@ struct memory_segment { uint64_t addr; uint64_t len; + uint32_t type; }; struct memory_map { @@ -59,6 +60,11 @@ uint64_t memory_free(void); */ uint64_t memory_used(void); +/** + * Reports system memory usage and map + */ +void memory_report(void); + /** * Allocate a new memory context * diff --git a/kernel/main.c b/kernel/main.c index 4f91d95..f600320 100644 --- a/kernel/main.c +++ b/kernel/main.c @@ -1,10 +1,21 @@ +#include "lib/kio.h" #include #include #include #include +#include +#include #include #include +void kreport(void) +{ + cpu_report(); + memory_report(); + acpi_report(); + pci_report(); +} + void main(long magic, volatile void *mboot) { // initalize idt and pic @@ -22,6 +33,9 @@ void main(long magic, volatile void *mboot) // load file systems fs_init(); + // report system state + kreport(); + // halt kprintf("halting...\n"); } diff --git a/kernel/mboot/mmap.c b/kernel/mboot/mmap.c index e93421d..8959c49 100644 --- a/kernel/mboot/mmap.c +++ b/kernel/mboot/mmap.c @@ -20,11 +20,6 @@ struct multiboot_tag_mmap { struct multiboot_mmap_entry entries[]; }; -static const char *segment_type[] = { "Reserved", "Free", - "Reserved", "ACPI Reserved", - "Hibernation", "Defective", - "Unknown" }; - int mboot_get_mmap(struct memory_map *res) { void *tag = locate_mboot_table(MULTIBOOT_TAG_TYPE_MMAP); @@ -35,22 +30,14 @@ int mboot_get_mmap(struct memory_map *res) int idx = 0; uintptr_t i = (uintptr_t)mmap->entries; - kprintf("MEMORY MAP\n"); char buf[20]; for (; i < (uintptr_t)mmap->entries + mmap->size; i += mmap->entry_size, idx++) { struct multiboot_mmap_entry *seg = (struct multiboot_mmap_entry *)i; const char *type = NULL; - if (seg->type > 6) - type = segment_type[6]; - else - type = segment_type[seg->type]; - kprintf("ADDR: %16p LEN: %4s TYPE: %s (%d)\n", (void *)seg->addr, - btoa(seg->len, buf), type, seg->type); - if (seg->type != 1 || seg->len < 1) - continue; res->entries[idx].addr = seg->addr; res->entries[idx].len = seg->len; + res->entries[idx].type = seg->type; } res->entry_count = idx; diff --git a/kernel/memory/physalloc.c b/kernel/memory/physalloc.c index 7083c21..328502f 100644 --- a/kernel/memory/physalloc.c +++ b/kernel/memory/physalloc.c @@ -1,3 +1,4 @@ +#include "lib/kio.h" #include #include #include @@ -16,8 +17,14 @@ static uint64_t total_memory; static uint64_t free_memory; static uint64_t page_count; static uint64_t segment_count; +struct memory_map phys_mmap; struct memory_segment *page_start; +static const char *segment_type_str[] = { "Reserved", "Free", + "Reserved", "ACPI Reserved", + "Hibernation", "Defective", + "Unknown" }; + static int n_pages(const struct memory_segment *m) { return m->len / PAGE_SIZE; @@ -115,6 +122,10 @@ void free_phys_pages(void *ptr, int pages) static bool segment_invalid(const struct memory_segment *segment) { + if (segment->len < 1) + return true; + if (segment->type != 1) + return true; if (segment->addr < kaddr(kernel_start)) return true; if (segment->addr + segment->len < memory_start) @@ -161,6 +172,7 @@ void physalloc_init(struct memory_map *map) free_memory = 0; page_count = 0; page_start = NULL; + phys_mmap = *map; segment_count = 0; @@ -209,12 +221,6 @@ void physalloc_init(struct memory_map *map) total_memory = page_count * PAGE_SIZE; page_count -= bitmap_pages; free_memory = page_count * PAGE_SIZE; - - char buf[20]; - kprintf("\nMEMORY USAGE\n"); - kprintf("mem total: %s\n", btoa(memory_total(), buf)); - kprintf("mem free: %s\n", btoa(memory_free(), buf)); - kprintf("mem used: %s\n\n", btoa(memory_used(), buf)); } uint64_t memory_total(void) @@ -231,3 +237,28 @@ uint64_t memory_used(void) { return total_memory - free_memory; } + +void memory_report(void) +{ + char buf[20]; + + kprintf("MEMORY MAP\n"); + for (uint32_t i = 0; i < phys_mmap.entry_count; i++) { + struct memory_segment *seg; + const char *type_str; + + seg = &phys_mmap.entries[i]; + if (seg->type > 6) + type_str = segment_type_str[6]; + else + type_str = segment_type_str[seg->type]; + + kprintf("ADDR: %16p LEN: %4s TYPE: %s (%d)\n", (void *)seg->addr, + btoa(seg->len, buf), type_str, seg->type); + } + + kprintf("\nMEMORY USAGE\n"); + kprintf("mem total: %s\n", btoa(memory_total(), buf)); + kprintf("mem free: %s\n", btoa(memory_free(), buf)); + kprintf("mem used: %s\n\n", btoa(memory_used(), buf)); +} -- cgit v1.2.3-freya From 0ddc618b1d60ef6729326aa4e45b8280fcf51775 Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Wed, 16 Apr 2025 16:51:25 -0400 Subject: fmt --- kernel/cpu/cpu.c | 130 ++++++++++++++++++++++++---------------------- kernel/drivers/acpi.c | 28 +++++----- kernel/memory/physalloc.c | 6 +-- 3 files changed, 84 insertions(+), 80 deletions(-) (limited to 'kernel/drivers/acpi.c') diff --git a/kernel/cpu/cpu.c b/kernel/cpu/cpu.c index 3835b68..136a1d8 100644 --- a/kernel/cpu/cpu.c +++ b/kernel/cpu/cpu.c @@ -18,19 +18,19 @@ static inline void sse_init(void) { size_t cr0, cr4; __asm__ volatile("mov %%cr0, %0" : "=r"(cr0)); - cr0 &= ~0x4; // clear coprocessor emulation - cr0 |= 0x2; // set coprocessor monitoring - __asm__ volatile("mov %0, %%cr0" :: "r"(cr0)); + cr0 &= ~0x4; // clear coprocessor emulation + cr0 |= 0x2; // set coprocessor monitoring + __asm__ volatile("mov %0, %%cr0" ::"r"(cr0)); __asm__ volatile("mov %%cr4, %0" : "=r"(cr4)); cr4 |= 1 << 9; // set CR4.OSFXSR cr4 |= 1 << 10; // set CR4.OSXMMEXCPT - __asm__ volatile("mov %0, %%cr4" :: "r"(cr4)); + __asm__ volatile("mov %0, %%cr4" ::"r"(cr4)); } static inline void fxsave_init(void) { static char fxsave_region[512] __attribute__((aligned(16))); - __asm__ volatile("fxsave %0" :: "m"(fxsave_region)); + __asm__ volatile("fxsave %0" ::"m"(fxsave_region)); } static inline void xsave_init(void) @@ -38,23 +38,21 @@ static inline void xsave_init(void) size_t cr4; __asm__ volatile("mov %%cr4, %0" : "=r"(cr4)); cr4 |= 1 << 18; // set CR4.OSXSAVE - __asm__ volatile("mov %0, %%cr4" :: "r"(cr4)); + __asm__ volatile("mov %0, %%cr4" ::"r"(cr4)); } static inline void avx_init(void) { - __asm__ volatile( - "pushq %rax;" - "pushq %rcx;" - "pushq %rdx;" - "xorq %rcx, %rcx;" - "xgetbv;" - "orq $7, %rax;" - "xsetbv;" - "popq %rdx;" - "popq %rcx;" - "popq %rax;" - ); + __asm__ volatile("pushq %rax;" + "pushq %rcx;" + "pushq %rdx;" + "xorq %rcx, %rcx;" + "xgetbv;" + "orq $7, %rax;" + "xsetbv;" + "popq %rdx;" + "popq %rcx;" + "popq %rax;"); } void cpu_init(void) @@ -119,30 +117,37 @@ void cpu_report(void) kputs("\n\n"); } -static inline void cpuid(uint32_t leaf, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx) +static inline void cpuid(uint32_t leaf, uint32_t *eax, uint32_t *ebx, + uint32_t *ecx, uint32_t *edx) { - __asm__ volatile("cpuid" - : "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx) - : "0" (leaf)); + __asm__ volatile("cpuid" + : "=a"(*eax), "=b"(*ebx), "=c"(*ecx), "=d"(*edx) + : "0"(leaf)); } -static inline void cpuid_count(uint32_t leaf, uint32_t subleaf, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx) +static inline void cpuid_count(uint32_t leaf, uint32_t subleaf, uint32_t *eax, + uint32_t *ebx, uint32_t *ecx, uint32_t *edx) { - __asm__ volatile("cpuid" - : "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx) - : "0" (leaf), "2" (subleaf)); + __asm__ volatile("cpuid" + : "=a"(*eax), "=b"(*ebx), "=c"(*ecx), "=d"(*edx) + : "0"(leaf), "2"(subleaf)); } void cpu_vendor(char vendor[12]) { uint32_t ignore; - cpuid(0, &ignore, (uint32_t *)(vendor + 0), (uint32_t *)(vendor + 8), (uint32_t *)(vendor + 4)); + cpuid(0, &ignore, (uint32_t *)(vendor + 0), (uint32_t *)(vendor + 8), + (uint32_t *)(vendor + 4)); } -void cpu_name(char name[48]) { - cpuid(0x80000002, (uint32_t *)(name + 0), (uint32_t *)(name + 4), (uint32_t *)(name + 8), (uint32_t *)(name + 12)); - cpuid(0x80000003, (uint32_t *)(name + 16), (uint32_t *)(name + 20), (uint32_t *)(name + 24), (uint32_t *)(name + 28)); - cpuid(0x80000004, (uint32_t *)(name + 32), (uint32_t *)(name + 36), (uint32_t *)(name + 40), (uint32_t *)(name + 44)); +void cpu_name(char name[48]) +{ + cpuid(0x80000002, (uint32_t *)(name + 0), (uint32_t *)(name + 4), + (uint32_t *)(name + 8), (uint32_t *)(name + 12)); + cpuid(0x80000003, (uint32_t *)(name + 16), (uint32_t *)(name + 20), + (uint32_t *)(name + 24), (uint32_t *)(name + 28)); + cpuid(0x80000004, (uint32_t *)(name + 32), (uint32_t *)(name + 36), + (uint32_t *)(name + 40), (uint32_t *)(name + 44)); } void cpu_feats(struct cpu_feat *feats) @@ -156,19 +161,19 @@ void cpu_feats(struct cpu_feat *feats) cpuid(1, &ignore, &ignore, &ecx_1, &edx_1); cpuid_count(7, 0, &ignore, &ebx_7, &ignore, &ignore); - feats->fpu = edx_1 & (1<<0) ? 1 : 0; - feats->mmx = edx_1 & (1<<23) ? 1 : 0; - feats->sse = edx_1 & (1<<25) ? 1 : 0; - feats->sse2 = edx_1 & (1<<26) ? 1 : 0; - feats->sse3 = ecx_1 & (1<<0) ? 1 : 0; - feats->ssse3 = ecx_1 & (1<<9) ? 1 : 0; - feats->sse41 = ecx_1 & (1<<19) ? 1 : 0; - feats->sse42 = ecx_1 & (1<<20) ? 1 : 0; - feats->sse4a = ecx_1 & (1<<6) ? 1 : 0; - feats->avx = ecx_1 & (1<<28) ? 1 : 0; - feats->xsave = ecx_1 & (1<<26) ? 1 : 0; - feats->avx2 = ebx_7 & (1<<5) ? 1 : 0; - feats->avx512 = ebx_7 & (7<<16) ? 1 : 0; + feats->fpu = edx_1 & (1 << 0) ? 1 : 0; + feats->mmx = edx_1 & (1 << 23) ? 1 : 0; + feats->sse = edx_1 & (1 << 25) ? 1 : 0; + feats->sse2 = edx_1 & (1 << 26) ? 1 : 0; + feats->sse3 = ecx_1 & (1 << 0) ? 1 : 0; + feats->ssse3 = ecx_1 & (1 << 9) ? 1 : 0; + feats->sse41 = ecx_1 & (1 << 19) ? 1 : 0; + feats->sse42 = ecx_1 & (1 << 20) ? 1 : 0; + feats->sse4a = ecx_1 & (1 << 6) ? 1 : 0; + feats->avx = ecx_1 & (1 << 28) ? 1 : 0; + feats->xsave = ecx_1 & (1 << 26) ? 1 : 0; + feats->avx2 = ebx_7 & (1 << 5) ? 1 : 0; + feats->avx512 = ebx_7 & (7 << 16) ? 1 : 0; } void cpu_print_regs(struct cpu_regs *regs) @@ -192,42 +197,41 @@ void cpu_print_regs(struct cpu_regs *regs) kprintf("rip: %#016lx (%lu)\n", regs->rip, regs->rip); kprintf("rflags: %#016lx (%lu)\n", regs->rflags, regs->rflags); kputs("rflags: "); - if (regs->rflags & (1<<0)) + if (regs->rflags & (1 << 0)) kputs("CF "); - if (regs->rflags & (1<<2)) + if (regs->rflags & (1 << 2)) kputs("PF "); - if (regs->rflags & (1<<4)) + if (regs->rflags & (1 << 4)) kputs("AF "); - if (regs->rflags & (1<<6)) + if (regs->rflags & (1 << 6)) kputs("ZF "); - if (regs->rflags & (1<<7)) + if (regs->rflags & (1 << 7)) kputs("SF "); - if (regs->rflags & (1<<8)) + if (regs->rflags & (1 << 8)) kputs("TF "); - if (regs->rflags & (1<<9)) + if (regs->rflags & (1 << 9)) kputs("IF "); - if (regs->rflags & (1<<10)) + if (regs->rflags & (1 << 10)) kputs("DF "); - if (regs->rflags & (1<<11)) + if (regs->rflags & (1 << 11)) kputs("OF "); - if (regs->rflags & (3<<12)) + if (regs->rflags & (3 << 12)) kputs("IOPL "); - if (regs->rflags & (1<<14)) + if (regs->rflags & (1 << 14)) kputs("NT "); - if (regs->rflags & (1<<15)) + if (regs->rflags & (1 << 15)) kputs("MD "); - if (regs->rflags & (1<<16)) + if (regs->rflags & (1 << 16)) kputs("RF "); - if (regs->rflags & (1<<17)) + if (regs->rflags & (1 << 17)) kputs("VM "); - if (regs->rflags & (1<<18)) + if (regs->rflags & (1 << 18)) kputs("AC "); - if (regs->rflags & (1<<19)) + if (regs->rflags & (1 << 19)) kputs("VIF "); - if (regs->rflags & (1<<20)) + if (regs->rflags & (1 << 20)) kputs("VIP "); - if (regs->rflags & (1<<21)) + if (regs->rflags & (1 << 21)) kputs("ID "); kputs("\n"); } - diff --git a/kernel/drivers/acpi.c b/kernel/drivers/acpi.c index 41f7ba1..b4b219a 100644 --- a/kernel/drivers/acpi.c +++ b/kernel/drivers/acpi.c @@ -327,29 +327,29 @@ void acpi_report(void) { if (state.version == 0) { kprintf("ACPI 1.0\n"); - kprintf("%.*s: %#016lx\n", 4, (char *) &state.sdt.rsdt->h.signature, - (uintptr_t) state.sdt.rsdt); + kprintf("%.*s: %#016lx\n", 4, (char *)&state.sdt.rsdt->h.signature, + (uintptr_t)state.sdt.rsdt); } else { kprintf("ACPI 2.0\n"); - kprintf("%.*s: %#016lx\n", 4, (char *) &state.sdt.xsdt->h.signature, - (uintptr_t) state.sdt.xsdt); + kprintf("%.*s: %#016lx\n", 4, (char *)&state.sdt.xsdt->h.signature, + (uintptr_t)state.sdt.xsdt); } if (state.fadt) - kprintf("%.*s: %#016lx\n", 4, (char *) &state.fadt->h.signature, - (uintptr_t) state.fadt); + kprintf("%.*s: %#016lx\n", 4, (char *)&state.fadt->h.signature, + (uintptr_t)state.fadt); if (state.dsdt) - kprintf("%.*s: %#016lx\n", 4, (char *) &state.dsdt->h.signature, - (uintptr_t) state.dsdt); + kprintf("%.*s: %#016lx\n", 4, (char *)&state.dsdt->h.signature, + (uintptr_t)state.dsdt); if (state.apic) - kprintf("%.*s: %#016lx\n", 4, (char *) &state.apic->h.signature, - (uintptr_t) state.apic); + kprintf("%.*s: %#016lx\n", 4, (char *)&state.apic->h.signature, + (uintptr_t)state.apic); if (state.hept) - kprintf("%.*s: %#016lx\n", 4, (char *) &state.hept->h.signature, - (uintptr_t) state.hept); + kprintf("%.*s: %#016lx\n", 4, (char *)&state.hept->h.signature, + (uintptr_t)state.hept); if (state.waet) - kprintf("%.*s: %#016lx\n", 4, (char *) &state.waet->h.signature, - (uintptr_t) state.waet); + kprintf("%.*s: %#016lx\n", 4, (char *)&state.waet->h.signature, + (uintptr_t)state.waet); kprintf("\n"); } diff --git a/kernel/memory/physalloc.c b/kernel/memory/physalloc.c index 328502f..676e68e 100644 --- a/kernel/memory/physalloc.c +++ b/kernel/memory/physalloc.c @@ -21,9 +21,9 @@ struct memory_map phys_mmap; struct memory_segment *page_start; static const char *segment_type_str[] = { "Reserved", "Free", - "Reserved", "ACPI Reserved", - "Hibernation", "Defective", - "Unknown" }; + "Reserved", "ACPI Reserved", + "Hibernation", "Defective", + "Unknown" }; static int n_pages(const struct memory_segment *m) { -- cgit v1.2.3-freya