From 4888d9f80dc17528691ededb23de42e8d35ee07f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 19 Apr 2023 11:26:11 +0200 Subject: [PATCH] dropped queue-5.15/riscv-do-not-set-initial_boot_params-to-the-linear-address-of-the-dtb.patch --- ...ams-to-the-linear-address-of-the-dtb.patch | 36 ------------------- queue-5.15/series | 1 - 2 files changed, 37 deletions(-) delete mode 100644 queue-5.15/riscv-do-not-set-initial_boot_params-to-the-linear-address-of-the-dtb.patch diff --git a/queue-5.15/riscv-do-not-set-initial_boot_params-to-the-linear-address-of-the-dtb.patch b/queue-5.15/riscv-do-not-set-initial_boot_params-to-the-linear-address-of-the-dtb.patch deleted file mode 100644 index 43965b9262b..00000000000 --- a/queue-5.15/riscv-do-not-set-initial_boot_params-to-the-linear-address-of-the-dtb.patch +++ /dev/null @@ -1,36 +0,0 @@ -From f1581626071c8e37c58c5e8f0b4126b17172a211 Mon Sep 17 00:00:00 2001 -From: Alexandre Ghiti -Date: Wed, 29 Mar 2023 10:19:31 +0200 -Subject: riscv: Do not set initial_boot_params to the linear address of the dtb - -From: Alexandre Ghiti - -commit f1581626071c8e37c58c5e8f0b4126b17172a211 upstream. - -early_init_dt_verify() is already called in parse_dtb() and since the dtb -address does not change anymore (it is now in the fixmap region), no need -to reset initial_boot_params by calling early_init_dt_verify() again. - -Signed-off-by: Alexandre Ghiti -Link: https://lore.kernel.org/r/20230329081932.79831-3-alexghiti@rivosinc.com -Cc: stable@vger.kernel.org -Signed-off-by: Palmer Dabbelt -Signed-off-by: Greg Kroah-Hartman ---- - arch/riscv/kernel/setup.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - ---- a/arch/riscv/kernel/setup.c -+++ b/arch/riscv/kernel/setup.c -@@ -286,10 +286,7 @@ void __init setup_arch(char **cmdline_p) - #if IS_ENABLED(CONFIG_BUILTIN_DTB) - unflatten_and_copy_device_tree(); - #else -- if (early_init_dt_verify(__va(XIP_FIXUP(dtb_early_pa)))) -- unflatten_device_tree(); -- else -- pr_err("No DTB found in kernel mappings\n"); -+ unflatten_device_tree(); - #endif - early_init_fdt_scan_reserved_mem(); - misc_mem_init(); diff --git a/queue-5.15/series b/queue-5.15/series index 14a01007a29..7c7df19d65a 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -54,7 +54,6 @@ tracing-add-trace_array_puts-to-write-into-instance.patch tracing-have-tracing_snapshot_instance_cond-write-er.patch i915-perf-replace-drm_debug-with-driver-specific-drm.patch drm-i915-fix-race-condition-uaf-in-i915_perf_add_con.patch -riscv-do-not-set-initial_boot_params-to-the-linear-address-of-the-dtb.patch riscv-add-icache-flush-for-nommu-sigreturn-trampoline.patch net-sfp-initialize-sfp-i2c_block_size-at-sfp-allocation.patch net-phy-nxp-c45-tja11xx-add-remove-callback.patch -- 2.47.3