evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

Browse source 
Pull tile bugfix from Chris Metcalf:
 "This fixes a bug that Sudip's buildbot found for tilepro allmodconfig.

  I've tagged it for stable only back to 3.19, which was when most of
  the other affected architectures added their support for working
  around this issue"

* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  tile: provide CONFIG_PAGE_SIZE_64KB etc for tilepro
This commit is contained in:
Linus Torvalds 2016-01-05 13:21:19 -08:00
commit 3331f99a6f
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/tile/Kconfig
View file

@ -176,8 +176,6 @@ config NR_CPUS
smaller kernel memory footprint results from using a smaller smaller kernel memory footprint results from using a smaller
value on chips with fewer tiles. value on chips with fewer tiles.
if TILEGX
choice choice
prompt "Kernel page size" prompt "Kernel page size"
default PAGE_SIZE_64KB default PAGE_SIZE_64KB
@ -188,8 +186,11 @@ choice
connections, etc., it may be better to select 16KB, which uses connections, etc., it may be better to select 16KB, which uses
memory more efficiently at some cost in TLB performance. memory more efficiently at some cost in TLB performance.
Note that this option is TILE-Gx specific; currently Note that for TILEPro, you must also rebuild the hypervisor
TILEPro page size is set by rebuilding the hypervisor. with a matching page size.
config PAGE_SIZE_4KB
bool "4KB" if TILEPRO
config PAGE_SIZE_16KB config PAGE_SIZE_16KB
bool "16KB" bool "16KB"
@ -199,8 +200,6 @@ config PAGE_SIZE_64KB
endchoice endchoice
endif
source "kernel/Kconfig.hz" source "kernel/Kconfig.hz"
config KEXEC config KEXEC

8
arch/tile/include/asm/page.h
View file

@ -20,15 +20,17 @@
#include <arch/chip.h> #include <arch/chip.h>
/* PAGE_SHIFT and HPAGE_SHIFT determine the page sizes. */ /* PAGE_SHIFT and HPAGE_SHIFT determine the page sizes. */
#if defined(CONFIG_PAGE_SIZE_16KB) #if defined(CONFIG_PAGE_SIZE_4KB) /* tilepro only */
#define PAGE_SHIFT 12
#define CTX_PAGE_FLAG HV_CTX_PG_SM_4K
#elif defined(CONFIG_PAGE_SIZE_16KB)
#define PAGE_SHIFT 14 #define PAGE_SHIFT 14
#define CTX_PAGE_FLAG HV_CTX_PG_SM_16K #define CTX_PAGE_FLAG HV_CTX_PG_SM_16K
#elif defined(CONFIG_PAGE_SIZE_64KB) #elif defined(CONFIG_PAGE_SIZE_64KB)
#define PAGE_SHIFT 16 #define PAGE_SHIFT 16
#define CTX_PAGE_FLAG HV_CTX_PG_SM_64K #define CTX_PAGE_FLAG HV_CTX_PG_SM_64K
#else #else
#define PAGE_SHIFT HV_LOG2_DEFAULT_PAGE_SIZE_SMALL #error Page size not specified in Kconfig
#define CTX_PAGE_FLAG 0
#endif #endif
#define HPAGE_SHIFT HV_LOG2_DEFAULT_PAGE_SIZE_LARGE #define HPAGE_SHIFT HV_LOG2_DEFAULT_PAGE_SIZE_LARGE