|
@@ -117,7 +117,7 @@ ENTRY(cpu_do_resume)
|
|
*/
|
|
*/
|
|
ubfx x11, x11, #1, #1
|
|
ubfx x11, x11, #1, #1
|
|
msr oslar_el1, x11
|
|
msr oslar_el1, x11
|
|
- msr pmuserenr_el0, xzr // Disable PMU access from EL0
|
|
|
|
|
|
+ reset_pmuserenr_el0 x0 // Disable PMU access from EL0
|
|
mov x0, x12
|
|
mov x0, x12
|
|
dsb nsh // Make sure local tlb invalidation completed
|
|
dsb nsh // Make sure local tlb invalidation completed
|
|
isb
|
|
isb
|
|
@@ -154,7 +154,7 @@ ENTRY(__cpu_setup)
|
|
msr cpacr_el1, x0 // Enable FP/ASIMD
|
|
msr cpacr_el1, x0 // Enable FP/ASIMD
|
|
mov x0, #1 << 12 // Reset mdscr_el1 and disable
|
|
mov x0, #1 << 12 // Reset mdscr_el1 and disable
|
|
msr mdscr_el1, x0 // access to the DCC from EL0
|
|
msr mdscr_el1, x0 // access to the DCC from EL0
|
|
- msr pmuserenr_el0, xzr // Disable PMU access from EL0
|
|
|
|
|
|
+ reset_pmuserenr_el0 x0 // Disable PMU access from EL0
|
|
/*
|
|
/*
|
|
* Memory region attributes for LPAE:
|
|
* Memory region attributes for LPAE:
|
|
*
|
|
*
|