aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathew McBride <matt@traverse.com.au>2023-09-15 23:21:36 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2023-09-16 21:00:38 +0200
commitd536f398eb2c1409005bbfa6a74d92ca145eb0b3 (patch)
tree8b7de12f9c359950eb7164109112860e017a667d
parent3c8825e5f8ec46368f36f6c92506860a7bb9bc6b (diff)
downloadupstream-d536f398eb2c1409005bbfa6a74d92ca145eb0b3.tar.gz
upstream-d536f398eb2c1409005bbfa6a74d92ca145eb0b3.tar.bz2
upstream-d536f398eb2c1409005bbfa6a74d92ca145eb0b3.zip
kernel: ensure VFIO related suboptions are disabled
These suboptions (PLATFORM, FSL_MC and MLX5_VFIO_PCI) may be prompted for when VFIO is enabled, regardless of architecture. These are not related to the main vfio use case (passthrough of PCIe devices) Signed-off-by: Mathew McBride <matt@traverse.com.au> (5.15 version of abc536f54797386156383da7269ee0d4ccc84073)
-rw-r--r--target/linux/generic/config-5.153
1 files changed, 3 insertions, 0 deletions
diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15
index 6f28147ee3..214a1e6ecd 100644
--- a/target/linux/generic/config-5.15
+++ b/target/linux/generic/config-5.15
@@ -3599,6 +3599,7 @@ CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
# CONFIG_MLX4_EN is not set
# CONFIG_MLX5_CORE is not set
# CONFIG_MLX5_SF is not set
+# CONFIG_MLX5_VFIO_PCI is not set
# CONFIG_MLX90614 is not set
# CONFIG_MLX90632 is not set
# CONFIG_MLXFW is not set
@@ -7204,6 +7205,8 @@ CONFIG_VDSO=y
# CONFIG_VF610_DAC is not set
# CONFIG_VFAT_FS is not set
# CONFIG_VFIO is not set
+# CONFIG_VFIO_FSL_MC is not set
+# CONFIG_VFIO_PLATFORM is not set
# CONFIG_VGASTATE is not set
# CONFIG_VGA_ARB is not set
# CONFIG_VGA_CONSOLE is not set