Skip to content

Commit

Permalink
MIPS: Add set/clear CP0 macros for PageGrain register
Browse files Browse the repository at this point in the history
Build set and clear macros for the PageGrain register.

Signed-off-by: Steven J. Hill <Steven.Hill@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/9289/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Steven J. Hill authored and ralfbaechle committed Feb 20, 2015
1 parent 05f9883 commit a5770df
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions arch/mips/include/asm/mipsregs.h
Expand Up @@ -1897,6 +1897,7 @@ __BUILD_SET_C0(config5)
__BUILD_SET_C0(intcontrol)
__BUILD_SET_C0(intctl)
__BUILD_SET_C0(srsmap)
__BUILD_SET_C0(pagegrain)
__BUILD_SET_C0(brcm_config_0)
__BUILD_SET_C0(brcm_bus_pll)
__BUILD_SET_C0(brcm_reset)
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/kernel/cpu-probe.c
Expand Up @@ -550,7 +550,7 @@ static void decode_configs(struct cpuinfo_mips *c)

if (cpu_has_rixi) {
/* Enable the RIXI exceptions */
write_c0_pagegrain(read_c0_pagegrain() | PG_IEC);
set_c0_pagegrain(PG_IEC);
back_to_back_c0_hazard();
/* Verify the IEC bit is set */
if (read_c0_pagegrain() & PG_IEC)
Expand Down
6 changes: 3 additions & 3 deletions arch/mips/mm/tlb-r4k.c
Expand Up @@ -485,11 +485,11 @@ static void r4k_tlb_configure(void)
* Enable the no read, no exec bits, and enable large virtual
* address.
*/
u32 pg = PG_RIE | PG_XIE;
#ifdef CONFIG_64BIT
pg |= PG_ELPA;
set_c0_pagegrain(PG_RIE | PG_XIE | PG_ELPA);
#else
set_c0_pagegrain(PG_RIE | PG_XIE);
#endif
write_c0_pagegrain(pg);
}

temp_tlb_entry = current_cpu_data.tlbsize - 1;
Expand Down

0 comments on commit a5770df

Please sign in to comment.