Skip to content

Commit 6f276a3

Browse files
tlauriontlaurion
committed
kgpe-d16 linux configs: remove Intel related stuff, enable AMD related IOMMU settings
Signed-off-by: Thierry Laurion <insurgo@riseup.net>
1 parent 72e8c39 commit 6f276a3

File tree

3 files changed

+36
-45
lines changed

3 files changed

+36
-45
lines changed

‎config/linux-kgpe-d16_server-whiptail.config

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ CONFIG_IRQ_DOMAIN=y
6262
CONFIG_IRQ_DOMAIN_HIERARCHY=y
6363
CONFIG_GENERIC_MSI_IRQ=y
6464
CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
65+
CONFIG_IRQ_MSI_IOMMU=y
6566
CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
6667
CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
6768
CONFIG_IRQ_FORCED_THREADING=y
@@ -248,7 +249,6 @@ CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
248249
CONFIG_ZONE_DMA32=y
249250
CONFIG_AUDIT_ARCH=y
250251
CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
251-
CONFIG_HAVE_INTEL_TXT=y
252252
CONFIG_X86_64_SMP=y
253253
CONFIG_ARCH_SUPPORTS_UPROBES=y
254254
CONFIG_FIX_EARLYCON_MEM=y
@@ -431,6 +431,8 @@ CONFIG_CPU_FREQ_GOV_ATTR_SET=y
431431
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
432432
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
433433
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
434+
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
435+
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
434436
# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
435437
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
436438
# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
@@ -442,7 +444,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
442444
#
443445
# CPU frequency scaling drivers
444446
#
445-
CONFIG_X86_INTEL_PSTATE=y
447+
# CONFIG_X86_INTEL_PSTATE is not set
446448
# CONFIG_X86_PCC_CPUFREQ is not set
447449
# CONFIG_X86_ACPI_CPUFREQ is not set
448450
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
@@ -1006,9 +1008,9 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
10061008

10071009
# CONFIG_SENSORS_LIS3_I2C is not set
10081010
# CONFIG_ALTERA_STAPL is not set
1009-
CONFIG_INTEL_MEI=m
1010-
CONFIG_INTEL_MEI_ME=m
1011-
CONFIG_INTEL_MEI_TXE=m
1011+
# CONFIG_INTEL_MEI is not set
1012+
# CONFIG_INTEL_MEI_ME is not set
1013+
# CONFIG_INTEL_MEI_TXE is not set
10121014
# CONFIG_VMWARE_VMCI is not set
10131015
# CONFIG_GENWQE is not set
10141016
# CONFIG_ECHO is not set
@@ -1474,7 +1476,7 @@ CONFIG_DEVPORT=y
14741476
# CONFIG_HPET is not set
14751477
# CONFIG_HANGCHECK_TIMER is not set
14761478
CONFIG_TCG_TPM=y
1477-
CONFIG_HW_RANDOM_TPM=n
1479+
# CONFIG_HW_RANDOM_TPM is not set
14781480
CONFIG_TCG_TIS_CORE=y
14791481
CONFIG_TCG_TIS=y
14801482
# CONFIG_TCG_TIS_I2C_ATMEL is not set
@@ -2329,7 +2331,6 @@ CONFIG_MAILBOX=y
23292331
CONFIG_PCC=y
23302332
# CONFIG_ALTERA_MBOX is not set
23312333
CONFIG_IOMMU_IOVA=y
2332-
CONFIG_IOASID=y
23332334
CONFIG_IOMMU_API=y
23342335
CONFIG_IOMMU_SUPPORT=y
23352336

@@ -2340,13 +2341,10 @@ CONFIG_IOMMU_SUPPORT=y
23402341

23412342
# CONFIG_IOMMU_DEBUGFS is not set
23422343
# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
2343-
# CONFIG_AMD_IOMMU is not set
2344-
CONFIG_DMAR_TABLE=y
2345-
CONFIG_INTEL_IOMMU=y
2346-
CONFIG_INTEL_IOMMU_SVM=y
2347-
CONFIG_INTEL_IOMMU_DEFAULT_ON=y
2348-
CONFIG_INTEL_IOMMU_FLOPPY_WA=y
2349-
# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
2344+
CONFIG_IOMMU_DMA=y
2345+
CONFIG_AMD_IOMMU=y
2346+
CONFIG_AMD_IOMMU_V2=y
2347+
# CONFIG_INTEL_IOMMU is not set
23502348
# CONFIG_IRQ_REMAP is not set
23512349

23522350
#
@@ -2631,7 +2629,6 @@ CONFIG_IO_WQ=y
26312629
# CONFIG_SECURITY_DMESG_RESTRICT is not set
26322630
CONFIG_SECURITYFS=y
26332631
CONFIG_PAGE_TABLE_ISOLATION=y
2634-
# CONFIG_INTEL_TXT is not set
26352632
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
26362633
CONFIG_HARDENED_USERCOPY=y
26372634
CONFIG_HARDENED_USERCOPY_FALLBACK=y

‎config/linux-kgpe-d16_server.config

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ CONFIG_IRQ_DOMAIN=y
6262
CONFIG_IRQ_DOMAIN_HIERARCHY=y
6363
CONFIG_GENERIC_MSI_IRQ=y
6464
CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
65+
CONFIG_IRQ_MSI_IOMMU=y
6566
CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
6667
CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
6768
CONFIG_IRQ_FORCED_THREADING=y
@@ -248,7 +249,6 @@ CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
248249
CONFIG_ZONE_DMA32=y
249250
CONFIG_AUDIT_ARCH=y
250251
CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
251-
CONFIG_HAVE_INTEL_TXT=y
252252
CONFIG_X86_64_SMP=y
253253
CONFIG_ARCH_SUPPORTS_UPROBES=y
254254
CONFIG_FIX_EARLYCON_MEM=y
@@ -431,6 +431,8 @@ CONFIG_CPU_FREQ_GOV_ATTR_SET=y
431431
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
432432
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
433433
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
434+
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
435+
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
434436
# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
435437
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
436438
# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
@@ -442,7 +444,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
442444
#
443445
# CPU frequency scaling drivers
444446
#
445-
CONFIG_X86_INTEL_PSTATE=y
447+
# CONFIG_X86_INTEL_PSTATE is not set
446448
# CONFIG_X86_PCC_CPUFREQ is not set
447449
# CONFIG_X86_ACPI_CPUFREQ is not set
448450
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
@@ -1006,9 +1008,9 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
10061008

10071009
# CONFIG_SENSORS_LIS3_I2C is not set
10081010
# CONFIG_ALTERA_STAPL is not set
1009-
CONFIG_INTEL_MEI=m
1010-
CONFIG_INTEL_MEI_ME=m
1011-
CONFIG_INTEL_MEI_TXE=m
1011+
# CONFIG_INTEL_MEI is not set
1012+
# CONFIG_INTEL_MEI_ME is not set
1013+
# CONFIG_INTEL_MEI_TXE is not set
10121014
# CONFIG_VMWARE_VMCI is not set
10131015
# CONFIG_GENWQE is not set
10141016
# CONFIG_ECHO is not set
@@ -1474,7 +1476,7 @@ CONFIG_DEVPORT=y
14741476
# CONFIG_HPET is not set
14751477
# CONFIG_HANGCHECK_TIMER is not set
14761478
CONFIG_TCG_TPM=y
1477-
CONFIG_HW_RANDOM_TPM=n
1479+
# CONFIG_HW_RANDOM_TPM is not set
14781480
CONFIG_TCG_TIS_CORE=y
14791481
CONFIG_TCG_TIS=y
14801482
# CONFIG_TCG_TIS_I2C_ATMEL is not set
@@ -2329,7 +2331,6 @@ CONFIG_MAILBOX=y
23292331
CONFIG_PCC=y
23302332
# CONFIG_ALTERA_MBOX is not set
23312333
CONFIG_IOMMU_IOVA=y
2332-
CONFIG_IOASID=y
23332334
CONFIG_IOMMU_API=y
23342335
CONFIG_IOMMU_SUPPORT=y
23352336

@@ -2340,13 +2341,10 @@ CONFIG_IOMMU_SUPPORT=y
23402341

23412342
# CONFIG_IOMMU_DEBUGFS is not set
23422343
# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
2343-
# CONFIG_AMD_IOMMU is not set
2344-
CONFIG_DMAR_TABLE=y
2345-
CONFIG_INTEL_IOMMU=y
2346-
CONFIG_INTEL_IOMMU_SVM=y
2347-
CONFIG_INTEL_IOMMU_DEFAULT_ON=y
2348-
CONFIG_INTEL_IOMMU_FLOPPY_WA=y
2349-
# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
2344+
CONFIG_IOMMU_DMA=y
2345+
CONFIG_AMD_IOMMU=y
2346+
CONFIG_AMD_IOMMU_V2=y
2347+
# CONFIG_INTEL_IOMMU is not set
23502348
# CONFIG_IRQ_REMAP is not set
23512349

23522350
#
@@ -2631,7 +2629,6 @@ CONFIG_IO_WQ=y
26312629
# CONFIG_SECURITY_DMESG_RESTRICT is not set
26322630
CONFIG_SECURITYFS=y
26332631
CONFIG_PAGE_TABLE_ISOLATION=y
2634-
# CONFIG_INTEL_TXT is not set
26352632
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
26362633
CONFIG_HARDENED_USERCOPY=y
26372634
CONFIG_HARDENED_USERCOPY_FALLBACK=y

‎config/linux-kgpe-d16_workstation.config

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ CONFIG_IRQ_DOMAIN=y
6262
CONFIG_IRQ_DOMAIN_HIERARCHY=y
6363
CONFIG_GENERIC_MSI_IRQ=y
6464
CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
65+
CONFIG_IRQ_MSI_IOMMU=y
6566
CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
6667
CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
6768
CONFIG_IRQ_FORCED_THREADING=y
@@ -248,7 +249,6 @@ CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
248249
CONFIG_ZONE_DMA32=y
249250
CONFIG_AUDIT_ARCH=y
250251
CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
251-
CONFIG_HAVE_INTEL_TXT=y
252252
CONFIG_X86_64_SMP=y
253253
CONFIG_ARCH_SUPPORTS_UPROBES=y
254254
CONFIG_FIX_EARLYCON_MEM=y
@@ -431,6 +431,8 @@ CONFIG_CPU_FREQ_GOV_ATTR_SET=y
431431
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
432432
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
433433
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
434+
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
435+
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
434436
# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
435437
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
436438
# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
@@ -442,7 +444,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
442444
#
443445
# CPU frequency scaling drivers
444446
#
445-
CONFIG_X86_INTEL_PSTATE=y
447+
# CONFIG_X86_INTEL_PSTATE is not set
446448
# CONFIG_X86_PCC_CPUFREQ is not set
447449
# CONFIG_X86_ACPI_CPUFREQ is not set
448450
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
@@ -1006,9 +1008,9 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
10061008

10071009
# CONFIG_SENSORS_LIS3_I2C is not set
10081010
# CONFIG_ALTERA_STAPL is not set
1009-
CONFIG_INTEL_MEI=m
1010-
CONFIG_INTEL_MEI_ME=m
1011-
CONFIG_INTEL_MEI_TXE=m
1011+
# CONFIG_INTEL_MEI is not set
1012+
# CONFIG_INTEL_MEI_ME is not set
1013+
# CONFIG_INTEL_MEI_TXE is not set
10121014
# CONFIG_VMWARE_VMCI is not set
10131015
# CONFIG_GENWQE is not set
10141016
# CONFIG_ECHO is not set
@@ -1474,7 +1476,7 @@ CONFIG_DEVPORT=y
14741476
# CONFIG_HPET is not set
14751477
# CONFIG_HANGCHECK_TIMER is not set
14761478
CONFIG_TCG_TPM=y
1477-
CONFIG_HW_RANDOM_TPM=n
1479+
# CONFIG_HW_RANDOM_TPM is not set
14781480
CONFIG_TCG_TIS_CORE=y
14791481
CONFIG_TCG_TIS=y
14801482
# CONFIG_TCG_TIS_I2C_ATMEL is not set
@@ -2577,7 +2579,6 @@ CONFIG_MAILBOX=y
25772579
CONFIG_PCC=y
25782580
# CONFIG_ALTERA_MBOX is not set
25792581
CONFIG_IOMMU_IOVA=y
2580-
CONFIG_IOASID=y
25812582
CONFIG_IOMMU_API=y
25822583
CONFIG_IOMMU_SUPPORT=y
25832584

@@ -2588,13 +2589,10 @@ CONFIG_IOMMU_SUPPORT=y
25882589

25892590
# CONFIG_IOMMU_DEBUGFS is not set
25902591
# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
2591-
# CONFIG_AMD_IOMMU is not set
2592-
CONFIG_DMAR_TABLE=y
2593-
CONFIG_INTEL_IOMMU=y
2594-
CONFIG_INTEL_IOMMU_SVM=y
2595-
CONFIG_INTEL_IOMMU_DEFAULT_ON=y
2596-
CONFIG_INTEL_IOMMU_FLOPPY_WA=y
2597-
# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
2592+
CONFIG_IOMMU_DMA=y
2593+
CONFIG_AMD_IOMMU=y
2594+
CONFIG_AMD_IOMMU_V2=y
2595+
# CONFIG_INTEL_IOMMU is not set
25982596
# CONFIG_IRQ_REMAP is not set
25992597

26002598
#
@@ -2879,7 +2877,6 @@ CONFIG_IO_WQ=y
28792877
# CONFIG_SECURITY_DMESG_RESTRICT is not set
28802878
CONFIG_SECURITYFS=y
28812879
CONFIG_PAGE_TABLE_ISOLATION=y
2882-
# CONFIG_INTEL_TXT is not set
28832880
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
28842881
CONFIG_HARDENED_USERCOPY=y
28852882
CONFIG_HARDENED_USERCOPY_FALLBACK=y

0 commit comments

Comments
 (0)