| Message ID | 1400608550.4912.48.camel@x220 (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Scott Wood |
| Headers | show |
On Tue, May 20, 2014 at 07:55:50PM +0200, Paul Bolle wrote: > Three checks for CONFIG_BOOK3E_MMU_TLB_STATS were added in v2.6.32. But > the related Kconfig symbol was never added. These checks have always > evaluated to false. Remove them. > > Signed-off-by: Paul Bolle <pebolle@tiscali.nl> > > --- > Untested. > > A second order cleanup is now possible (ie, TLB_MISS_PROLOG_STATS and > friends are, well, defined away). Perhaps it is preferable to include > that cleanup in this patch. > > arch/powerpc/include/asm/exception-64e.h | 38 -------------------------------- > arch/powerpc/mm/tlb_low_64e.S | 10 --------- > 2 files changed, 48 deletions(-) /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S: Assembler messages: /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:89: Error: unrecognized opcode: `tlb_miss_prolog_stats' /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:238: Error: unrecognized opcode: `tlb_miss_prolog_stats' /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:269: Error: unrecognized opcode: `tlb_miss_prolog_stats' /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:281: Error: unrecognized opcode: `tlb_miss_prolog_stats' /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:441: Error: unrecognized opcode: `tlb_miss_prolog_stats' /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:510: Error: unrecognized opcode: `tlb_miss_prolog_stats' /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:881: Error: unrecognized opcode: `tlb_miss_prolog_stats' /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:918: Error: unrecognized opcode: `tlb_miss_prolog_stats' -Scott
Scott, On Thu, 2014-05-22 at 17:37 -0500, Scott Wood wrote: > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S: Assembler messages: > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:89: Error: unrecognized opcode: `tlb_miss_prolog_stats' > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:238: Error: unrecognized opcode: `tlb_miss_prolog_stats' > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:269: Error: unrecognized opcode: `tlb_miss_prolog_stats' > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:281: Error: unrecognized opcode: `tlb_miss_prolog_stats' > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:441: Error: unrecognized opcode: `tlb_miss_prolog_stats' > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:510: Error: unrecognized opcode: `tlb_miss_prolog_stats' > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:881: Error: unrecognized opcode: `tlb_miss_prolog_stats' > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:918: Error: unrecognized opcode: `tlb_miss_prolog_stats' Thanks for testing! That's a bit surprising. The patch is intended to be a non event. Ie, it only removes what the preprocessor would have removed anyway. Unless I botched it, of course. What exactly did you test there? Paul Bolle
On Fri, 2014-05-23 at 09:33 +0200, Paul Bolle wrote: > Scott, > > On Thu, 2014-05-22 at 17:37 -0500, Scott Wood wrote: > > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S: Assembler messages: > > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:89: Error: unrecognized opcode: `tlb_miss_prolog_stats' > > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:238: Error: unrecognized opcode: `tlb_miss_prolog_stats' > > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:269: Error: unrecognized opcode: `tlb_miss_prolog_stats' > > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:281: Error: unrecognized opcode: `tlb_miss_prolog_stats' > > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:441: Error: unrecognized opcode: `tlb_miss_prolog_stats' > > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:510: Error: unrecognized opcode: `tlb_miss_prolog_stats' > > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:881: Error: unrecognized opcode: `tlb_miss_prolog_stats' > > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:918: Error: unrecognized opcode: `tlb_miss_prolog_stats' > > Thanks for testing! > > That's a bit surprising. The patch is intended to be a non event. Ie, it > only removes what the preprocessor would have removed anyway. Unless I > botched it, of course. > > What exactly did you test there? For what it's worth: I can't reproduce this error with the cross compiler now shipped with Fedora 20 (ie, powerpc64-linux-gnu-gcc (GCC) 4.8.1 20130717 (Red Hat 4.8.1-5)). It shows a nice and clean AS arch/powerpc/mm/tlb_low_64e.o in the output. That's v3.15-rc6, with just this patch, and using a .config generated, with "make oldconfig", from arch/powerpc/configs/ppc64e_defconfig. Paul Bolle
On Fri, 2014-05-23 at 12:06 +0200, Paul Bolle wrote: > On Fri, 2014-05-23 at 09:33 +0200, Paul Bolle wrote: > > Scott, > > > > On Thu, 2014-05-22 at 17:37 -0500, Scott Wood wrote: > > > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S: Assembler messages: > > > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:89: Error: unrecognized opcode: `tlb_miss_prolog_stats' > > > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:238: Error: unrecognized opcode: `tlb_miss_prolog_stats' > > > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:269: Error: unrecognized opcode: `tlb_miss_prolog_stats' > > > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:281: Error: unrecognized opcode: `tlb_miss_prolog_stats' > > > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:441: Error: unrecognized opcode: `tlb_miss_prolog_stats' > > > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:510: Error: unrecognized opcode: `tlb_miss_prolog_stats' > > > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:881: Error: unrecognized opcode: `tlb_miss_prolog_stats' > > > /home/scott/fsl/git/linux/upstream/arch/powerpc/mm/tlb_low_64e.S:918: Error: unrecognized opcode: `tlb_miss_prolog_stats' > > > > Thanks for testing! > > > > That's a bit surprising. The patch is intended to be a non event. Ie, it > > only removes what the preprocessor would have removed anyway. Unless I > > botched it, of course. > > > > What exactly did you test there? > > For what it's worth: I can't reproduce this error with the cross > compiler now shipped with Fedora 20 (ie, powerpc64-linux-gnu-gcc (GCC) > 4.8.1 20130717 (Red Hat 4.8.1-5)). It shows a nice and clean > AS arch/powerpc/mm/tlb_low_64e.o > > in the output. > > That's v3.15-rc6, with just this patch, and using a .config generated, > with "make oldconfig", from arch/powerpc/configs/ppc64e_defconfig. Hmm, I tried applying again and it was fine. I guess I accidentally removed one line too many when resolving a conflict with b1576fec7f4dd4657694fefc97fda4cf28ec68e9 "powerpc: No need to use dot symbols when branching to a function" that's in Ben's -next tree. -Scott
On Fri, 2014-05-23 at 12:12 -0500, Scott Wood wrote: > On Fri, 2014-05-23 at 12:06 +0200, Paul Bolle wrote: > > For what it's worth: I can't reproduce this error with the cross > > compiler now shipped with Fedora 20 (ie, powerpc64-linux-gnu-gcc (GCC) > > 4.8.1 20130717 (Red Hat 4.8.1-5)). It shows a nice and clean > > AS arch/powerpc/mm/tlb_low_64e.o > > > > in the output. > > > > That's v3.15-rc6, with just this patch, and using a .config generated, > > with "make oldconfig", from arch/powerpc/configs/ppc64e_defconfig. > > Hmm, I tried applying again and it was fine. That's a relieve. Thanks, again, for testing! Paul Bolle
diff --git a/arch/powerpc/include/asm/exception-64e.h b/arch/powerpc/include/asm/exception-64e.h index a563d9afd179..74004771baed 100644 --- a/arch/powerpc/include/asm/exception-64e.h +++ b/arch/powerpc/include/asm/exception-64e.h @@ -69,14 +69,7 @@ #define EX_TLB_ESR ( 9 * 8) /* Level 0 and 2 only */ #define EX_TLB_SRR0 (10 * 8) #define EX_TLB_SRR1 (11 * 8) -#ifdef CONFIG_BOOK3E_MMU_TLB_STATS -#define EX_TLB_R8 (12 * 8) -#define EX_TLB_R9 (13 * 8) -#define EX_TLB_LR (14 * 8) -#define EX_TLB_SIZE (15 * 8) -#else #define EX_TLB_SIZE (12 * 8) -#endif #define START_EXCEPTION(label) \ .globl exc_##label##_book3e; \ @@ -161,36 +154,6 @@ exc_##label##_book3e: addi r11,r13,PACA_EXTLB; \ TLB_MISS_RESTORE(r11) -#ifdef CONFIG_BOOK3E_MMU_TLB_STATS -#define TLB_MISS_PROLOG_STATS \ - mflr r10; \ - std r8,EX_TLB_R8(r12); \ - std r9,EX_TLB_R9(r12); \ - std r10,EX_TLB_LR(r12); -#define TLB_MISS_RESTORE_STATS \ - ld r16,EX_TLB_LR(r12); \ - ld r9,EX_TLB_R9(r12); \ - ld r8,EX_TLB_R8(r12); \ - mtlr r16; -#define TLB_MISS_STATS_D(name) \ - addi r9,r13,MMSTAT_DSTATS+name; \ - bl .tlb_stat_inc; -#define TLB_MISS_STATS_I(name) \ - addi r9,r13,MMSTAT_ISTATS+name; \ - bl .tlb_stat_inc; -#define TLB_MISS_STATS_X(name) \ - ld r8,PACA_EXTLB+EX_TLB_ESR(r13); \ - cmpdi cr2,r8,-1; \ - beq cr2,61f; \ - addi r9,r13,MMSTAT_DSTATS+name; \ - b 62f; \ -61: addi r9,r13,MMSTAT_ISTATS+name; \ -62: bl .tlb_stat_inc; -#define TLB_MISS_STATS_SAVE_INFO \ - std r14,EX_TLB_ESR(r12); /* save ESR */ -#define TLB_MISS_STATS_SAVE_INFO_BOLTED \ - std r14,PACA_EXTLB+EX_TLB_ESR(r13); /* save ESR */ -#else #define TLB_MISS_PROLOG_STATS #define TLB_MISS_RESTORE_STATS #define TLB_MISS_PROLOG_STATS_BOLTED @@ -201,7 +164,6 @@ exc_##label##_book3e: #define TLB_MISS_STATS_Y(name) #define TLB_MISS_STATS_SAVE_INFO #define TLB_MISS_STATS_SAVE_INFO_BOLTED -#endif #define SET_IVOR(vector_number, vector_offset) \ li r3,vector_offset@l; \ diff --git a/arch/powerpc/mm/tlb_low_64e.S b/arch/powerpc/mm/tlb_low_64e.S index 356e8b41fb09..7e25fe472801 100644 --- a/arch/powerpc/mm/tlb_low_64e.S +++ b/arch/powerpc/mm/tlb_low_64e.S @@ -1159,13 +1159,3 @@ tlb_load_linear_fault: b exc_data_storage_book3e 1: TLB_MISS_EPILOG_ERROR_SPECIAL b exc_instruction_storage_book3e - - -#ifdef CONFIG_BOOK3E_MMU_TLB_STATS -.tlb_stat_inc: -1: ldarx r8,0,r9 - addi r8,r8,1 - stdcx. r8,0,r9 - bne- 1b - blr -#endif
Three checks for CONFIG_BOOK3E_MMU_TLB_STATS were added in v2.6.32. But the related Kconfig symbol was never added. These checks have always evaluated to false. Remove them. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> --- Untested. A second order cleanup is now possible (ie, TLB_MISS_PROLOG_STATS and friends are, well, defined away). Perhaps it is preferable to include that cleanup in this patch. arch/powerpc/include/asm/exception-64e.h | 38 -------------------------------- arch/powerpc/mm/tlb_low_64e.S | 10 --------- 2 files changed, 48 deletions(-)