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

Commit 73711563 authored by Max Filippov's avatar Max Filippov Committed by Greg Kroah-Hartman
Browse files

xtensa: move XCHAL_KIO_* definitions to kmem_layout.h 



[ Upstream commit 6591685d50043f615a1ad7ddd5bb263ef54808fc ]

These address and size definitions define xtensa kernel memory layout,
move them from vectors.h to the kmem_layout.h

Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c82cffe1

arch/xtensa/include/asm/kmem_layout.h

+29 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#ifndef _XTENSA_KMEM_LAYOUT_H

#define _XTENSA_KMEM_LAYOUT_H



#include <asm/core.h>

#include <asm/types.h>



#ifdef CONFIG_MMU
@@ -65,6 +66,34 @@ 


#endif



/* KIO definition */



#if XCHAL_HAVE_PTP_MMU

#define XCHAL_KIO_CACHED_VADDR		0xe0000000

#define XCHAL_KIO_BYPASS_VADDR		0xf0000000

#define XCHAL_KIO_DEFAULT_PADDR		0xf0000000

#else

#define XCHAL_KIO_BYPASS_VADDR		XCHAL_KIO_PADDR

#define XCHAL_KIO_DEFAULT_PADDR		0x90000000

#endif

#define XCHAL_KIO_SIZE			0x10000000



#if (!XCHAL_HAVE_PTP_MMU || XCHAL_HAVE_SPANNING_WAY) && defined(CONFIG_OF)

#define XCHAL_KIO_PADDR			xtensa_get_kio_paddr()

#ifndef __ASSEMBLY__

extern unsigned long xtensa_kio_paddr;



static inline unsigned long xtensa_get_kio_paddr(void)

{

	return xtensa_kio_paddr;

}

#endif

#else

#define XCHAL_KIO_PADDR			XCHAL_KIO_DEFAULT_PADDR

#endif



/* KERNEL_STACK definition */



#ifndef CONFIG_KASAN

#define KERNEL_STACK_SHIFT	13

#else

arch/xtensa/include/asm/vectors.h

+3 −39
Original line number Diff line number Diff line
@@ -21,50 +21,14 @@ 
#include <asm/core.h>

#include <asm/kmem_layout.h>



#if XCHAL_HAVE_PTP_MMU

#define XCHAL_KIO_CACHED_VADDR		0xe0000000

#define XCHAL_KIO_BYPASS_VADDR		0xf0000000

#define XCHAL_KIO_DEFAULT_PADDR		0xf0000000

#else

#define XCHAL_KIO_BYPASS_VADDR		XCHAL_KIO_PADDR

#define XCHAL_KIO_DEFAULT_PADDR		0x90000000

#endif

#define XCHAL_KIO_SIZE			0x10000000



#if (!XCHAL_HAVE_PTP_MMU || XCHAL_HAVE_SPANNING_WAY) && defined(CONFIG_OF)

#define XCHAL_KIO_PADDR			xtensa_get_kio_paddr()

#ifndef __ASSEMBLY__

extern unsigned long xtensa_kio_paddr;



static inline unsigned long xtensa_get_kio_paddr(void)

{

	return xtensa_kio_paddr;

}

#endif

#else

#define XCHAL_KIO_PADDR			XCHAL_KIO_DEFAULT_PADDR

#endif



#if defined(CONFIG_MMU)



#if XCHAL_HAVE_PTP_MMU && XCHAL_HAVE_SPANNING_WAY

/* Image Virtual Start Address */

#define KERNELOFFSET			(XCHAL_KSEG_CACHED_VADDR + \

					 CONFIG_KERNEL_LOAD_ADDRESS - \

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

#define KERNELOFFSET			(CONFIG_KERNEL_LOAD_ADDRESS + \

					 XCHAL_KSEG_CACHED_VADDR - \

					 XCHAL_KSEG_PADDR)

#else

#define KERNELOFFSET			CONFIG_KERNEL_LOAD_ADDRESS

#endif



#else /* !defined(CONFIG_MMU) */

  /* MMU Not being used - Virtual == Physical */



/* Location of the start of the kernel text, _start */

#define KERNELOFFSET			CONFIG_KERNEL_LOAD_ADDRESS





#endif /* CONFIG_MMU */



#define RESET_VECTOR1_VADDR		(XCHAL_RESET_VECTOR1_VADDR)

#ifdef CONFIG_VECTORS_OFFSET

#define VECBASE_VADDR			(KERNELOFFSET - CONFIG_VECTORS_OFFSET)