From 57e6722453c27d35a3b02309ce21263d225a23e3 Mon Sep 17 00:00:00 2001
From: Aleksa Vuckovic <aleksa@vuckovic.cc>
Date: Wed, 22 Feb 2023 17:31:52 +0100
Subject: curr_cpu_apic_id() now works on old amd cpus

---
 kernel/src/cpu/irq.c    |  3 +++
 kernel/src/cpu/kcpuid.c |  7 +++++++
 kernel/src/cpu/msr.c    | 21 +++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 kernel/src/cpu/kcpuid.c
 create mode 100644 kernel/src/cpu/msr.c

(limited to 'kernel/src/cpu')

diff --git a/kernel/src/cpu/irq.c b/kernel/src/cpu/irq.c
index 6975fec..e5f811c 100644
--- a/kernel/src/cpu/irq.c
+++ b/kernel/src/cpu/irq.c
@@ -84,6 +84,9 @@ void irq_def_handler(uint64_t number)
 		case 1:
 			keyboard_handler();
 			break;
+		default:
+			printf("spurious interrupt\n");
+			break;
 	}
 	eoi(number);
 }
diff --git a/kernel/src/cpu/kcpuid.c b/kernel/src/cpu/kcpuid.c
new file mode 100644
index 0000000..30a4d3e
--- /dev/null
+++ b/kernel/src/cpu/kcpuid.c
@@ -0,0 +1,7 @@
+#include <types.h>
+#include <kcpuid.h>
+
+void kcpuid(uint32_t func, uint32_t subfunc, CPUIDinfo* info)
+{
+	__asm__ __volatile__ ( "cpuid" : "=a"(info->EAX), "=b"(info->EBX), "=c"(info->ECX), "=d"(info->EDX) : "a"(func), "c"(subfunc) : );
+}
diff --git a/kernel/src/cpu/msr.c b/kernel/src/cpu/msr.c
new file mode 100644
index 0000000..75fc602
--- /dev/null
+++ b/kernel/src/cpu/msr.c
@@ -0,0 +1,21 @@
+#include <msr.h>
+
+uint64_t read_msr(uint32_t addr)
+{
+	uint64_t eax;
+	uint64_t edx;
+	uint64_t ecx = addr;
+
+	__asm__ volatile ("rdmsr;" : "=a"(eax), "=d"(edx) : "c"(ecx) :);
+
+	return (edx << 32) | eax;
+}
+
+void write_msr(uint32_t addr, uint64_t value)
+{
+	uint64_t eax = value & 0xFFFFFFFF;
+	uint64_t edx = value >> 32;
+	uint64_t ecx = addr;
+
+	__asm__ volatile ("wrmsr;" : : "a"(eax), "d"(edx), "c"(ecx) :);
+}
-- 
cgit v1.2.3