diff options
Diffstat (limited to 'debian/patches/features')
2 files changed, 18 insertions, 19 deletions
diff --git a/debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch b/debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch index 824092bcd..fedbab5d7 100644 --- a/debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch +++ b/debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch @@ -18,7 +18,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> @@ -57,13 +57,24 @@ config INTEL_IOMMU_SVM to access DMA resources through process address space by means of a Process Address Space ID (PASID). - + -config INTEL_IOMMU_DEFAULT_ON - bool "Enable Intel DMA Remapping Devices by default" - default y @@ -43,29 +43,28 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> + bool "Disable" + +endchoice - + config INTEL_IOMMU_FLOPPY_WA def_bool y --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c -@@ -218,14 +218,14 @@ static LIST_HEAD(dmar_satc_units); - +@@ -218,13 +218,13 @@ static LIST_HEAD(dmar_satc_units); + static void intel_iommu_domain_free(struct iommu_domain *domain); - + -int dmar_disabled = !IS_ENABLED(CONFIG_INTEL_IOMMU_DEFAULT_ON); +int dmar_disabled = IS_ENABLED(CONFIG_INTEL_IOMMU_DEFAULT_OFF); int intel_iommu_sm = IS_ENABLED(CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON); - + int intel_iommu_enabled = 0; EXPORT_SYMBOL_GPL(intel_iommu_enabled); - - static int dmar_map_gfx = 1; + -static int dmar_map_intgpu = 1; +static int dmar_map_intgpu = IS_ENABLED(CONFIG_INTEL_IOMMU_DEFAULT_ON); static int intel_iommu_superpage = 1; static int iommu_identity_mapping; static int iommu_skip_te_disable; -@@ -264,6 +264,7 @@ static int __init intel_iommu_setup(char *str) +@@ -263,6 +263,7 @@ static int __init intel_iommu_setup(char while (*str) { if (!strncmp(str, "on", 2)) { dmar_disabled = 0; diff --git a/debian/patches/features/x86/intel-iommu-add-option-to-exclude-integrated-gpu-only.patch b/debian/patches/features/x86/intel-iommu-add-option-to-exclude-integrated-gpu-only.patch index 3b88cf7ed..8c82cce24 100644 --- a/debian/patches/features/x86/intel-iommu-add-option-to-exclude-integrated-gpu-only.patch +++ b/debian/patches/features/x86/intel-iommu-add-option-to-exclude-integrated-gpu-only.patch @@ -43,24 +43,24 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> #define IS_USB_DEVICE(pdev) ((pdev->class >> 8) == PCI_CLASS_SERIAL_USB) #define IS_ISA_DEVICE(pdev) ((pdev->class >> 8) == PCI_CLASS_BRIDGE_ISA) #define IS_AZALIA(pdev) ((pdev)->vendor == 0x8086 && (pdev)->device == 0x3a3e) -@@ -222,12 +225,14 @@ int intel_iommu_enabled = 0; +@@ -221,12 +224,14 @@ int intel_iommu_sm = IS_ENABLED(CONFIG_I + int intel_iommu_enabled = 0; EXPORT_SYMBOL_GPL(intel_iommu_enabled); - static int dmar_map_gfx = 1; +static int dmar_map_intgpu = 1; static int intel_iommu_superpage = 1; static int iommu_identity_mapping; static int iommu_skip_te_disable; + static int disable_igfx_iommu; - #define IDENTMAP_GFX 2 #define IDENTMAP_AZALIA 4 +#define IDENTMAP_INTGPU 8 const struct iommu_ops intel_iommu_ops; static const struct iommu_dirty_ops intel_dirty_ops; -@@ -267,6 +272,9 @@ static int __init intel_iommu_setup(char *str) +@@ -266,6 +271,9 @@ static int __init intel_iommu_setup(char } else if (!strncmp(str, "igfx_off", 8)) { - dmar_map_gfx = 0; + disable_igfx_iommu = 1; pr_info("Disable GFX device mapping\n"); + } else if (!strncmp(str, "intgpu_off", 10)) { + dmar_map_intgpu = 0; @@ -68,9 +68,9 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> } else if (!strncmp(str, "forcedac", 8)) { pr_warn("intel_iommu=forcedac deprecated; use iommu.forcedac instead\n"); iommu_dma_forcedac = true; -@@ -2405,6 +2413,9 @@ static int device_def_domain_type(struct device *dev) +@@ -2401,6 +2409,9 @@ static int device_def_domain_type(struct - if ((iommu_identity_mapping & IDENTMAP_GFX) && IS_GFX_DEVICE(pdev)) + if ((iommu_identity_mapping & IDENTMAP_AZALIA) && IS_AZALIA(pdev)) return IOMMU_DOMAIN_IDENTITY; + + if ((iommu_identity_mapping & IDENTMAP_INTGPU) && IS_INTGPU_DEVICE(pdev)) @@ -78,9 +78,9 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> } return 0; -@@ -2708,6 +2719,9 @@ static int __init init_dmars(void) - if (!dmar_map_gfx) - iommu_identity_mapping |= IDENTMAP_GFX; +@@ -2701,6 +2712,9 @@ static int __init init_dmars(void) + iommu_set_root_entry(iommu); + } + if (!dmar_map_intgpu) + iommu_identity_mapping |= IDENTMAP_INTGPU; |