Commit 927b2d0b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by sanglipeng
Browse files

Revert "MIPS: Loongson64: Enable DMA noncoherent support" 

stable inclusion
from stable-v5.10.206
commit ecd50f820d864c61b97a85492417547f97753d19
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9O5W8

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=ecd50f820d864c61b97a85492417547f97753d19



--------------------------------

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: default avatarSalvatore 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 6b91f40f

arch/mips/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -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
@@ -1377,7 +1376,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

arch/mips/include/asm/mach-loongson64/boot_param.h

+1 −2
Original line number Diff line number Diff line
@@ -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 {

arch/mips/loongson64/env.c

+1 −9
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ 
 * Copyright (C) 2009 Lemote Inc.

 * Author: Wu Zhangjin, wuzhangjin@gmail.com

 */



#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;