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

Commit 50d25bdc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xtensa-20181115' of git://github.com/jcmvbkbc/linux-xtensa 

Pull Xtensa fixes from Max Filippov:

 - fix stack alignment for bFLT binaries.

 - fix physical-to-virtual address translation for boot parameters in
   MMUv3 256+256 and 512+512 virtual memory layouts.

* tag 'xtensa-20181115' of git://github.com/jcmvbkbc/linux-xtensa:
  xtensa: fix boot parameters address translation
  xtensa: make sure bFLT stack is 16 byte aligned
parents 59749c2d 40dc948f

arch/xtensa/include/asm/processor.h

+5 −1
Original line number Diff line number Diff line
@@ -23,7 +23,11 @@ 
# error Linux requires the Xtensa Windowed Registers Option.

#endif



#define ARCH_SLAB_MINALIGN	XCHAL_DATA_WIDTH

/* Xtensa ABI requires stack alignment to be at least 16 */



#define STACK_ALIGN (XCHAL_DATA_WIDTH > 16 ? XCHAL_DATA_WIDTH : 16)



#define ARCH_SLAB_MINALIGN STACK_ALIGN



/*

 * User space process size: 1 GB.

arch/xtensa/kernel/head.S

+5 −2
Original line number Diff line number Diff line
@@ -88,9 +88,12 @@ _SetupMMU: 
	initialize_mmu

#if defined(CONFIG_MMU) && XCHAL_HAVE_PTP_MMU && XCHAL_HAVE_SPANNING_WAY

	rsr	a2, excsave1

	movi	a3, 0x08000000

	movi	a3, XCHAL_KSEG_PADDR

	bltu	a2, a3, 1f

	sub	a2, a2, a3

	movi	a3, XCHAL_KSEG_SIZE

	bgeu	a2, a3, 1f

	movi	a3, 0xd0000000

	movi	a3, XCHAL_KSEG_CACHED_VADDR

	add	a2, a2, a3

	wsr	a2, excsave1

1: