Commit acbde1db authored by Chris Metcalf's avatar Chris Metcalf
Browse files

tile: parameterize VA and PA space more cleanly 



The existing code relied on the hardware definition (<arch/chip.h>)
to specify how much VA and PA space was available.  It's convenient
to allow customizing this for some configurations, so provide symbols
MAX_PA_WIDTH and MAX_VA_WIDTH in <asm/page.h> that can be modified
if desired.

Additionally, move away from the MEM_XX_INTRPT nomenclature to
define the start of various regions within the VA space.  In fact
the cleaner symbol is, for example, MEM_SV_START, to indicate the
start of the area used for supervisor code; the actual address of the
interrupt vectors is not as important, and can be changed if desired.
As part of this change, convert from "intrpt1" nomenclature (which
built in the old privilege-level 1 model) to a simple "intrpt".

Also strip out some tilepro-specific code supporting modifying the
PL the kernel could run at, since we don't actually support using
different PLs in tilepro, only tilegx.

Signed-off-by: default avatarChris Metcalf <cmetcalf@tilera.com>
parent 051168df

arch/tile/include/asm/page.h

+21 −31
Original line number Diff line number Diff line
@@ -148,8 +148,12 @@ static inline __attribute_const__ int get_order(unsigned long size) 
#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA

#endif



/* Allow overriding how much VA or PA the kernel will use. */

#define MAX_PA_WIDTH CHIP_PA_WIDTH()

#define MAX_VA_WIDTH CHIP_VA_WIDTH()



/* Each memory controller has PAs distinct in their high bits. */

#define NR_PA_HIGHBIT_SHIFT (CHIP_PA_WIDTH() - CHIP_LOG_NUM_MSHIMS())

#define NR_PA_HIGHBIT_SHIFT (MAX_PA_WIDTH - CHIP_LOG_NUM_MSHIMS())

#define NR_PA_HIGHBIT_VALUES (1 << CHIP_LOG_NUM_MSHIMS())

#define __pa_to_highbits(pa) ((phys_addr_t)(pa) >> NR_PA_HIGHBIT_SHIFT)

#define __pfn_to_highbits(pfn) ((pfn) >> (NR_PA_HIGHBIT_SHIFT - PAGE_SHIFT))
@@ -160,7 +164,7 @@ static inline __attribute_const__ int get_order(unsigned long size) 
 * We reserve the lower half of memory for user-space programs, and the

 * upper half for system code.  We re-map all of physical memory in the

 * upper half, which takes a quarter of our VA space.  Then we have

 * the vmalloc regions.  The supervisor code lives at 0xfffffff700000000,

 * the vmalloc regions.  The supervisor code lives at the highest address,

 * with the hypervisor above that.

 *

 * Loadable kernel modules are placed immediately after the static
@@ -172,26 +176,19 @@ static inline __attribute_const__ int get_order(unsigned long size) 
 * Similarly, for now we don't play any struct page mapping games.

 */



#if CHIP_PA_WIDTH() + 2 > CHIP_VA_WIDTH()

#if MAX_PA_WIDTH + 2 > MAX_VA_WIDTH

# error Too much PA to map with the VA available!

#endif

#define HALF_VA_SPACE           (_AC(1, UL) << (CHIP_VA_WIDTH() - 1))



#define MEM_LOW_END		(HALF_VA_SPACE - 1)         /* low half */

#define MEM_HIGH_START		(-HALF_VA_SPACE)            /* high half */

#define PAGE_OFFSET		MEM_HIGH_START

#define FIXADDR_BASE		_AC(0xfffffff400000000, UL) /* 4 GB */

#define FIXADDR_TOP		_AC(0xfffffff500000000, UL) /* 4 GB */

#define PAGE_OFFSET		(-(_AC(1, UL) << (MAX_VA_WIDTH - 1)))

#define KERNEL_HIGH_VADDR	_AC(0xfffffff800000000, UL)  /* high 32GB */

#define FIXADDR_BASE		(KERNEL_HIGH_VADDR - 0x400000000) /* 4 GB */

#define FIXADDR_TOP		(KERNEL_HIGH_VADDR - 0x300000000) /* 4 GB */

#define _VMALLOC_START		FIXADDR_TOP

#define HUGE_VMAP_BASE		_AC(0xfffffff600000000, UL) /* 4 GB */

#define MEM_SV_START		_AC(0xfffffff700000000, UL) /* 256 MB */

#define MEM_SV_INTRPT		MEM_SV_START

#define MEM_MODULE_START	_AC(0xfffffff710000000, UL) /* 256 MB */

#define HUGE_VMAP_BASE		(KERNEL_HIGH_VADDR - 0x200000000) /* 4 GB */

#define MEM_SV_START		(KERNEL_HIGH_VADDR - 0x100000000) /* 256 MB */

#define MEM_MODULE_START	(MEM_SV_START + (256*1024*1024)) /* 256 MB */

#define MEM_MODULE_END		(MEM_MODULE_START + (256*1024*1024))

#define MEM_HV_START		_AC(0xfffffff800000000, UL) /* 32 GB */



/* Highest DTLB address we will use */

#define KERNEL_HIGH_VADDR	MEM_SV_START



#else /* !__tilegx__ */
@@ -213,25 +210,18 @@ static inline __attribute_const__ int get_order(unsigned long size) 
 * values, and after that, we show "typical" values, since the actual

 * addresses depend on kernel #defines.

 *

 * MEM_HV_INTRPT                   0xfe000000

 * MEM_SV_INTRPT (kernel code)     0xfd000000

 * MEM_HV_START                    0xfe000000

 * MEM_SV_START  (kernel code)     0xfd000000

 * MEM_USER_INTRPT (user vector)   0xfc000000

 * FIX_KMAP_xxx                    0xf8000000 (via NR_CPUS * KM_TYPE_NR)

 * PKMAP_BASE                      0xf7000000 (via LAST_PKMAP)

 * HUGE_VMAP                       0xf3000000 (via CONFIG_NR_HUGE_VMAPS)

 * VMALLOC_START                   0xf0000000 (via __VMALLOC_RESERVE)

 * FIX_KMAP_xxx                    0xfa000000 (via NR_CPUS * KM_TYPE_NR)

 * PKMAP_BASE                      0xf9000000 (via LAST_PKMAP)

 * VMALLOC_START                   0xf7000000 (via VMALLOC_RESERVE)

 * mapped LOWMEM                   0xc0000000

 */



#define MEM_USER_INTRPT		_AC(0xfc000000, UL)

#if CONFIG_KERNEL_PL == 1

#define MEM_SV_INTRPT		_AC(0xfd000000, UL)

#define MEM_HV_INTRPT		_AC(0xfe000000, UL)

#else

#define MEM_GUEST_INTRPT	_AC(0xfd000000, UL)

#define MEM_SV_INTRPT		_AC(0xfe000000, UL)

#define MEM_HV_INTRPT		_AC(0xff000000, UL)

#endif

#define MEM_SV_START		_AC(0xfd000000, UL)

#define MEM_HV_START		_AC(0xfe000000, UL)



#define INTRPT_SIZE		0x4000

arch/tile/include/asm/pgtable_32.h

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static inline int pud_huge_page(pud_t pud) { return 0; } 
/* We don't define any pgds for these addresses. */

static inline int pgd_addr_invalid(unsigned long addr)

{

	return addr >= MEM_HV_INTRPT;

	return addr >= MEM_HV_START;

}



/*

arch/tile/include/asm/pgtable_64.h

+1 −2
Original line number Diff line number Diff line
@@ -140,8 +140,7 @@ static inline unsigned long pgd_addr_normalize(unsigned long addr) 
/* We don't define any pgds for these addresses. */

static inline int pgd_addr_invalid(unsigned long addr)

{

	return addr >= MEM_HV_START ||

		(addr > MEM_LOW_END && addr < MEM_HIGH_START);

	return addr >= KERNEL_HIGH_VADDR || addr != pgd_addr_normalize(addr);

}



/*

arch/tile/include/asm/processor.h

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ struct thread_struct { 
#ifndef __ASSEMBLY__



#ifdef __tilegx__

#define TASK_SIZE_MAX		(MEM_LOW_END + 1)

#define TASK_SIZE_MAX		(_AC(1, UL) << (MAX_VA_WIDTH - 1))

#else

#define TASK_SIZE_MAX		PAGE_OFFSET

#endif

arch/tile/kernel/head_32.S

+2 −2
Original line number Diff line number Diff line
@@ -162,8 +162,8 @@ ENTRY(swapper_pg_dir) 
	.set addr, addr + PGDIR_SIZE

	.endr



	/* The true text VAs are mapped as VA = PA + MEM_SV_INTRPT */

	PTE MEM_SV_INTRPT, 0, (1 << (HV_PTE_INDEX_READABLE - 32)) | \

	/* The true text VAs are mapped as VA = PA + MEM_SV_START */

	PTE MEM_SV_START, 0, (1 << (HV_PTE_INDEX_READABLE - 32)) | \

			      (1 << (HV_PTE_INDEX_EXECUTABLE - 32))

	.org swapper_pg_dir + PGDIR_SIZE

	END(swapper_pg_dir)

CRA Git | Maintained and supported by SUSTech CRA and CCSE