mirror of
https://git.proxmox.com/git/pve-kernel
synced 2025-04-29 10:14:17 +00:00
9ecdffc222
Provide a newer – currently – opt-in kernel that will form the base for Ubuntu's 25.04 release. Using the current relevant tag Ubuntu-6.14.0-12.12 (the newer 13.13 tag includes only some packaging changes that do not affect us) from the upstream repo [0]. Update the patches, drop those that got applied upstream or are simply not relevant for the newer kernel anymore. Update the ZFS submodule to include a cherry-pick of the two Linux 6.14 compat patches that already got applied to ZFS upstream [1]. [0]: https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/plucky/ [1]: https://github.com/openzfs/zfs/pull/17026 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: kiler129 <grzegorz@noflash.pl>
|
|
Date: Mon, 18 Sep 2023 15:19:26 +0200
|
|
Subject: [PATCH] allow opt-in to allow pass-through on broken hardware..
|
|
|
|
adapted from https://github.com/kiler129/relax-intel-rmrr , licensed under MIT or GPL 2.0+
|
|
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
drivers/iommu/intel/iommu.c | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
|
|
index b859d7396e7e8a80856e86d50ecffbe181e945c3..7c8f66e29463e82269c4b8893ccd9647cebcacd5 100644
|
|
--- a/drivers/iommu/intel/iommu.c
|
|
+++ b/drivers/iommu/intel/iommu.c
|
|
@@ -218,6 +218,7 @@ EXPORT_SYMBOL_GPL(intel_iommu_enabled);
|
|
static int dmar_map_ipu = 1;
|
|
static int intel_iommu_superpage = 1;
|
|
static int iommu_identity_mapping;
|
|
+static int intel_relaxable_rmrr = 0;
|
|
static int iommu_skip_te_disable;
|
|
static int disable_igfx_iommu;
|
|
|
|
@@ -280,6 +281,9 @@ static int __init intel_iommu_setup(char *str)
|
|
} else if (!strncmp(str, "tboot_noforce", 13)) {
|
|
pr_info("Intel-IOMMU: not forcing on after tboot. This could expose security risk for tboot\n");
|
|
intel_iommu_tboot_noforce = 1;
|
|
+ } else if (!strncmp(str, "relax_rmrr", 10)) {
|
|
+ pr_info("Intel-IOMMU: assuming all RMRRs are relaxable. This can lead to instability or data loss\n");
|
|
+ intel_relaxable_rmrr = 1;
|
|
} else {
|
|
pr_notice("Unknown option - '%s'\n", str);
|
|
}
|
|
@@ -1889,7 +1893,7 @@ static bool device_rmrr_is_relaxable(struct device *dev)
|
|
return false;
|
|
|
|
pdev = to_pci_dev(dev);
|
|
- if (IS_USB_DEVICE(pdev) || IS_GFX_DEVICE(pdev))
|
|
+ if (intel_relaxable_rmrr || IS_USB_DEVICE(pdev) || IS_GFX_DEVICE(pdev))
|
|
return true;
|
|
else
|
|
return false;
|