From 97544ed7a9e2f5128dc8bf26eb782577d33f30e3 Mon Sep 17 00:00:00 2001
From: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Date: Fri, 3 May 2024 11:13:09 +0200
Subject: [PATCH] nova: support iommu enabling per intel/amd

separately.  The "iommu" option is now split up into "iommu_intel" and
"iommu_amd" and thereby can be disabled easily if required for one of the CPU
vendors.

Fixes #5206
---
 repos/base-nova/ports/nova.hash | 2 +-
 repos/base-nova/ports/nova.port | 2 +-
 tool/run/boot_dir/nova          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/repos/base-nova/ports/nova.hash b/repos/base-nova/ports/nova.hash
index 9a4fac5dd0..fc1569b768 100644
--- a/repos/base-nova/ports/nova.hash
+++ b/repos/base-nova/ports/nova.hash
@@ -1 +1 @@
-0cf1d38402aae7cab3f19a01c791d3ee9b90545c
+5148b58b2734e171ff8c949e23d3f4499e6189ef
diff --git a/repos/base-nova/ports/nova.port b/repos/base-nova/ports/nova.port
index d3603866ed..01c4c6e0aa 100644
--- a/repos/base-nova/ports/nova.port
+++ b/repos/base-nova/ports/nova.port
@@ -4,7 +4,7 @@ DOWNLOADS := nova.git
 
 # r10 branch
 URL(nova) := https://github.com/alex-ab/NOVA.git
-REV(nova) := e232309084397f7d621ccfa810941db3ea9e8ff6
+REV(nova) := 9560bf9fb6a9612147bb2a1a89156ac39951d170
 DIR(nova) := src/kernel/nova
 
 PATCHES   := $(sort $(wildcard $(REP_DIR)/patches/*.patch))
diff --git a/tool/run/boot_dir/nova b/tool/run/boot_dir/nova
index 5272791ebd..422a48fd9b 100644
--- a/tool/run/boot_dir/nova
+++ b/tool/run/boot_dir/nova
@@ -129,7 +129,7 @@ proc run_boot_dir {binaries} {
 		if {[apply_microcode]} {
 			puts $fh " module2 /boot/micro.code micro.code"
 		}
-		puts $fh " module2 /boot/hypervisor hypervisor iommu [kernel_output]"
+		puts $fh " module2 /boot/hypervisor hypervisor iommu_intel iommu_amd [kernel_output]"
 		puts $fh " module2 /boot/image.elf.gz image.elf"
 		puts $fh "}"
 		close $fh
@@ -154,7 +154,7 @@ proc run_boot_dir {binaries} {
 		if {[apply_microcode]} {
 			puts $fh " load /boot/micro.code micro.code"
 		}
-		puts $fh " load /boot/hypervisor iommu [kernel_output]"
+		puts $fh " load /boot/hypervisor iommu_intel iommu_amd [kernel_output]"
 		puts $fh " load /boot/image.elf"
 		close $fh