Merge pull request managarm#729 from qookei/aarch64-fixes

Dennisbonke · Oct 30, 2024 · df9e6d0 · df9e6d0
2 parents 410912c + 7d7a3cd
commit df9e6d0
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,14 +48,19 @@ jobs:
                         mlibc
                         mlibc-headers
         name: Build ${{ matrix.pkg }}
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-24.04
         steps:
+          - name: Permit unprivileged user namespaces
+            run: |
+                set -x
+                sudo sysctl -w kernel.apparmor_restrict_unprivileged_unconfined=0
+                sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
           - name: Install prerequisites
             run: |
                 set -x
                 sudo apt-get update
                 sudo apt-get install qemu-system-x86 pcre2-utils
-                pip3 install xbstrap
+                pip3 install xbstrap y4
                 xbstrap prereqs cbuildrt xbps
           - name: Check for requested bootstrap-managarm PR
             env:

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
     build-docs:
         name: Build documentation
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-24.04
         steps:
           - name: Install prerequisites
             run: |

diff --git a/drivers/nic/freebsd-e1000/meson.build b/drivers/nic/freebsd-e1000/meson.build
@@ -1,3 +1,7 @@
+if host_machine.cpu_family() != 'x86_64'
+	subdir_done()
+endif
+
 import = subproject('freebsd-e1000')
 
 inc = ['../../../servers/netserver/include', 'include']

diff --git a/kernel/thor/arch/arm/debug.cpp b/kernel/thor/arch/arm/debug.cpp
@@ -39,4 +39,11 @@ void UartLogHandler::printChar(char c) {
 	space.store(reg::data, c);
 }
 
+void UartLogHandler::setPriority(Severity prio) {
+	(void)prio;
+}
+
+void UartLogHandler::resetPriority() {
+}
+
 } // namespace thor
diff --git a/posix/subsystem/src/main.cpp b/posix/subsystem/src/main.cpp
@@ -161,7 +161,7 @@ async::result<void> enumeratePm() {
 
 async::detached runInit() {
 	co_await enumerateKerncfg();
-	co_await enumeratePm();
+	async::detach(enumeratePm());
 	co_await clk::enumerateTracker();
 	async::detach(net::enumerateNetserver());
 	co_await populateRootView();

diff --git a/servers/netserver/meson.build b/servers/netserver/meson.build
@@ -14,9 +14,15 @@ src = [
 
 inc = [ 'include', 'src' ]
 
+dep = [ fs_proto_dep, mbus_proto_dep, svrctl_proto_dep, nic_virtio_dep,
+	nic_usb_net_dep, nic_rtl8168_dep, core_dep ]
+
+if host_machine.cpu_family() == 'x86_64'
+	dep += nic_freebsd_e1000_dep
+endif
+
 executable('netserver', src,
-	dependencies : [ fs_proto_dep, mbus_proto_dep, svrctl_proto_dep, nic_virtio_dep,
-		nic_usb_net_dep, nic_rtl8168_dep, nic_freebsd_e1000_dep, core_dep ],
+	dependencies : dep,
 	include_directories : inc,
 	install : true
 )

diff --git a/servers/netserver/src/main.cpp b/servers/netserver/src/main.cpp
@@ -27,7 +27,9 @@
 #include <netserver/nic.hpp>
 #include <nic/virtio/virtio.hpp>
 #include <nic/rtl8168/rtl8168.hpp>
-#include <nic/freebsd-e1000/common.hpp>
+#ifdef __x86_64__
+# include <nic/freebsd-e1000/common.hpp>
+#endif
 #include <nic/usb_net/usb_net.hpp>
 #include <protocols/usb/client.hpp>
 
@@ -179,8 +181,10 @@ async::result<protocols::svrctl::Error> doBindPci(mbus_ng::Entity baseEntity) {
 		device = co_await setupVirtioDevice(baseEntity, std::move(hwDevice));
 	} else if(determineRTL8168Support(vendor_str->value, device_str->value)) {
 		device = nic::rtl8168::makeShared(std::move(hwDevice));
+#ifdef __x86_64__
 	} else if(vendor_str->value == VENDOR_INTEL) {
 		device = nic::e1000::makeShared(std::move(hwDevice));
+#endif
 	} else {
 		std::cout << std::format("netserver: skipping PCI device {}:{}\n", vendor_str->value, device_str->value);
 		co_return protocols::svrctl::Error::deviceNotSupported;