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
This commit is contained in:
Alexander Boettcher 2024-05-03 11:13:09 +02:00 committed by Christian Helmuth
parent b33afb24d7
commit 97544ed7a9
3 changed files with 4 additions and 4 deletions

View File

@ -1 +1 @@
0cf1d38402aae7cab3f19a01c791d3ee9b90545c 5148b58b2734e171ff8c949e23d3f4499e6189ef

View File

@ -4,7 +4,7 @@ DOWNLOADS := nova.git
# r10 branch # r10 branch
URL(nova) := https://github.com/alex-ab/NOVA.git URL(nova) := https://github.com/alex-ab/NOVA.git
REV(nova) := e232309084397f7d621ccfa810941db3ea9e8ff6 REV(nova) := 9560bf9fb6a9612147bb2a1a89156ac39951d170
DIR(nova) := src/kernel/nova DIR(nova) := src/kernel/nova
PATCHES := $(sort $(wildcard $(REP_DIR)/patches/*.patch)) PATCHES := $(sort $(wildcard $(REP_DIR)/patches/*.patch))

View File

@ -129,7 +129,7 @@ proc run_boot_dir {binaries} {
if {[apply_microcode]} { if {[apply_microcode]} {
puts $fh " module2 /boot/micro.code micro.code" 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 " module2 /boot/image.elf.gz image.elf"
puts $fh "}" puts $fh "}"
close $fh close $fh
@ -154,7 +154,7 @@ proc run_boot_dir {binaries} {
if {[apply_microcode]} { if {[apply_microcode]} {
puts $fh " load /boot/micro.code micro.code" 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" puts $fh " load /boot/image.elf"
close $fh close $fh