Commit 6e80cff5 authored by Michal Simek's avatar Michal Simek
Browse files

microblaze: Support 4k/16k/64k pages 



Add support for page size which is supported by MMU.
Remove 8k and 32k page size because they are not supported
by MMU.

Signed-off-by: default avatarMichal Simek <monstr@monstr.eu>
parent 9f78d3b5

arch/microblaze/Kconfig

+2 −5
Original line number Diff line number Diff line
@@ -243,14 +243,11 @@ choice 
config MICROBLAZE_4K_PAGES

	bool "4k page size"



config MICROBLAZE_8K_PAGES

	bool "8k page size"



config MICROBLAZE_16K_PAGES

	bool "16k page size"



config MICROBLAZE_32K_PAGES

	bool "32k page size"

config MICROBLAZE_64K_PAGES

	bool "64k page size"



endchoice

arch/microblaze/include/asm/page.h

+2 −4
Original line number Diff line number Diff line
@@ -23,12 +23,10 @@ 
#ifdef __KERNEL__



/* PAGE_SHIFT determines the page size */

#if defined(CONFIG_MICROBLAZE_32K_PAGES)

#define PAGE_SHIFT		15

#if defined(CONFIG_MICROBLAZE_64K_PAGES)

#define PAGE_SHIFT		16

#elif defined(CONFIG_MICROBLAZE_16K_PAGES)

#define PAGE_SHIFT		14

#elif defined(CONFIG_MICROBLAZE_8K_PAGES)

#define PAGE_SHIFT		13

#else

#define PAGE_SHIFT		12

#endif

arch/microblaze/kernel/hw_exception_handler.S

+6 −0
Original line number Diff line number Diff line
@@ -862,7 +862,13 @@ ex_handler_done: 
		 * bits 20 and 21 are zero.

		 */

		andi	r3, r3, PAGE_MASK

#ifdef CONFIG_MICROBLAZE_64K_PAGES

		ori	r3, r3, TLB_VALID | TLB_PAGESZ(PAGESZ_64K)

#elif CONFIG_MICROBLAZE_16K_PAGES

		ori	r3, r3, TLB_VALID | TLB_PAGESZ(PAGESZ_16K)

#else

		ori	r3, r3, TLB_VALID | TLB_PAGESZ(PAGESZ_4K)

#endif

		mts	rtlbhi,	r3		/* Load TLB HI */

		nop