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

Commit fae1aa4a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: IP32: Update defconfig
  MIPS: Add missing calls to plat_unmap_dma_mem.
  MIPS: Kconfig: Fix the arch-specific header path
  MIPS: Use EI/DI for MIPS R2.
parents 1c55f187 6d8a52d7

arch/mips/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ config RUNTIME_DEBUG 
	help

	  If you say Y here, some debugging macros will do run-time checking.

	  If you say N here, those macros will mostly turn to no-ops.  See

	  include/asm-mips/debug.h for debuging macros.

	  arch/mips/include/asm/debug.h for debugging macros.

	  If unsure, say N.



endmenu

arch/mips/configs/ip32_defconfig

+624 −436

File changed.

Preview size limit exceeded, changes collapsed.

arch/mips/include/asm/asmmacro.h

+10 −0
Original line number Diff line number Diff line
@@ -35,6 +35,16 @@ 
	mtc0	\reg, CP0_TCSTATUS

	_ehb

	.endm

#elif defined(CONFIG_CPU_MIPSR2)

	.macro	local_irq_enable reg=t0

	ei

	irq_enable_hazard

	.endm



	.macro	local_irq_disable reg=t0

	di

	irq_disable_hazard

	.endm

#else

	.macro	local_irq_enable reg=t0

	mfc0	\reg, CP0_STATUS

arch/mips/mm/dma-default.c

+3 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ EXPORT_SYMBOL(dma_alloc_coherent); 
void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr,

	dma_addr_t dma_handle)

{

	plat_unmap_dma_mem(dma_handle);

	free_pages((unsigned long) vaddr, get_order(size));

}
@@ -121,6 +122,8 @@ void dma_free_coherent(struct device *dev, size_t size, void *vaddr, 
{

	unsigned long addr = (unsigned long) vaddr;



	plat_unmap_dma_mem(dma_handle);



	if (!plat_device_is_coherent(dev))

		addr = CAC_ADDR(addr);