aboutsummaryrefslogtreecommitdiff
path: root/SOURCES
diff options
context:
space:
mode:
Diffstat (limited to 'SOURCES')
-rw-r--r--SOURCES/kernel-aarch64-debug-fedora.config1
-rw-r--r--SOURCES/kernel-aarch64-debug-rhel.config1
-rw-r--r--SOURCES/kernel-aarch64-fedora.config1
-rw-r--r--SOURCES/kernel-aarch64-rhel.config1
-rw-r--r--SOURCES/kernel-armv7hl-debug-fedora.config1
-rw-r--r--SOURCES/kernel-armv7hl-fedora.config1
-rw-r--r--SOURCES/kernel-armv7hl-lpae-debug-fedora.config1
-rw-r--r--SOURCES/kernel-armv7hl-lpae-fedora.config1
-rw-r--r--SOURCES/patch-5.19-redhat.patch2
-rw-r--r--SOURCES/revert-iommu-recursive-locking.patch139
10 files changed, 5 insertions, 144 deletions
diff --git a/SOURCES/kernel-aarch64-debug-fedora.config b/SOURCES/kernel-aarch64-debug-fedora.config
index bc50b19..0af9c4c 100644
--- a/SOURCES/kernel-aarch64-debug-fedora.config
+++ b/SOURCES/kernel-aarch64-debug-fedora.config
@@ -398,6 +398,7 @@ CONFIG_ARM64_TAGGED_ADDR_ABI=y
CONFIG_ARM64_TLB_RANGE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
# CONFIG_ARM64_VA_BITS_39 is not set
+# CONFIG_ARM64_VA_BITS_47 is not set
CONFIG_ARM64_VA_BITS=48
CONFIG_ARM64_VA_BITS_48=y
CONFIG_ARM64=y
diff --git a/SOURCES/kernel-aarch64-debug-rhel.config b/SOURCES/kernel-aarch64-debug-rhel.config
index 53ef2c7..8a5513f 100644
--- a/SOURCES/kernel-aarch64-debug-rhel.config
+++ b/SOURCES/kernel-aarch64-debug-rhel.config
@@ -322,6 +322,7 @@ CONFIG_ARM64_TAGGED_ADDR_ABI=y
CONFIG_ARM64_TLB_RANGE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
# CONFIG_ARM64_VA_BITS_39 is not set
+# CONFIG_ARM64_VA_BITS_47 is not set
CONFIG_ARM64_VA_BITS_48=y
CONFIG_ARM64=y
CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
diff --git a/SOURCES/kernel-aarch64-fedora.config b/SOURCES/kernel-aarch64-fedora.config
index 282ad39..0a7693b 100644
--- a/SOURCES/kernel-aarch64-fedora.config
+++ b/SOURCES/kernel-aarch64-fedora.config
@@ -398,6 +398,7 @@ CONFIG_ARM64_TAGGED_ADDR_ABI=y
CONFIG_ARM64_TLB_RANGE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
# CONFIG_ARM64_VA_BITS_39 is not set
+# CONFIG_ARM64_VA_BITS_47 is not set
CONFIG_ARM64_VA_BITS=48
CONFIG_ARM64_VA_BITS_48=y
CONFIG_ARM64=y
diff --git a/SOURCES/kernel-aarch64-rhel.config b/SOURCES/kernel-aarch64-rhel.config
index b40fd19..545e07b 100644
--- a/SOURCES/kernel-aarch64-rhel.config
+++ b/SOURCES/kernel-aarch64-rhel.config
@@ -322,6 +322,7 @@ CONFIG_ARM64_TAGGED_ADDR_ABI=y
CONFIG_ARM64_TLB_RANGE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
# CONFIG_ARM64_VA_BITS_39 is not set
+# CONFIG_ARM64_VA_BITS_47 is not set
CONFIG_ARM64_VA_BITS_48=y
CONFIG_ARM64=y
CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
diff --git a/SOURCES/kernel-armv7hl-debug-fedora.config b/SOURCES/kernel-armv7hl-debug-fedora.config
index 9b6e957..3c06fa4 100644
--- a/SOURCES/kernel-armv7hl-debug-fedora.config
+++ b/SOURCES/kernel-armv7hl-debug-fedora.config
@@ -349,7 +349,6 @@ CONFIG_ARCH_VIRT=y
# CONFIG_ARCH_WM8850 is not set
CONFIG_ARCH_ZYNQ=y
# CONFIG_ARCNET is not set
-# CONFIG_ARM64_16K_PAGES is not set
CONFIG_ARM64_AMU_EXTN=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_EPAN=y
diff --git a/SOURCES/kernel-armv7hl-fedora.config b/SOURCES/kernel-armv7hl-fedora.config
index 5211dd1..58f9e2b 100644
--- a/SOURCES/kernel-armv7hl-fedora.config
+++ b/SOURCES/kernel-armv7hl-fedora.config
@@ -349,7 +349,6 @@ CONFIG_ARCH_VIRT=y
# CONFIG_ARCH_WM8850 is not set
CONFIG_ARCH_ZYNQ=y
# CONFIG_ARCNET is not set
-# CONFIG_ARM64_16K_PAGES is not set
CONFIG_ARM64_AMU_EXTN=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_EPAN=y
diff --git a/SOURCES/kernel-armv7hl-lpae-debug-fedora.config b/SOURCES/kernel-armv7hl-lpae-debug-fedora.config
index a3daacc..bdb2ebd 100644
--- a/SOURCES/kernel-armv7hl-lpae-debug-fedora.config
+++ b/SOURCES/kernel-armv7hl-lpae-debug-fedora.config
@@ -341,7 +341,6 @@ CONFIG_ARCH_VIRT=y
# CONFIG_ARCH_WM8850 is not set
# CONFIG_ARCH_ZYNQ is not set
# CONFIG_ARCNET is not set
-# CONFIG_ARM64_16K_PAGES is not set
CONFIG_ARM64_AMU_EXTN=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_EPAN=y
diff --git a/SOURCES/kernel-armv7hl-lpae-fedora.config b/SOURCES/kernel-armv7hl-lpae-fedora.config
index a9bf9a1..97ddca3 100644
--- a/SOURCES/kernel-armv7hl-lpae-fedora.config
+++ b/SOURCES/kernel-armv7hl-lpae-fedora.config
@@ -341,7 +341,6 @@ CONFIG_ARCH_VIRT=y
# CONFIG_ARCH_WM8850 is not set
# CONFIG_ARCH_ZYNQ is not set
# CONFIG_ARCNET is not set
-# CONFIG_ARM64_16K_PAGES is not set
CONFIG_ARM64_AMU_EXTN=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_EPAN=y
diff --git a/SOURCES/patch-5.19-redhat.patch b/SOURCES/patch-5.19-redhat.patch
index 1472d6f..80e5938 100644
--- a/SOURCES/patch-5.19-redhat.patch
+++ b/SOURCES/patch-5.19-redhat.patch
@@ -254,7 +254,7 @@ index 000000000000..733a26bd887a
+
+endmenu
diff --git a/Makefile b/Makefile
-index 33a9b6b547c4..f16045bf3888 100644
+index 01463a22926d..2cb088d25213 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
diff --git a/SOURCES/revert-iommu-recursive-locking.patch b/SOURCES/revert-iommu-recursive-locking.patch
deleted file mode 100644
index 3244352..0000000
--- a/SOURCES/revert-iommu-recursive-locking.patch
+++ /dev/null
@@ -1,139 +0,0 @@
----
- include/linux/dmar.h | 4 +---
- drivers/iommu/intel/dmar.c | 7 -------
- drivers/iommu/intel/iommu.c | 27 +++++++++++++++++++++++++--
- 3 files changed, 26 insertions(+), 12 deletions(-)
-
-diff --git a/include/linux/dmar.h b/include/linux/dmar.h
-index 8917a32173c4..d81a51978d01 100644
---- a/include/linux/dmar.h
-+++ b/include/linux/dmar.h
-@@ -65,7 +65,6 @@ struct dmar_pci_notify_info {
-
- extern struct rw_semaphore dmar_global_lock;
- extern struct list_head dmar_drhd_units;
--extern int intel_iommu_enabled;
-
- #define for_each_drhd_unit(drhd) \
- list_for_each_entry_rcu(drhd, &dmar_drhd_units, list, \
-@@ -89,8 +88,7 @@ extern int intel_iommu_enabled;
- static inline bool dmar_rcu_check(void)
- {
- return rwsem_is_locked(&dmar_global_lock) ||
-- system_state == SYSTEM_BOOTING ||
-- (IS_ENABLED(CONFIG_INTEL_IOMMU) && !intel_iommu_enabled);
-+ system_state == SYSTEM_BOOTING;
- }
-
- #define dmar_rcu_dereference(p) rcu_dereference_check((p), dmar_rcu_check())
-diff --git a/drivers/iommu/intel/dmar.c b/drivers/iommu/intel/dmar.c
-index 04f7991734a9..3528058d253e 100644
---- a/drivers/iommu/intel/dmar.c
-+++ b/drivers/iommu/intel/dmar.c
-@@ -2356,13 +2356,6 @@ static int dmar_device_hotplug(acpi_handle handle, bool insert)
- if (!dmar_in_use())
- return 0;
-
-- /*
-- * It's unlikely that any I/O board is hot added before the IOMMU
-- * subsystem is initialized.
-- */
-- if (IS_ENABLED(CONFIG_INTEL_IOMMU) && !intel_iommu_enabled)
-- return -EOPNOTSUPP;
--
- if (dmar_detect_dsm(handle, DMAR_DSM_FUNC_DRHD)) {
- tmp = handle;
- } else {
-diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
-index c20f3e060bac..5bab71a05830 100644
---- a/drivers/iommu/intel/iommu.c
-+++ b/drivers/iommu/intel/iommu.c
-@@ -3029,7 +3029,13 @@ static int __init init_dmars(void)
-
- #ifdef CONFIG_INTEL_IOMMU_SVM
- if (pasid_supported(iommu) && ecap_prs(iommu->ecap)) {
-+ /*
-+ * Call dmar_alloc_hwirq() with dmar_global_lock held,
-+ * could cause possible lock race condition.
-+ */
-+ up_write(&dmar_global_lock);
- ret = intel_svm_enable_prq(iommu);
-+ down_write(&dmar_global_lock);
- if (ret)
- goto free_iommu;
- }
-@@ -3941,6 +3947,7 @@ int __init intel_iommu_init(void)
- force_on = (!intel_iommu_tboot_noforce && tboot_force_iommu()) ||
- platform_optin_force_iommu();
-
-+ down_write(&dmar_global_lock);
- if (dmar_table_init()) {
- if (force_on)
- panic("tboot: Failed to initialize DMAR table\n");
-@@ -3953,6 +3960,16 @@ int __init intel_iommu_init(void)
- goto out_free_dmar;
- }
-
-+ up_write(&dmar_global_lock);
-+
-+ /*
-+ * The bus notifier takes the dmar_global_lock, so lockdep will
-+ * complain later when we register it under the lock.
-+ */
-+ dmar_register_bus_notifier();
-+
-+ down_write(&dmar_global_lock);
-+
- if (!no_iommu)
- intel_iommu_debugfs_init();
-
-@@ -3997,9 +4014,11 @@ int __init intel_iommu_init(void)
- pr_err("Initialization failed\n");
- goto out_free_dmar;
- }
-+ up_write(&dmar_global_lock);
-
- init_iommu_pm_ops();
-
-+ down_read(&dmar_global_lock);
- for_each_active_iommu(iommu, drhd) {
- /*
- * The flush queue implementation does not perform
-@@ -4137,11 +4137,13 @@
- "%s", iommu->name);
- iommu_device_register(&iommu->iommu, &intel_iommu_ops, NULL);
- }
-+ up_read(&dmar_global_lock);
-
- bus_set_iommu(&pci_bus_type, &intel_iommu_ops);
- if (si_domain && !hw_pass_through)
- register_memory_notifier(&intel_iommu_memory_nb);
-
-+ down_read(&dmar_global_lock);
- if (probe_acpi_namespace_devices())
- pr_warn("ACPI name space devices didn't probe correctly\n");
-
-@@ -4031,15 +4052,17 @@ int __init intel_iommu_init(void)
-
- iommu_disable_protect_mem_regions(iommu);
- }
-+ up_read(&dmar_global_lock);
-
-- intel_iommu_enabled = 1;
-- dmar_register_bus_notifier();
- pr_info("Intel(R) Virtualization Technology for Directed I/O\n");
-
-+ intel_iommu_enabled = 1;
-+
- return 0;
-
- out_free_dmar:
- intel_iommu_free_dmars();
-+ up_write(&dmar_global_lock);
- return ret;
- }
-
---
-2.34.1
-
- \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 11:00:10 +0000