This is a note to let you know that I've just added the patch titled
Revert "MIPS: Loongson64: Enable DMA noncoherent support"
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-mips-loongson64-enable-dma-noncoherent-support.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From d8f0f32f9b689d64386805e16d2f7ac8eff134a5 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Date: Wed, 3 Jan 2024 11:38:58 +0100
Subject: Revert "MIPS: Loongson64: Enable DMA noncoherent support"
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
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 <carnil@xxxxxxxxxx>
Link: https://lore.kernel.org/r/ZZE1X8m5PXJExffG@xxxxxxxxxxx
Cc: Jiaxun Yang <jiaxun.yang@xxxxxxxxxxx>
Cc: Thomas Bogendoerfer <tsbogend@xxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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@xxxxxxxxx
*/
-
-#include <linux/dma-map-ops.h>
#include <linux/export.h>
#include <linux/pci_ids.h>
#include <asm/bootinfo.h>
@@ -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;
Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are
queue-5.10/ring-buffer-fix-wake-ups-when-buffer_percent-is-set-to-100.patch
queue-5.10/tracing-synthetic-disable-events-after-testing-in-synth_event_gen_test_init.patch
queue-5.10/tracing-kprobes-return-eaddrnotavail-when-func-matches-several-symbols.patch
queue-5.10/net-9p-avoid-freeing-uninit-memory-in-p9pdu_vreadf.patch
queue-5.10/wifi-cfg80211-fix-certs-build-to-not-depend-on-file-order.patch
queue-5.10/input-soc_button_array-add-mapping-for-airplane-mode-button.patch
queue-5.10/bluetooth-hci_event-fix-not-checking-if-hci_op_inquiry-has-been-sent.patch
queue-5.10/usb-serial-option-add-quectel-rm500q-r13-firmware-support.patch
queue-5.10/revert-mips-loongson64-enable-dma-noncoherent-support.patch
queue-5.10/net-rfkill-gpio-set-gpio-direction.patch
queue-5.10/bluetooth-l2cap-send-reject-on-command-corrupted-request.patch
queue-5.10/x86-alternatives-sync-core-before-enabling-interrupts.patch
queue-5.10/wifi-cfg80211-add-my-certificate.patch
queue-5.10/netfilter-nf_tables-skip-set-commit-for-deleted-destroyed-sets.patch
queue-5.10/iio-common-ms_sensors-ms_sensors_i2c-fix-humidity-conversion-time-table.patch
queue-5.10/9p-net-fix-possible-memory-leak-in-p9_check_errors.patch
queue-5.10/usb-serial-option-add-foxconn-t99w265-with-new-baseline.patch
queue-5.10/bus-ti-sysc-flush-posted-write-only-after-srst_udelay.patch
queue-5.10/iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch
queue-5.10/net-ks8851-fix-tx-stall-caused-by-tx-buffer-overrun.patch
queue-5.10/dm-integrity-don-t-modify-bio-s-immutable-bio_vec-in-integrity_metadata.patch
queue-5.10/tracing-fix-blocked-reader-of-snapshot-buffer.patch
queue-5.10/usb-serial-ftdi_sio-update-actisense-pids-constant-names.patch
queue-5.10/usb-serial-option-add-quectel-eg912y-module-support.patch
queue-5.10/usb-fotg210-hcd-delete-an-incorrect-bounds-test.patch
queue-5.10/lib-vsprintf-fix-pfwf-when-current-node-refcount-0.patch
queue-5.10/dt-bindings-nvmem-mxs-ocotp-document-fsl-ocotp.patch
