d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/booke: Make the TLB save area and mask match

Browse Source 
Since TLB_MAXNEST is 3, the insert mask should only be 2 bits.  Given that 2
bits counts to 4, and that we already have plenty of space wasted in
padding, make the nest level 4 to match the mask.
This commit is contained in:
Justin Hibbits 2019-11-08 03:45:13 +00:00
parent 9e2b2d6996
commit d3895bffd9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/powerpc/booke/trap_subr.S
View File

@ -365,14 +365,14 @@
ld %r30, (TLBSAVE_BOOKE_R30)(br); \ ld %r30, (TLBSAVE_BOOKE_R30)(br); \
ld %r31, (TLBSAVE_BOOKE_R31)(br); ld %r31, (TLBSAVE_BOOKE_R31)(br);
#define TLB_NEST(outr,inr) \ #define TLB_NEST(outr,inr) \
rlwinm outr, inr, 7, 22, 24; /* 8 x TLBSAVE_LEN */ rlwinm outr, inr, 7, 23, 24; /* 8 x TLBSAVE_LEN */
#else #else
#define TLB_SAVE_REGS(br) \ #define TLB_SAVE_REGS(br) \
stmw %r20, TLBSAVE_BOOKE_R20(br) stmw %r20, TLBSAVE_BOOKE_R20(br)
#define TLB_RESTORE_REGS(br) \ #define TLB_RESTORE_REGS(br) \
lmw %r20, TLBSAVE_BOOKE_R20(br) lmw %r20, TLBSAVE_BOOKE_R20(br)
#define TLB_NEST(outr,inr) \ #define TLB_NEST(outr,inr) \
rlwinm outr, inr, 6, 23, 25; /* 4 x TLBSAVE_LEN */ rlwinm outr, inr, 6, 24, 25; /* 4 x TLBSAVE_LEN */
#endif #endif
#define TLB_PROLOG \ #define TLB_PROLOG \
mtspr SPR_SPRG4, %r1; /* Save SP */ \ mtspr SPR_SPRG4, %r1; /* Save SP */ \

4
sys/powerpc/include/pcpu.h
View File

@ -77,14 +77,14 @@ struct pvo_entry;
#endif #endif
#define BOOKE_CRITSAVE_LEN (CPUSAVE_LEN + 2) #define BOOKE_CRITSAVE_LEN (CPUSAVE_LEN + 2)
#define BOOKE_TLB_MAXNEST 3 #define BOOKE_TLB_MAXNEST 4
#define BOOKE_TLB_SAVELEN 16 #define BOOKE_TLB_SAVELEN 16
#define BOOKE_TLBSAVE_LEN (BOOKE_TLB_SAVELEN * BOOKE_TLB_MAXNEST) #define BOOKE_TLBSAVE_LEN (BOOKE_TLB_SAVELEN * BOOKE_TLB_MAXNEST)
#ifdef __powerpc64__ #ifdef __powerpc64__
#define BOOKE_PCPU_PAD 901 #define BOOKE_PCPU_PAD 901
#else #else
#define BOOKE_PCPU_PAD 429 #define BOOKE_PCPU_PAD 365
#endif #endif
#define PCPU_MD_BOOKE_FIELDS \ #define PCPU_MD_BOOKE_FIELDS \
register_t critsave[BOOKE_CRITSAVE_LEN]; \ register_t critsave[BOOKE_CRITSAVE_LEN]; \