mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-25 22:20:45 +00:00
ppc/85xx: Map boot page guarded for MP boot
We already map the page cache-inhibited. There is no reason we shouldn't also be marking it guarded to prevent speculative accesses. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
parent
effe4973f2
commit
abc76eb6a6
5 changed files with 6 additions and 6 deletions
|
@ -44,7 +44,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
|||
/* TLB 1 */
|
||||
/* *I*** - Covers boot page */
|
||||
SET_TLB_ENTRY(1, 0xfffff000, 0xfffff000,
|
||||
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I,
|
||||
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
|
||||
0, 0, BOOKE_PAGESZ_4K, 1),
|
||||
|
||||
/* *I*G* - CCSRBAR */
|
||||
|
|
|
@ -44,7 +44,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
|||
/* TLB 1 */
|
||||
/* *I*** - Covers boot page */
|
||||
SET_TLB_ENTRY(1, 0xfffff000, 0xfffff000,
|
||||
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I,
|
||||
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
|
||||
0, 0, BOOKE_PAGESZ_4K, 1),
|
||||
|
||||
/* *I*G* - CCSRBAR */
|
||||
|
|
|
@ -47,7 +47,7 @@ struct fsl_e_tlb_entry tlb_table[] = {
|
|||
/* TLB 1 */
|
||||
/* *I*** - Covers boot page */
|
||||
SET_TLB_ENTRY(1, 0xfffff000, 0xfffff000,
|
||||
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I,
|
||||
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
|
||||
0, 0, BOOKE_PAGESZ_4K, 1),
|
||||
|
||||
/* *I*G* - CCSRBAR */
|
||||
|
|
|
@ -312,7 +312,7 @@ void setup_mp(void)
|
|||
disable_tlb(i);
|
||||
|
||||
set_tlb(1, CONFIG_BPTR_VIRT_ADDR, bootpg, /* tlb, epn, rpn */
|
||||
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I, /* perms, wimge */
|
||||
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, /* perms, wimge */
|
||||
0, i, BOOKE_PAGESZ_4K, 1); /* ts, esel, tsize, iprot */
|
||||
|
||||
memcpy((void *)CONFIG_BPTR_VIRT_ADDR, (void *)fixup, 4096);
|
||||
|
|
|
@ -166,8 +166,8 @@ __secondary_start_page:
|
|||
lis r11,(MAS1_VALID|MAS1_IPROT)@h
|
||||
ori r11,r11,(MAS1_TS|MAS1_TSIZE(BOOKE_PAGESZ_4K))@l
|
||||
mtspr SPRN_MAS1,r11
|
||||
oris r11,r13,(MAS2_I)@h
|
||||
ori r11,r13,(MAS2_I)@l
|
||||
oris r11,r13,(MAS2_I|MAS2_G)@h
|
||||
ori r11,r13,(MAS2_I|MAS2_G)@l
|
||||
mtspr SPRN_MAS2,r11
|
||||
oris r11,r13,(MAS3_SX|MAS3_SW|MAS3_SR)@h
|
||||
ori r11,r13,(MAS3_SX|MAS3_SW|MAS3_SR)@l
|
||||
|
|
Loading…
Reference in a new issue