From: Greg Kroah-Hartman Date: Wed, 3 Jan 2024 10:40:24 +0000 (+0100) Subject: 5.10-stable patches X-Git-Tag: v5.10.206~11 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ecd482fb35ef0f7572b66ce5c7447fffe92fe7b;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: revert-mips-loongson64-enable-dma-noncoherent-support.patch --- diff --git a/queue-5.10/revert-mips-loongson64-enable-dma-noncoherent-support.patch b/queue-5.10/revert-mips-loongson64-enable-dma-noncoherent-support.patch new file mode 100644 index 00000000000..13c547467ea --- /dev/null +++ b/queue-5.10/revert-mips-loongson64-enable-dma-noncoherent-support.patch @@ -0,0 +1,81 @@ +From d8f0f32f9b689d64386805e16d2f7ac8eff134a5 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Wed, 3 Jan 2024 11:38:58 +0100 +Subject: Revert "MIPS: Loongson64: Enable DMA noncoherent support" + +From: Greg Kroah-Hartman + +This reverts commit 3ee7e2faef87594228eb2622f8c25c0495ea50a1 which is +commit edc0378eee00200a5bedf1bb9f00ad390e0d1bd4 upstream. + +There are reports of this causing build issues, so revert it from the +5.10.y tree for now. + +Reported-by: Salvatore Bonaccorso +Link: https://lore.kernel.org/r/ZZE1X8m5PXJExffG@eldamar.lan +Cc: Jiaxun Yang +Cc: Thomas Bogendoerfer +Signed-off-by: Greg Kroah-Hartman +--- + arch/mips/Kconfig | 2 -- + arch/mips/include/asm/mach-loongson64/boot_param.h | 3 +-- + arch/mips/loongson64/env.c | 10 +--------- + 3 files changed, 2 insertions(+), 13 deletions(-) + +--- a/arch/mips/Kconfig ++++ b/arch/mips/Kconfig +@@ -468,7 +468,6 @@ config MACH_LOONGSON2EF + + config MACH_LOONGSON64 + bool "Loongson 64-bit family of machines" +- select ARCH_DMA_DEFAULT_COHERENT + select ARCH_SPARSEMEM_ENABLE + select ARCH_MIGHT_HAVE_PC_PARPORT + select ARCH_MIGHT_HAVE_PC_SERIO +@@ -1380,7 +1379,6 @@ config CPU_LOONGSON64 + select CPU_SUPPORTS_MSA + select CPU_DIEI_BROKEN if !LOONGSON3_ENHANCEMENT + select CPU_MIPSR2_IRQ_VI +- select DMA_NONCOHERENT + select WEAK_ORDERING + select WEAK_REORDERING_BEYOND_LLSC + select MIPS_ASID_BITS_VARIABLE +--- a/arch/mips/include/asm/mach-loongson64/boot_param.h ++++ b/arch/mips/include/asm/mach-loongson64/boot_param.h +@@ -117,8 +117,7 @@ struct irq_source_routing_table { + u64 pci_io_start_addr; + u64 pci_io_end_addr; + u64 pci_config_addr; +- u16 dma_mask_bits; +- u16 dma_noncoherent; ++ u32 dma_mask_bits; + } __packed; + + struct interface_info { +--- a/arch/mips/loongson64/env.c ++++ b/arch/mips/loongson64/env.c +@@ -13,8 +13,6 @@ + * Copyright (C) 2009 Lemote Inc. + * Author: Wu Zhangjin, wuzhangjin@gmail.com + */ +- +-#include + #include + #include + #include +@@ -133,14 +131,8 @@ void __init prom_init_env(void) + loongson_sysconf.pci_io_base = eirq_source->pci_io_start_addr; + loongson_sysconf.dma_mask_bits = eirq_source->dma_mask_bits; + if (loongson_sysconf.dma_mask_bits < 32 || +- loongson_sysconf.dma_mask_bits > 64) { ++ loongson_sysconf.dma_mask_bits > 64) + loongson_sysconf.dma_mask_bits = 32; +- dma_default_coherent = true; +- } else { +- dma_default_coherent = !eirq_source->dma_noncoherent; +- } +- +- pr_info("Firmware: Coherent DMA: %s\n", dma_default_coherent ? "on" : "off"); + + loongson_sysconf.restart_addr = boot_p->reset_system.ResetWarm; + loongson_sysconf.poweroff_addr = boot_p->reset_system.Shutdown; diff --git a/queue-5.10/series b/queue-5.10/series index bd240796ec2..120da5f45df 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -70,3 +70,4 @@ tracing-fix-blocked-reader-of-snapshot-buffer.patch netfilter-nf_tables-skip-set-commit-for-deleted-destroyed-sets.patch dm-integrity-don-t-modify-bio-s-immutable-bio_vec-in-integrity_metadata.patch tracing-kprobes-return-eaddrnotavail-when-func-matches-several-symbols.patch +revert-mips-loongson64-enable-dma-noncoherent-support.patch