From 73f83209f3b1d2eecff9f7e51dc4476f889f5e49 Mon Sep 17 00:00:00 2001
From: Sergiu Moga <sergiu.moga@protonmail.com>
Date: Sun, 21 May 2023 16:22:40 +0300
Subject: [PATCH] plat/kvm/arm: Enable enumerating secondary cores through
 `ACPI`

Allow the existence of two ways to enumerate secondary cores:
`ACPI` and `Devicetree`.

Signed-off-by: Sergiu Moga <sergiu.moga@protonmail.com>
Reviewed-by: Razvan Virtan <virtanrazvan@gmail.com>
Reviewed-by: Michalis Pappas <michalis@unikraft.io>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Closes: #912
---
 plat/kvm/arm/setup.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plat/kvm/arm/setup.c b/plat/kvm/arm/setup.c
index a4821d030..4975fdc4a 100644
--- a/plat/kvm/arm/setup.c
+++ b/plat/kvm/arm/setup.c
@@ -24,6 +24,7 @@
 #include <libfdt.h>
 #include <uk/plat/common/sections.h>
 #include <uk/plat/common/bootinfo.h>
+#include <uk/plat/common/acpi.h>
 #include <uk/plat/lcpu.h>
 #include <uk/plat/common/lcpu.h>
 #include <uart/pl011.h>
@@ -181,6 +182,12 @@ void __no_pauth _ukplat_entry(struct ukplat_bootinfo *bi)
 	pl031_init_rtc(fdt);
 #endif /* CONFIG_RTC_PL031 */
 
+#if defined(CONFIG_UKPLAT_ACPI)
+	rc = acpi_init();
+	if (unlikely(rc < 0))
+		uk_pr_err("ACPI init failed: %d\n", rc);
+#endif /* CONFIG_UKPLAT_ACPI */
+
 	/* Initialize interrupt controller */
 	intctrl_init();
 
-- 
2.39.5