Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit aa4db775 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Paul Burton
Browse files

MIPS: move coherentio setup to setup.c 



We want to be able to use it even when not building dma-default.c
in the near future.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Patchwork: https://patchwork.linux-mips.org/patch/19543/


Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: David Daney <david.daney@cavium.com>
Cc: Kevin Cernekee <cernekee@gmail.com>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: Tom Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Huacai Chen <chenhc@lemote.com>
Cc: iommu@lists.linux-foundation.org
Cc: linux-mips@linux-mips.org
parent 54aed4dd

arch/mips/kernel/setup.c

+24 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <asm/cdmm.h>

#include <asm/cpu.h>

#include <asm/debug.h>

#include <asm/dma-coherence.h>

#include <asm/sections.h>

#include <asm/setup.h>

#include <asm/smp-ops.h>
@@ -1055,3 +1056,26 @@ static int __init debugfs_mips(void) 
}

arch_initcall(debugfs_mips);

#endif



#if defined(CONFIG_DMA_MAYBE_COHERENT) && !defined(CONFIG_DMA_PERDEV_COHERENT)

/* User defined DMA coherency from command line. */

enum coherent_io_user_state coherentio = IO_COHERENCE_DEFAULT;

EXPORT_SYMBOL_GPL(coherentio);

int hw_coherentio = 0;	/* Actual hardware supported DMA coherency setting. */



static int __init setcoherentio(char *str)

{

	coherentio = IO_COHERENCE_ENABLED;

	pr_info("Hardware DMA cache coherency (command line)\n");

	return 0;

}

early_param("coherentio", setcoherentio);



static int __init setnocoherentio(char *str)

{

	coherentio = IO_COHERENCE_DISABLED;

	pr_info("Software DMA cache coherency (command line)\n");

	return 0;

}

early_param("nocoherentio", setnocoherentio);

#endif

arch/mips/mm/dma-default.c

+0 −23
Original line number Diff line number Diff line
@@ -24,29 +24,6 @@ 


#include <dma-coherence.h>



#if defined(CONFIG_DMA_MAYBE_COHERENT) && !defined(CONFIG_DMA_PERDEV_COHERENT)

/* User defined DMA coherency from command line. */

enum coherent_io_user_state coherentio = IO_COHERENCE_DEFAULT;

EXPORT_SYMBOL_GPL(coherentio);

int hw_coherentio = 0;	/* Actual hardware supported DMA coherency setting. */



static int __init setcoherentio(char *str)

{

	coherentio = IO_COHERENCE_ENABLED;

	pr_info("Hardware DMA cache coherency (command line)\n");

	return 0;

}

early_param("coherentio", setcoherentio);



static int __init setnocoherentio(char *str)

{

	coherentio = IO_COHERENCE_DISABLED;

	pr_info("Software DMA cache coherency (command line)\n");

	return 0;

}

early_param("nocoherentio", setnocoherentio);

#endif



static inline struct page *dma_addr_to_page(struct device *dev,

	dma_addr_t dma_addr)

{