powerpc: Move ARCH_DLINFO out of uapi
Subsystems (2)
PATCH 1/9 powerpc: Move ARCH_DLINFO out of uapi
It's an kernel private macro, it doesn't belong there
--- arch/powerpc/include/asm/elf.h | 22 ++++++++++++++++++++++ arch/powerpc/include/uapi/asm/elf.h | 23 ----------------------- 2 files changed, 22 insertions(+), 23 deletions(-)
arch/powerpc/include/asm/elf.h +22 -0
@@ -136,4 +136,26 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,#endif /* CONFIG_SPU_BASE */ +/* +* The requirements here are: +* - keep the final alignment of sp (sp & 0xf) +* - make sure the 32-bit value at the first 16 byte aligned position of +* AUXV is greater than 16 for glibc compatibility. +* AT_IGNOREPPC is used for that. +* - for compatibility with glibc ARCH_DLINFO must always be defined on PPC, +* even if DLINFO_ARCH_ITEMS goes to zero or is undefined. +* update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT entries changes +*/ +#define ARCH_DLINFO \ +do { \ +/* Handle glibc compatibility. */ \ +NEW_AUX_ENT (AT_IGNOREPPC ,AT_IGNOREPPC ); \ +NEW_AUX_ENT (AT_IGNOREPPC ,AT_IGNOREPPC ); \ +/* Cache size items */ \ +NEW_AUX_ENT (AT_DCACHEBSIZE , dcache_bsize); \ +NEW_AUX_ENT (AT_ICACHEBSIZE , icache_bsize); \ +NEW_AUX_ENT (AT_UCACHEBSIZE , ucache_bsize); \ +VDSO_AUX_ENT (AT_SYSINFO_EHDR , current->mm->context.vdso_base); \ +} while (0) +#endif /* _ASM_POWERPC_ELF_H */
arch/powerpc/include/uapi/asm/elf.h +0 -23
@@ -162,29 +162,6 @@ typedef elf_vrreg_t elf_vrregset_t32[ELF_NVRREG32];typedef elf_fpreg_t elf_vsrreghalf_t32 [ELF_NVSRHALFREG ];#endif - -/* -* The requirements here are: -* - keep the final alignment of sp (sp & 0xf) -* - make sure the 32-bit value at the first 16 byte aligned position of -* AUXV is greater than 16 for glibc compatibility. -* AT_IGNOREPPC is used for that. -* - for compatibility with glibc ARCH_DLINFO must always be defined on PPC, -* even if DLINFO_ARCH_ITEMS goes to zero or is undefined. -* update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT entries changes -*/ -#define ARCH_DLINFO \ -do { \ -/* Handle glibc compatibility. */ \ -NEW_AUX_ENT (AT_IGNOREPPC ,AT_IGNOREPPC ); \ -NEW_AUX_ENT (AT_IGNOREPPC ,AT_IGNOREPPC ); \ -/* Cache size items */ \ -NEW_AUX_ENT (AT_DCACHEBSIZE , dcache_bsize); \ -NEW_AUX_ENT (AT_ICACHEBSIZE , icache_bsize); \ -NEW_AUX_ENT (AT_UCACHEBSIZE , ucache_bsize); \ -VDSO_AUX_ENT (AT_SYSINFO_EHDR , current->mm->context.vdso_base); \ -}while (0 ) -/* PowerPC64 relocations defined by the ABIs */ #define R_PPC64_NONE R_PPC_NONE#define R_PPC64_ADDR32 R_PPC_ADDR32/* 32bit absolute address. */
Signature · 1 line
2.9.3
PATCH 2/9 powerpc: Move {d, i, u}cache_bsize definitions to a common place
The variables are defined twice in setup_32.c and setup_64.c, do it once in setup-common.c instead
--- arch/powerpc/kernel/setup-common.c | 9 +++++++++ arch/powerpc/kernel/setup_32.c | 8 -------- arch/powerpc/kernel/setup_64.c | 8 -------- 3 files changed, 9 insertions(+), 16 deletions(-)
arch/powerpc/kernel/setup-common.c +9 -0
@@ -87,6 +87,15 @@ EXPORT_SYMBOL(machine_id);int boot_cpuid =-1 ;EXPORT_SYMBOL_GPL (boot_cpuid); +/* +* These are used in binfmt_elf.c to put aux entries on the stack +* for each elf executable being started. +*/ +int dcache_bsize; +int icache_bsize; +int ucache_bsize; + +unsigned long klimit = (unsigned long ) _end;/*
arch/powerpc/kernel/setup_32.c +0 -8
@@ -53,14 +53,6 @@ unsigned int DMA_MODE_READ;unsigned int DMA_MODE_WRITE ;/* -* These are used in binfmt_elf.c to put aux entries on the stack -* for each elf executable being started. -*/ -int dcache_bsize; -int icache_bsize; -int ucache_bsize; - -/* * We're called here very early in the boot. * * Note that the kernel may be running at an address which is different
arch/powerpc/kernel/setup_64.c +0 -8
@@ -88,14 +88,6 @@ struct ppc64_caches ppc64_caches = { };EXPORT_SYMBOL_GPL (ppc64_caches); -/* -* These are used in binfmt_elf.c to put aux entries on the stack -* for each elf executable being started. -*/ -int dcache_bsize; -int icache_bsize; -int ucache_bsize; -#if defined(CONFIG_PPC_BOOK3E ) && defined(CONFIG_SMP )void __init setup_tlb_core_data (void ) {
Signature · 1 line
2.9.3
PATCH 3/9 powerpc: Remove obsolete comment about patching instructions
In reply to Benjamin HerrenschmidtWe don't patch instructions based on the cache lines or block sizes these days.
--- arch/powerpc/kernel/setup_64.c | 3 --- 1 file changed, 3 deletions(-)
arch/powerpc/kernel/setup_64.c +0 -3
@@ -77,9 +77,6 @@int spinning_secondaries;u64 ppc64_pft_size; -/* Pick defaults since we might want to patch instructions -* before we've read this from the device tree. -*/ struct ppc64_caches ppc64_caches = { .dline_size =0x40 , .log_dline_size =6 ,
Signature · 1 line
2.9.3
PATCH 4/9 powerpc/64: Fix naming of cache block vs. cache line
In reply to Benjamin HerrenschmidtIn a number of places we called "cache line size" what is actually the cache block size, which in the powerpc architecture, means the effective size to use with cache management instructions (it can be different from the actual cache line size).
We fix the naming across the board and properly retrieve both pieces of information when available in the device-tree.
--- arch/powerpc/include/asm/cache.h | 12 ++++--- arch/powerpc/include/asm/page_64.h | 4 +-- arch/powerpc/kernel/align.c | 2 +- arch/powerpc/kernel/asm-offsets.c | 12 +++---- arch/powerpc/kernel/misc_64.S | 28 ++++++++-------- arch/powerpc/kernel/setup_64.c | 65 +++++++++++++++++++++----------------- arch/powerpc/kernel/vdso.c | 10 +++--- arch/powerpc/lib/copypage_64.S | 4 +-- arch/powerpc/lib/string_64.S | 6 ++-- 9 files changed, 75 insertions(+), 68 deletions(-)
arch/powerpc/include/asm/cache.h +7 -5
@@ -30,12 +30,14 @@struct ppc64_caches {u32 dsize;/* L1 d-cache size */ u32 dline_size;/* L1 d-cache line size */ -u32 log_dline_size; -u32 dlines_per_page; +u32 dblock_size;/* L1 d-cache block size */ +u32 log_dblock_size; +u32 dblocks_per_page;u32 isize;/* L1 i-cache size */ -u32 iline_size;/* L1 i-cache line size */ -u32 log_iline_size; -u32 ilines_per_page; +u32 iline_size;/* L1 d-cache line size */ +u32 iblock_size;/* L1 i-cache block size */ +u32 log_iblock_size; +u32 iblocks_per_page; };extern struct ppc64_caches ppc64_caches;
arch/powerpc/include/asm/page_64.h +2 -2
@@ -47,14 +47,14 @@ static inline void clear_page(void *addr)unsigned long iterations;unsigned long onex, twox, fourx, eightx; - iterations = ppc64_caches.dlines_per_page /8 ; + iterations = ppc64_caches.dblocks_per_page /8 ;/* * Some verisions of gcc use multiply instructions to * calculate the offsets so lets give it a hand to * do better. */ - onex = ppc64_caches.dline_size; + onex = ppc64_caches.dblock_size; twox = onex <<1 ; fourx = onex <<2 ; eightx = onex <<3 ;
arch/powerpc/kernel/align.c +1 -1
@@ -204,7 +204,7 @@ static int emulate_dcbz(struct pt_regs *regs, unsigned char __user *addr)int i, size;#ifdef __powerpc64__ - size = ppc64_caches.dline_size; + size = ppc64_caches.dblock_size;#else size =L1_CACHE_BYTES ;#endif
arch/powerpc/kernel/asm-offsets.c +6 -6
@@ -160,12 +160,12 @@ int main(void)DEFINE (TI_CPU , offsetof(struct thread_info , cpu));#ifdef CONFIG_PPC64 -DEFINE (DCACHEL1LINESIZE , offsetof(struct ppc64_caches , dline_size)); -DEFINE (DCACHEL1LOGLINESIZE , offsetof(struct ppc64_caches , log_dline_size)); -DEFINE (DCACHEL1LINESPERPAGE , offsetof(struct ppc64_caches , dlines_per_page)); -DEFINE (ICACHEL1LINESIZE , offsetof(struct ppc64_caches , iline_size)); -DEFINE (ICACHEL1LOGLINESIZE , offsetof(struct ppc64_caches , log_iline_size)); -DEFINE (ICACHEL1LINESPERPAGE , offsetof(struct ppc64_caches , ilines_per_page)); +DEFINE (DCACHEL1BLOCKSIZE , offsetof(struct ppc64_caches , dblock_size)); +DEFINE (DCACHEL1LOGBLOCKSIZE , offsetof(struct ppc64_caches , log_dblock_size)); +DEFINE (DCACHEL1BLOCKSPERPAGE , offsetof(struct ppc64_caches , dblocks_per_page)); +DEFINE (ICACHEL1BLOCKSIZE , offsetof(struct ppc64_caches , iblock_size)); +DEFINE (ICACHEL1LOGBLOCKSIZE , offsetof(struct ppc64_caches , log_iblock_size)); +DEFINE (ICACHEL1BLOCKSPERPAGE , offsetof(struct ppc64_caches , iblocks_per_page));/* paca */ DEFINE (PACA_SIZE ,sizeof (struct paca_struct ));DEFINE (PACAPACAINDEX , offsetof(struct paca_struct , paca_index));
arch/powerpc/kernel/misc_64.S +14 -14
@@ -79,12 +79,12 @@ END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE) * each other. */ ld r10,PPC64_CACHES@toc(r2) - lwz r7,DCACHEL1LINESIZE(r10)/* Get cache line size */ + lwz r7,DCACHEL1BLOCKSIZE(r10)/* Get cache block size */ addi r5,r7,-1 andc r6,r3,r5 /* round low to line bdy */ subf r8,r6,r4 /* compute length */ add r8,r8,r5 /* ensure we get enough */ - lwz r9,DCACHEL1LOGLINESIZE(r10) /* Get log-2 of cache line size */ + lwz r9,DCACHEL1LOGBLOCKSIZE(r10) /* Get log-2 of cache block size */ srw. r8,r8,r9 /* compute line count */ beqlr /* nothing to do? */ mtctr r8
@@ -95,12 +95,12 @@ END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE) /* Now invalidate the instruction cache */ - lwz r7,ICACHEL1LINESIZE(r10) /* Get Icache line size */ + lwz r7,ICACHEL1BLOCKSIZE(r10) /* Get Icache block size */ addi r5,r7,-1 andc r6,r3,r5 /* round low to line bdy */ subf r8,r6,r4 /* compute length */ add r8,r8,r5 - lwz r9,ICACHEL1LOGLINESIZE(r10) /* Get log-2 of Icache line size */ + lwz r9,ICACHEL1LOGBLOCKSIZE(r10) /* Get log-2 of Icache block size */ srw. r8,r8,r9 /* compute line count */ beqlr /* nothing to do? */ mtctr r8
@@ -125,12 +125,12 @@ _GLOBAL(flush_dcache_range) * Different systems have different cache line sizes */ ld r10,PPC64_CACHES@toc(r2) - lwz r7,DCACHEL1LINESIZE(r10) /* Get dcache line size */ + lwz r7,DCACHEL1BLOCKSIZE(r10) /* Get dcache block size */ addi r5,r7,-1 andc r6,r3,r5 /* round low to line bdy */ subf r8,r6,r4 /* compute length */ add r8,r8,r5 /* ensure we get enough */ - lwz r9,DCACHEL1LOGLINESIZE(r10) /* Get log-2 of dcache line size */ + lwz r9,DCACHEL1LOGBLOCKSIZE(r10) /* Get log-2 of dcache block size */ srw. r8,r8,r9 /* compute line count */ beqlr /* nothing to do? */ mtctr r8
@@ -152,12 +152,12 @@ _GLOBAL(flush_dcache_range) */ _GLOBAL(flush_dcache_phys_range) ld r10,PPC64_CACHES@toc(r2) - lwz r7,DCACHEL1LINESIZE(r10) /* Get dcache line size */ + lwz r7,DCACHEL1BLOCKSIZE(r10) /* Get dcache block size */ addi r5,r7,-1 andc r6,r3,r5 /* round low to line bdy */ subf r8,r6,r4 /* compute length */ add r8,r8,r5 /* ensure we get enough */ - lwz r9,DCACHEL1LOGLINESIZE(r10) /* Get log-2 of dcache line size */ + lwz r9,DCACHEL1LOGBLOCKSIZE(r10) /* Get log-2 of dcache block size */ srw. r8,r8,r9 /* compute line count */ beqlr /* nothing to do? */ mfmsr r5 /* Disable MMU Data Relocation */
@@ -180,12 +180,12 @@ _GLOBAL(flush_dcache_phys_range) _GLOBAL(flush_inval_dcache_range) ld r10,PPC64_CACHES@toc(r2) - lwz r7,DCACHEL1LINESIZE(r10) /* Get dcache line size */ + lwz r7,DCACHEL1BLOCKSIZE(r10) /* Get dcache block size */ addi r5,r7,-1 andc r6,r3,r5 /* round low to line bdy */ subf r8,r6,r4 /* compute length */ add r8,r8,r5 /* ensure we get enough */ - lwz r9,DCACHEL1LOGLINESIZE(r10)/* Get log-2 of dcache line size */ + lwz r9,DCACHEL1LOGBLOCKSIZE(r10)/* Get log-2 of dcache block size */ srw. r8,r8,r9 /* compute line count */ beqlr /* nothing to do? */ sync
@@ -221,8 +221,8 @@ END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE) /* Flush the dcache */ ld r7,PPC64_CACHES@toc(r2) clrrdi r3,r3,PAGE_SHIFT /* Page align */ - lwz r4,DCACHEL1LINESPERPAGE(r7) /* Get # dcache lines per page */ - lwz r5,DCACHEL1LINESIZE(r7) /* Get dcache line size */ + lwz r4,DCACHEL1BLOCKSPERPAGE(r7) /* Get # dcache blocks per page */ + lwz r5,DCACHEL1BLOCKSIZE(r7) /* Get dcache block size */ mr r6,r3 mtctr r4 0: dcbst 0,r6
@@ -232,8 +232,8 @@ END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE) /* Now invalidate the icache */ - lwz r4,ICACHEL1LINESPERPAGE(r7) /* Get # icache lines per page */ - lwz r5,ICACHEL1LINESIZE(r7) /* Get icache line size */ + lwz r4,ICACHEL1BLOCKSPERPAGE(r7) /* Get # icache blocks per page */ + lwz r5,ICACHEL1BLOCKSIZE(r7) /* Get icache block size */ mtctr r4 1: icbi 0,r3 add r3,r3,r5
arch/powerpc/kernel/setup_64.c +36 -29
105 lines not on this page · raw message
arch/powerpc/kernel/vdso.c +4 -6
@@ -740,12 +740,10 @@ static int __init vdso_init(void) vdso_data->dcache_line_size = ppc64_caches.dline_size; vdso_data->icache_size = ppc64_caches.isize; vdso_data->icache_line_size = ppc64_caches.iline_size; - -/* XXXOJN: Blocks should be added to ppc64_caches and used instead */ - vdso_data->dcache_block_size = ppc64_caches.dline_size; - vdso_data->icache_block_size = ppc64_caches.iline_size; - vdso_data->dcache_log_block_size = ppc64_caches.log_dline_size; - vdso_data->icache_log_block_size = ppc64_caches.log_iline_size; + vdso_data->dcache_block_size = ppc64_caches.dblock_size; + vdso_data->icache_block_size = ppc64_caches.iblock_size; + vdso_data->dcache_log_block_size = ppc64_caches.log_dblock_size; + vdso_data->icache_log_block_size = ppc64_caches.log_iblock_size;/* * Calculate the size of the 64 bits vDSO
arch/powerpc/lib/copypage_64.S +2 -2
@@ -25,8 +25,8 @@ ALT_FTR_SECTION_END_IFCLR(CPU_FTR_VMX_COPY) ori r5,r5,PAGE_SIZE@l BEGIN_FTR_SECTION ld r10,PPC64_CACHES@toc(r2) - lwz r11,DCACHEL1LOGLINESIZE(r10) /* log2 of cache line size */ - lwz r12,DCACHEL1LINESIZE(r10) /* get cache line size */ + lwz r11,DCACHEL1LOGBLOCKSIZE(r10) /* log2 of cache block size */ + lwz r12,DCACHEL1BLOCKSIZE(r10) /* get cache block size */ li r9,0 srd r8,r5,r11
arch/powerpc/lib/string_64.S +3 -3
@@ -159,9 +159,9 @@ err2; std r0,0(r3) addi r3,r3,8 addi r4,r4,-8 - /* Destination is 16 byte aligned, need to get it cacheline aligned */ -11: lwz r7,DCACHEL1LOGLINESIZE(r5) - lwz r9,DCACHEL1LINESIZE(r5) + /* Destination is 16 byte aligned, need to get it cache block aligned */ +11: lwz r7,DCACHEL1LOGBLOCKSIZE(r5) + lwz r9,DCACHEL1BLOCKSIZE(r5) /* * With worst case alignment the long clear loop takes a minimum
Signature · 1 line
2.9.3
PATCH 5/9 powerpc/64: Retrieve number of L1 cache sets from device-tree
In reply to Benjamin HerrenschmidtIt will be used to calculate the associativity
--- arch/powerpc/include/asm/cache.h | 2 ++ arch/powerpc/kernel/setup_64.c | 27 +++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-)
arch/powerpc/include/asm/cache.h +2 -0
@@ -33,11 +33,13 @@ struct ppc64_caches {u32 dblock_size;/* L1 d-cache block size */ u32 log_dblock_size;u32 dblocks_per_page; +u32 dsets;u32 isize;/* L1 i-cache size */ u32 iline_size;/* L1 d-cache line size */ u32 iblock_size;/* L1 i-cache block size */ u32 log_iblock_size;u32 iblocks_per_page; +u32 isets; };extern struct ppc64_caches ppc64_caches;
arch/powerpc/kernel/setup_64.c +25 -2
@@ -404,14 +404,18 @@ void __init initialize_cache_info(void)* d-cache and i-cache sizes... -Peter */ if (num_cpus ==1 ) { -const __be32 *sizep, *lsizep, *bsizep; -u32 size, lsize, bsize; +const __be32 *sizep, *lsizep, *bsizep, *setsp; +u32 size, lsize, bsize, sets; size =0 ; + sets =-1u ; lsize = bsize = cur_cpu_spec->dcache_bsize; sizep =of_get_property (np,"d-cache-size" ,NULL );if (sizep !=NULL ) size =be32_to_cpu (*sizep); + setsp =of_get_property (np,"d-cache-sets" ,NULL ); +if (setsp !=NULL ) + sets =be32_to_cpu (*setsp); bsizep =of_get_property (np,"d-cache-block-size" ,NULL ); lsizep = of_get_property(np, "d-cache-line-size",
@@ -427,17 +431,31 @@ void __init initialize_cache_info(void)"sizep: %p, bsizep: %p, lsizep: %p\n" , sizep, bsizep, lsizep); +/* OF is weird .. it represents fully associative caches +* as "1 way" which doesn't make much sense and doesn't +* leave room for direct mapped. We'll assume that 0 +* in OF means direct mapped for that reason. +*/ +if (sets ==1 ) + sets =0 ; +else if (sets ==0 ) + sets =1 ; ppc64_caches.dsize = size; + ppc64_caches.dsets = sets; ppc64_caches.dline_size = lsize; ppc64_caches.dblock_size = bsize; ppc64_caches.log_dblock_size =__ilog2 (bsize); ppc64_caches.dblocks_per_page =PAGE_SIZE / bsize; size =0 ; + sets =-1u ; lsize = bsize = cur_cpu_spec->icache_bsize; sizep =of_get_property (np,"i-cache-size" ,NULL );if (sizep !=NULL ) size =be32_to_cpu (*sizep); + setsp =of_get_property (np,"i-cache-sets" ,NULL ); +if (setsp !=NULL ) + sets =be32_to_cpu (*setsp); bsizep =of_get_property (np,"i-cache-block-size" ,NULL ); lsizep = of_get_property(np, "i-cache-line-size",
@@ -453,7 +471,12 @@ void __init initialize_cache_info(void)"sizep: %p, bsizep: %p, lsizep: %p\n" , sizep, bsizep, lsizep); +if (sets ==1 ) + sets =0 ; +else if (sets ==0 ) + sets =1 ; ppc64_caches.isize = size; + ppc64_caches.isets = sets; ppc64_caches.iline_size = lsize; ppc64_caches.iblock_size = bsize; ppc64_caches.log_iblock_size =__ilog2 (bsize);
Signature · 1 line
2.9.3
PATCH 6/9 powerpc/64: Clean up ppc64_caches using a struct per cache
In reply to Benjamin HerrenschmidtWe have two set of identical struct members for the I and D sides and mostly identical bunches of code to parse the device-tree to populate them. Instead make a ppc_cache_info structure with one copy for I and one for D
--- arch/powerpc/include/asm/cache.h | 24 ++--- arch/powerpc/include/asm/page_64.h | 4 +- arch/powerpc/kernel/align.c | 2 +- arch/powerpc/kernel/asm-offsets.c | 12 +-- arch/powerpc/kernel/setup_64.c | 175 ++++++++++++++++++------------------- arch/powerpc/kernel/vdso.c | 16 ++-- 6 files changed, 112 insertions(+), 121 deletions(-)
arch/powerpc/include/asm/cache.h +12 -12
@@ -27,19 +27,19 @@#define SMP_CACHE_BYTES L1_CACHE_BYTES#if defined(__powerpc64__) && !defined(__ASSEMBLY__) + +struct ppc_cache_info { +u32 size; +u32 line_size; +u32 block_size;/* L1 only */ +u32 log_block_size; +u32 blocks_per_page; +u32 sets; +}; +struct ppc64_caches { -u32 dsize;/* L1 d-cache size */ -u32 dline_size;/* L1 d-cache line size */ -u32 dblock_size;/* L1 d-cache block size */ -u32 log_dblock_size; -u32 dblocks_per_page; -u32 dsets; -u32 isize;/* L1 i-cache size */ -u32 iline_size;/* L1 d-cache line size */ -u32 iblock_size;/* L1 i-cache block size */ -u32 log_iblock_size; -u32 iblocks_per_page; -u32 isets; +struct ppc_cache_info l1d; +struct ppc_cache_info l1i; };extern struct ppc64_caches ppc64_caches;
arch/powerpc/include/asm/page_64.h +2 -2
@@ -47,14 +47,14 @@ static inline void clear_page(void *addr)unsigned long iterations;unsigned long onex, twox, fourx, eightx; - iterations = ppc64_caches.dblocks_per_page /8 ; + iterations = ppc64_caches.l1d.blocks_per_page /8 ;/* * Some verisions of gcc use multiply instructions to * calculate the offsets so lets give it a hand to * do better. */ - onex = ppc64_caches.dblock_size; + onex = ppc64_caches.l1d.block_size; twox = onex <<1 ; fourx = onex <<2 ; eightx = onex <<3 ;
arch/powerpc/kernel/align.c +1 -1
@@ -204,7 +204,7 @@ static int emulate_dcbz(struct pt_regs *regs, unsigned char __user *addr)int i, size;#ifdef __powerpc64__ - size = ppc64_caches.dblock_size; + size = ppc64_caches.l1d.block_size;#else size =L1_CACHE_BYTES ;#endif
arch/powerpc/kernel/asm-offsets.c +6 -6
@@ -160,12 +160,12 @@ int main(void)DEFINE (TI_CPU , offsetof(struct thread_info , cpu));#ifdef CONFIG_PPC64 -DEFINE (DCACHEL1BLOCKSIZE , offsetof(struct ppc64_caches , dblock_size)); -DEFINE (DCACHEL1LOGBLOCKSIZE , offsetof(struct ppc64_caches , log_dblock_size)); -DEFINE (DCACHEL1BLOCKSPERPAGE , offsetof(struct ppc64_caches , dblocks_per_page)); -DEFINE (ICACHEL1BLOCKSIZE , offsetof(struct ppc64_caches , iblock_size)); -DEFINE (ICACHEL1LOGBLOCKSIZE , offsetof(struct ppc64_caches , log_iblock_size)); -DEFINE (ICACHEL1BLOCKSPERPAGE , offsetof(struct ppc64_caches , iblocks_per_page)); + DEFINE(DCACHEL1BLOCKSIZE, offsetof(struct ppc64_caches, l1d.block_size)); + DEFINE(DCACHEL1LOGBLOCKSIZE, offsetof(struct ppc64_caches, l1d.log_block_size)); + DEFINE(DCACHEL1BLOCKSPERPAGE, offsetof(struct ppc64_caches, l1d.blocks_per_page)); + DEFINE(ICACHEL1BLOCKSIZE, offsetof(struct ppc64_caches, l1i.block_size)); + DEFINE(ICACHEL1LOGBLOCKSIZE, offsetof(struct ppc64_caches, l1i.log_block_size)); + DEFINE(ICACHEL1BLOCKSPERPAGE, offsetof(struct ppc64_caches, l1i.blocks_per_page));/* paca */ DEFINE (PACA_SIZE ,sizeof (struct paca_struct ));DEFINE (PACAPACAINDEX , offsetof(struct paca_struct , paca_index));
arch/powerpc/kernel/setup_64.c +83 -92
197 lines not on this page · raw message
arch/powerpc/kernel/vdso.c +8 -8
@@ -736,14 +736,14 @@ static int __init vdso_init(void)if (firmware_has_feature (FW_FEATURE_LPAR )) vdso_data->platform |=1 ; vdso_data->physicalMemorySize =memblock_phys_mem_size (); - vdso_data->dcache_size = ppc64_caches.dsize; - vdso_data->dcache_line_size = ppc64_caches.dline_size; - vdso_data->icache_size = ppc64_caches.isize; - vdso_data->icache_line_size = ppc64_caches.iline_size; - vdso_data->dcache_block_size = ppc64_caches.dblock_size; - vdso_data->icache_block_size = ppc64_caches.iblock_size; - vdso_data->dcache_log_block_size = ppc64_caches.log_dblock_size; - vdso_data->icache_log_block_size = ppc64_caches.log_iblock_size; + vdso_data->dcache_size = ppc64_caches.l1d.size; + vdso_data->dcache_line_size = ppc64_caches.l1d.line_size; + vdso_data->icache_size = ppc64_caches.l1i.size; + vdso_data->icache_line_size = ppc64_caches.l1i.line_size; + vdso_data->dcache_block_size = ppc64_caches.l1d.block_size; + vdso_data->icache_block_size = ppc64_caches.l1i.block_size; + vdso_data->dcache_log_block_size = ppc64_caches.l1d.log_block_size; + vdso_data->icache_log_block_size = ppc64_caches.l1i.log_block_size;/* * Calculate the size of the 64 bits vDSO
Signature · 1 line
2.9.3
PATCH 7/9 powerpc/64: Add L2 and L3 cache shape info
In reply to Benjamin HerrenschmidtRetrieved from device-tree when available
--- arch/powerpc/include/asm/cache.h | 2 ++ arch/powerpc/kernel/setup_64.c | 25 ++++++++++++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-)
arch/powerpc/include/asm/cache.h +2 -0
@@ -40,6 +40,8 @@ struct ppc_cache_info {struct ppc64_caches {struct ppc_cache_info l1d;struct ppc_cache_info l1i; +struct ppc_cache_info l2; +struct ppc_cache_info l3; };extern struct ppc64_caches ppc64_caches;
arch/powerpc/kernel/setup_64.c +20 -5
@@ -457,22 +457,37 @@ static bool __init parse_cache_info(struct device_node *np,void __init initialize_cache_info (void ) { -struct device_node *np; +struct device_node *cpu, *l2, *l3 =NULL ;DBG (" -> initialize_cache_info()\n" ); - np =of_find_node_by_type (NULL ,"cpu" ); + cpu =of_find_node_by_type (NULL ,"cpu" );/* * We're assuming *all* of the CPUs have the same * d-cache and i-cache sizes... -Peter */ -if (np) { -if (!parse_cache_info (np, false, &ppc64_caches.l1d)) +if (cpu) { +if (!parse_cache_info (cpu, false, &ppc64_caches.l1d))DBG ("Argh, can't find dcache properties !\n" ); -if (!parse_cache_info (np, true, &ppc64_caches.l1i)) +if (!parse_cache_info (cpu, true, &ppc64_caches.l1i))DBG ("Argh, can't find icache properties !\n" ); + +/* Try to find the L2 and L3 if any. Assume they are +* unified and use the D-side properties +*/ + l2 =of_find_next_cache_node (cpu); +of_node_put (cpu); +if (l2) { +parse_cache_info (l2, false, &ppc64_caches.l2); + l3 =of_find_next_cache_node (l2); +of_node_put (l2); + } +if (l3) { +parse_cache_info (l3, false, &ppc64_caches.l3); +of_node_put (l3); + } }/* For use by binfmt_elf */
Signature · 1 line
2.9.3
PATCH 8/9 powerpc/64: Hard code cache geometry on POWER8
In reply to Benjamin HerrenschmidtAll shipping firmware versions have it wrong in the device-tree
--- arch/powerpc/kernel/setup_64.c | 52 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 3 deletions(-)
arch/powerpc/kernel/setup_64.c +49 -3
@@ -255,7 +255,7 @@ static void cpu_ready_for_interrupts(void)void __init early_setup (unsigned long dt_ptr) { -static __initdata struct paca_struct boot_paca; +static struct paca_struct boot_paca__initdata ;/* -------- printk is _NOT_ safe to use here ! ------- */
@@ -455,13 +455,59 @@ static bool __init parse_cache_info(struct device_node *np,return success; } +static void __init populate_p8_cache_info (void ) +{ +static const struct ppc_cache_info p8_l1i__initconst = { + .size =0x8000 , + .line_size =128 , + .block_size =128 , + .log_block_size =7 , + .blocks_per_page =PAGE_SIZE /128 , + .sets =32 + }; +static const struct ppc_cache_info p8_l1d__initconst = { + .size =0x10000 , + .line_size =128 , + .block_size =128 , + .log_block_size =7 , + .blocks_per_page =PAGE_SIZE /128 , + .sets =64 + }; +static const struct ppc_cache_info p8_l2__initconst = { + .size =0x80000 , + .line_size =128 , + .sets =512 + }; +static const struct ppc_cache_info p8_l3__initconst = { + .size =0x800000 , + .line_size =128 , + .sets =8192 + }; + ppc64_caches.l1i = p8_l1i; + ppc64_caches.l1d = p8_l1d; + ppc64_caches.l2 = p8_l2; + ppc64_caches.l3 = p8_l3; +} +void __init initialize_cache_info (void ) { -struct device_node *cpu, *l2, *l3 =NULL ; +struct device_node *cpu =NULL , *l2, *l3 =NULL ; +u32 pvr;DBG (" -> initialize_cache_info()\n" ); - cpu =of_find_node_by_type (NULL ,"cpu" ); +/* +* All shipping POWER8 machines have a firmware bug that +* puts incorrect information in the device-tree. This will +* be (hopefully) fixed for future chips but for now hard +* code the values if we are running on one of these +*/ + pvr =PVR_VER (mfspr (SPRN_PVR )); +if (pvr ==PVR_POWER8 || pvr ==PVR_POWER8E || + pvr ==PVR_POWER8NVL ) +populate_p8_cache_info (); +else + cpu =of_find_node_by_type (NULL ,"cpu" );/* * We're assuming *all* of the CPUs have the same
Signature · 1 line
2.9.3
PATCH 9/9 powerpc: A new cache shape aux vectors
In reply to Benjamin HerrenschmidtThe definition is loosely based on sh and alpha, modified to accomodate larger associativity and cache size for future-proofing.
We currently set all the values to -1 which indicates that the information isn't available.
--- arch/powerpc/include/asm/cache.h | 1 + arch/powerpc/include/asm/elf.h | 17 ++++++++++++++++- arch/powerpc/include/uapi/asm/auxvec.h | 33 ++++++++++++++++++++++++++++++++- arch/powerpc/kernel/setup-common.c | 5 ++++- arch/powerpc/kernel/setup_64.c | 4 ++++ 5 files changed, 57 insertions(+), 3 deletions(-)
arch/powerpc/include/asm/cache.h +1 -0
@@ -35,6 +35,7 @@ struct ppc_cache_info {u32 log_block_size;u32 blocks_per_page;u32 sets; +u32 assoc; };struct ppc64_caches {
arch/powerpc/include/asm/elf.h +16 -1
@@ -108,13 +108,17 @@ do { \*/ # define elf_read_implies_exec (ex, exec_stk) (is_32bit_task() ? \ (exec_stk == EXSTACK_DEFAULT) : 0) -#else +#else # define elf_read_implies_exec (ex, exec_stk) (exec_stk == EXSTACK_DEFAULT)#endif /* __powerpc64__ */ extern int dcache_bsize;extern int icache_bsize;extern int ucache_bsize; +extern long il1cache_shape; +extern long dl1cache_shape; +extern long l2cache_shape; +extern long l3cache_shape;/* vDSO has arch_setup_additional_pages */ #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
@@ -136,6 +140,9 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,#endif /* CONFIG_SPU_BASE */ +#define get_cache_shape (level) \ + (ppc64_caches.level.assoc << 16 | ppc64_caches.level.line_size) +/* * The requirements here are: * - keep the final alignment of sp (sp & 0xf)
@@ -156,6 +163,14 @@ do { \NEW_AUX_ENT (AT_ICACHEBSIZE , icache_bsize); \NEW_AUX_ENT (AT_UCACHEBSIZE , ucache_bsize); \VDSO_AUX_ENT (AT_SYSINFO_EHDR , current->mm->context.vdso_base); \ +NEW_AUX_ENT (AT_L1I_CACHESIZE , ppc64_caches.l1i.size); \ +NEW_AUX_ENT (AT_L1I_CACHESHAPE ,get_cache_shape (l1i)); \ +NEW_AUX_ENT (AT_L1D_CACHESIZE , ppc64_caches.l1i.size); \ +NEW_AUX_ENT (AT_L1D_CACHESHAPE ,get_cache_shape (l1i)); \ +NEW_AUX_ENT (AT_L2_CACHESIZE , ppc64_caches.l2.size); \ +NEW_AUX_ENT (AT_L2_CACHESHAPE ,get_cache_shape (l2)); \ +NEW_AUX_ENT (AT_L3_CACHESIZE , ppc64_caches.l3.size); \ +NEW_AUX_ENT (AT_L3_CACHESHAPE ,get_cache_shape (l3)); \ } while (0)#endif /* _ASM_POWERPC_ELF_H */
arch/powerpc/include/uapi/asm/auxvec.h +32 -1
@@ -16,6 +16,37 @@*/ #define AT_SYSINFO_EHDR 33 -#define AT_VECTOR_SIZE_ARCH 6/* entries in ARCH_DLINFO */ +/* +* AT_*CACHEBSIZE above represent the cache *block* size which is +* the size that is affected by the cache management instructions. +* +* It doesn't nececssarily matches the cache *line* size which is +* more of a performance tuning hint. Additionally the latter can +* be different for the different cache levels. +* +* The set of entries below represent more extensive information +* about the caches, in the form of two entry per cache type, +* one entry containing the cache size in bytes, and the other +* containing the cache line size in bytes in the bottom 16 bits +* and the cache associativity in the next 16 bits. +* +* The associativity is such that if N is the 16-bit value, the +* cache is N way set associative. A value if 0xffff means fully +* associative, a value of 1 means directly mapped. +* +* For all these fields, a value of 0 means that the information +* is not known. +*/ + +#define AT_L1I_CACHESIZE 40 +#define AT_L1I_CACHESHAPE 41 +#define AT_L1D_CACHESIZE 42 +#define AT_L1D_CACHESHAPE 43 +#define AT_L2_CACHESIZE 44 +#define AT_L2_CACHESHAPE 45 +#define AT_L3_CACHESIZE 46 +#define AT_L3_CACHESHAPE 47 + +#define AT_VECTOR_SIZE_ARCH 14/* entries in ARCH_DLINFO */ #endif
arch/powerpc/kernel/setup-common.c +4 -1
@@ -94,7 +94,10 @@ EXPORT_SYMBOL_GPL(boot_cpuid);int dcache_bsize;int icache_bsize;int ucache_bsize; - +long il1cache_shape =-1 ; +long dl1cache_shape =-1 ; +long l2cache_shape =-1 ; +long l3cache_shape =-1 ;unsigned long klimit = (unsigned long ) _end;
arch/powerpc/kernel/setup_64.c +4 -0
@@ -451,6 +451,10 @@ static bool __init parse_cache_info(struct device_node *np, info->block_size = bsize; info->log_block_size =__ilog2 (bsize); info->blocks_per_page =PAGE_SIZE / bsize; +if (sets ==0 ) + info->assoc =0xffff ; +else + info->assoc = size / (sets * lsize);return success; }
Signature · 1 line
2.9.3
Re: [PATCH 9/9] powerpc: A new cache shape aux vectors
Quoted 29 lines · Benjamin Herrenschmidt
arch/powerpc/include/uapi/asm/auxvec.h +20
-1@@ -16,6 +16,37 @@*/ #define AT_SYSINFO_EHDR 33 -#define AT_VECTOR_SIZE_ARCH 6/* entries in ARCH_DLINFO */ +/* +* AT_*CACHEBSIZE above represent the cache *block* size which is +* the size that is affected by the cache management instructions. +* +* It doesn't nececssarily matches the cache *line* size which is +* more of a performance tuning hint. Additionally the latter can +* be different for the different cache levels. +* +* The set of entries below represent more extensive information +* about the caches, in the form of two entry per cache type, +* one entry containing the cache size in bytes, and the other +* containing the cache line size in bytes in the bottom 16 bits +* and the cache associativity in the next 16 bits. +* +* The associativity is such that if N is the 16-bit value, the +* cache is N way set associative. A value if 0xffff means fully +* associative, a value of 1 means directly mapped. +* +* For all these fields, a value of 0 means that the information +* is not known.
arch/powerpc/include/uapi/asm/auxvec.h line 48
Quoted 10 lines
arch/powerpc/include/uapi/asm/auxvec.h +10
-0+*/ + +#define AT_L1I_CACHESIZE 40 +#define AT_L1I_CACHESHAPE 41 +#define AT_L1D_CACHESIZE 42 +#define AT_L1D_CACHESHAPE 43 +#define AT_L2_CACHESIZE 44 +#define AT_L2_CACHESHAPE 45 +#define AT_L3_CACHESIZE 46 +#define AT_L3_CACHESHAPE 47
These names will clash with the other ones defined by alpha and sh:
/* Shapes of the caches. Bits 0-3 contains associativity; bits 4-7 contains
log2 of line size; mask those to get cache size. */
#define AT_L1I_CACHESHAPE 34
#define AT_L1D_CACHESHAPE 35
#define AT_L2_CACHESHAPE 36
#define AT_L3_CACHESHAPE 37
Signature · 1 line
Tulio Magno
Re: [PATCH 9/9] powerpc: A new cache shape aux vectors
On Wed, 2017-01-04 at 11:04 -0200, Tulio Magno Quites Machado Filho
Quoted 11 lines
arch/powerpc/include/uapi/asm/auxvec.h line 48
Quoted 8 lines
arch/powerpc/include/uapi/asm/auxvec.h +8
-0+#define AT_L1I_CACHESIZE 40 +#define AT_L1I_CACHESHAPE 41 +#define AT_L1D_CACHESIZE 42 +#define AT_L1D_CACHESHAPE 43 +#define AT_L2_CACHESIZE 44 +#define AT_L2_CACHESHAPE 45 +#define AT_L3_CACHESIZE 46 +#define AT_L3_CACHESHAPE 47These names will clash with the other ones defined by alpha and sh:
Quoted 7 lines
/* Shapes of the caches. Bits 0-3 contains associativity; bits 4-7 contains
log2 of line size; mask those to get cache size. */
#defineAT_L1I_CACHESHAPE34
#defineAT_L1D_CACHESHAPE35
#defineAT_L2_CACHESHAPE36
#defineAT_L3_CACHESHAPE37
Is this a problem though ? In the kernel at least these are defined in arch specific headers so there is no clash.
Otherwise, I can change them to *_CACHEGEOMETRY, is that ok ? Or add a PPC_ prefix...
Cheers,
Ben.
Re: [PATCH 9/9] powerpc: A new cache shape aux vectors
Quoted 14 lines · Benjamin Herrenschmidt
On Wed, 2017-01-04 at 11:04 -0200, Tulio Magno Quites Machado Filho
Quoted 12 lines
arch/powerpc/include/uapi/asm/auxvec.h line 48
Quoted 8 lines
arch/powerpc/include/uapi/asm/auxvec.h +8
-0+#define AT_L1I_CACHESIZE 40 +#define AT_L1I_CACHESHAPE 41 +#define AT_L1D_CACHESIZE 42 +#define AT_L1D_CACHESHAPE 43 +#define AT_L2_CACHESIZE 44 +#define AT_L2_CACHESHAPE 45 +#define AT_L3_CACHESIZE 46 +#define AT_L3_CACHESHAPE 47=20
These names will clash with the other ones defined by alpha and sh:
=20
/* Shapes of the caches.=C2=A0=C2=A0Bits 0-3 contains associativity; bit=
s 4-7
Quoted 2 lines
Quoted 2 lines
contains
=C2=A0=C2=A0=C2=A0log2 of line size; mask those to get cache size.=C2=A0=
=C2=A0*/
Quoted 7 lines
Quoted 4 lines
#define
AT_L1I_CACHESHAPE34
#defineAT_L1D_CACHESHAPE35
#defineAT_L2_CACHESHAPE36
#defineAT_L3_CACHESHAPE37Is this a problem though ? In the kernel at least these are defined in arch specific headers so there is no clash.
It could become a problem if an architecture tries to use both of these types.
glibc doesn't distinct between them:
https://sourceware.org/git/?p=3Dglibc.git;a=3Dblob;f=3Delf/elf.h#l1113
Quoted 1 line
Otherwise, I can change them to
*_CACHEGEOMETRY, is that ok ?
Looks good to me.
--=20
Tulio Magno
Re: [PATCH 9/9] powerpc: A new cache shape aux vectors
In reply to Benjamin Herrenschmidtarch/powerpc/kernel/setup_64.c static bool __init parse_cache_info(struct device_node *np, · line 456
Quoted 6 lines · Benjamin Herrenschmidt
+ * For all these fields, a value of 0 means that the information
+ * is not known.arch/powerpc/kernel/setup_64.c +3
-0+if (sets ==0 ) + info->assoc =0xffff ; +else
...
Is this correct? A fully associative cache should be encoded as sets == 1, if there are buggy firmwares that set it to 0 instead it should do the same as 1 here I think? Or is 0xffff indicating "unknown" here... But in that case the comment above says assoc should be 0 instead.
Segher
Re: [PATCH 9/9] powerpc: A new cache shape aux vectors
Quoted 7 lines · Segher Boessenkool
Quoted 5 lines · Benjamin Herrenschmidt
+ * For all these fields, a value of 0 means that the information
+ * is not known.
+ if (sets == 0)
+ info->assoc =0xffff;
+ else
Quoted 5 lines
...
Is this correct? A fully associative cache should be encoded as sets == 1, if there are buggy firmwares that set it to 0 instead it should do the same as 1 here I think?
No, I just made a stupid mistake I think. PAPR does say sets=1 is fully associative which makes sense. Probably a typo.
Quoted 2 lines
Or is
0xffffindicating "unknown" here... But in that case the comment above says assoc should be 0 instead.
No it's me.
Cheers,
Ben.