summary refs log tree commit diff
path: root/img/live/Makefile
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2022-09-22 07:56:28 +0000
committerAlyssa Ross <hi@alyssa.is>2022-11-12 12:01:43 +0000
commit7a4389a94ecffadf9ece46423c1824280114d5a8 (patch)
tree77b5cbd12b51143c4086da63e40d37492258ee2a /img/live/Makefile
parent169fdd697771326fb111ab4532804a40e0fbeaa1 (diff)
downloadspectrum-7a4389a94ecffadf9ece46423c1824280114d5a8.tar
spectrum-7a4389a94ecffadf9ece46423c1824280114d5a8.tar.gz
spectrum-7a4389a94ecffadf9ece46423c1824280114d5a8.tar.bz2
spectrum-7a4389a94ecffadf9ece46423c1824280114d5a8.tar.lz
spectrum-7a4389a94ecffadf9ece46423c1824280114d5a8.tar.xz
spectrum-7a4389a94ecffadf9ece46423c1824280114d5a8.tar.zst
spectrum-7a4389a94ecffadf9ece46423c1824280114d5a8.zip
Set intel_iommu=on in kernel command line
In Nixpkgs kernels, Intel IOMMUs are disabled by
default (CONFIG_INTEL_IOMMU_DEFAULT_ON=n), so it needs to be
explicitly enabled on the kernel command line.  This was already done
in the rootfs run make target, which is what I mostly use for testing,
which is why I hadn't noticed until now.

We could also set CONFIG_INTEL_IOMMU_DEFAULT_ON, but I think it's
better to avoid changing our kernel configuration too much at the
moment.  (This might change in future if we want to go all in.)

No changes are required for AMD IOMMUs, which are enabled by default.

Reported-by: Vadim Likholetov <vadim.likholetov@unikie.com>
Signed-off-by: Alyssa Ross <hi@alyssa.is>
Message-Id: <20220922075629.247058-2-hi@alyssa.is>
Diffstat (limited to 'img/live/Makefile')
-rw-r--r--img/live/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/img/live/Makefile b/img/live/Makefile
index e63c598..5507c2f 100644
--- a/img/live/Makefile
+++ b/img/live/Makefile
@@ -26,7 +26,7 @@ build/spectrum.conf: build/rootfs.verity.roothash
 	printf "title Spectrum\n" > $@
 	printf "linux /spectrum/linux\n" >> $@
 	printf "initrd /spectrum/initrd\n" >> $@
-	printf "options ro console=tty console=ttyS0 roothash=" >> $@
+	printf "options ro console=tty console=ttyS0 intel_iommu=on roothash=" >> $@
 	cat build/rootfs.verity.roothash >> $@
 
 build/boot.fat: $(KERNEL) $(INITRAMFS) $(SYSTEMD_BOOT_EFI) build/spectrum.conf