mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 21:33:52 +00:00
Revert "MIPS: Loongson64: Enable DMA noncoherent support"
This reverts commit3ee7e2faef
which is commitedc0378eee
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@debian.org> Link: https://lore.kernel.org/r/ZZE1X8m5PXJExffG@eldamar.lan Cc: Jiaxun Yang <jiaxun.yang@flygoat.com> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
9175341bd8
commit
ecd50f820d
3 changed files with 2 additions and 13 deletions
|
@ -468,7 +468,6 @@ config MACH_LOONGSON2EF
|
||||||
|
|
||||||
config MACH_LOONGSON64
|
config MACH_LOONGSON64
|
||||||
bool "Loongson 64-bit family of machines"
|
bool "Loongson 64-bit family of machines"
|
||||||
select ARCH_DMA_DEFAULT_COHERENT
|
|
||||||
select ARCH_SPARSEMEM_ENABLE
|
select ARCH_SPARSEMEM_ENABLE
|
||||||
select ARCH_MIGHT_HAVE_PC_PARPORT
|
select ARCH_MIGHT_HAVE_PC_PARPORT
|
||||||
select ARCH_MIGHT_HAVE_PC_SERIO
|
select ARCH_MIGHT_HAVE_PC_SERIO
|
||||||
|
@ -1380,7 +1379,6 @@ config CPU_LOONGSON64
|
||||||
select CPU_SUPPORTS_MSA
|
select CPU_SUPPORTS_MSA
|
||||||
select CPU_DIEI_BROKEN if !LOONGSON3_ENHANCEMENT
|
select CPU_DIEI_BROKEN if !LOONGSON3_ENHANCEMENT
|
||||||
select CPU_MIPSR2_IRQ_VI
|
select CPU_MIPSR2_IRQ_VI
|
||||||
select DMA_NONCOHERENT
|
|
||||||
select WEAK_ORDERING
|
select WEAK_ORDERING
|
||||||
select WEAK_REORDERING_BEYOND_LLSC
|
select WEAK_REORDERING_BEYOND_LLSC
|
||||||
select MIPS_ASID_BITS_VARIABLE
|
select MIPS_ASID_BITS_VARIABLE
|
||||||
|
|
|
@ -117,8 +117,7 @@ struct irq_source_routing_table {
|
||||||
u64 pci_io_start_addr;
|
u64 pci_io_start_addr;
|
||||||
u64 pci_io_end_addr;
|
u64 pci_io_end_addr;
|
||||||
u64 pci_config_addr;
|
u64 pci_config_addr;
|
||||||
u16 dma_mask_bits;
|
u32 dma_mask_bits;
|
||||||
u16 dma_noncoherent;
|
|
||||||
} __packed;
|
} __packed;
|
||||||
|
|
||||||
struct interface_info {
|
struct interface_info {
|
||||||
|
|
|
@ -13,8 +13,6 @@
|
||||||
* Copyright (C) 2009 Lemote Inc.
|
* Copyright (C) 2009 Lemote Inc.
|
||||||
* Author: Wu Zhangjin, wuzhangjin@gmail.com
|
* Author: Wu Zhangjin, wuzhangjin@gmail.com
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/dma-map-ops.h>
|
|
||||||
#include <linux/export.h>
|
#include <linux/export.h>
|
||||||
#include <linux/pci_ids.h>
|
#include <linux/pci_ids.h>
|
||||||
#include <asm/bootinfo.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.pci_io_base = eirq_source->pci_io_start_addr;
|
||||||
loongson_sysconf.dma_mask_bits = eirq_source->dma_mask_bits;
|
loongson_sysconf.dma_mask_bits = eirq_source->dma_mask_bits;
|
||||||
if (loongson_sysconf.dma_mask_bits < 32 ||
|
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;
|
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.restart_addr = boot_p->reset_system.ResetWarm;
|
||||||
loongson_sysconf.poweroff_addr = boot_p->reset_system.Shutdown;
|
loongson_sysconf.poweroff_addr = boot_p->reset_system.Shutdown;
|
||||||
|
|
Loading…
Reference in a new issue