Merge pull request managarm#637 from Qwinci/aarch64-smp-fix

Aarch64 smp fix
Dennisbonke · Mar 16, 2024 · 1a0de4a · 1a0de4a
2 parents a8ebe4f + 809fd4e
commit 1a0de4a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/kernel/thor/arch/arm/smp.cpp b/kernel/thor/arch/arm/smp.cpp
@@ -34,7 +34,7 @@ namespace {
 				assert(node->method() == "smc");
 		}
 
-		int turnOnCpu(uint8_t id, uintptr_t addr) {
+		int turnOnCpu(uint64_t id, uintptr_t addr) {
 			register int64_t regResult asm("x0");
 			register uint64_t regCmd asm("x0") = cpuOn_;
 			register uint64_t regCpu asm("x1") = id;
@@ -84,7 +84,7 @@ namespace {
 
 bool bootSecondary(DeviceTreeNode *node) {
 	infoLogger() << "thor: Starting CPU \"" << node->path() << "\"" << frg::endlog;
-	uint8_t id = node->reg()[0].addr;
+	uint64_t id = node->reg()[0].addr;
 
 	// TODO: We assume CPU 0 is the boot CPU, but potentially it could be some other one
 	if (id == 0)
@@ -224,7 +224,7 @@ static initgraph::Task initAPs{&globalInitEngine, "arm.init-aps",
 	initgraph::Requires{getDeviceTreeParsedStage(), getTaskingAvailableStage()},
 	[] {
 		getDeviceTreeRoot()->forEach([&](DeviceTreeNode *node) -> bool {
-			if (node->isCompatible<1>({"arm,psci"})) {
+			if (node->isCompatible<2>({"arm,psci", "arm,psci-1.0"})) {
 				psci_.initialize(node);
 				return true;
 			}
@@ -233,7 +233,7 @@ static initgraph::Task initAPs{&globalInitEngine, "arm.init-aps",
 		});
 
 		getDeviceTreeRoot()->forEach([&](DeviceTreeNode *node) -> bool {
-			if (node->isCompatible<3>({"arm,cortex-a72", "arm,cortex-a53", "arm,arm-v8"})) {
+			if (node->isCompatible<4>({"arm,cortex-a72", "arm,cortex-a53", "arm,arm-v8", "arm,armv8"})) {
 				bootSecondary(node);
 			}
 

diff --git a/kernel/thor/system/dtb/thor-internal/dtb/dtb.hpp b/kernel/thor/system/dtb/thor-internal/dtb/dtb.hpp
@@ -24,7 +24,8 @@ struct DeviceTreeNode {
 	irqs_{*kernelAlloc}, interruptMap_{*kernelAlloc}, interruptMapMask_{*kernelAlloc},
 	interruptMapRaw_{nullptr, 0}, interruptController_{false},
 	interruptParentId_{0}, interruptParent_{}, busRange_{0, 0xFF},
-	enableMethod_{EnableMethod::unknown}, cpuReleaseAddr_{0}, method_{} { }
+	enableMethod_{EnableMethod::unknown}, cpuReleaseAddr_{0},
+	cpuOn_{0xc4000003}, method_{} { }
 
 	void initializeWith(::DeviceTreeNode dtNode);
 	void finalizeInit();