|
@@ -363,8 +363,8 @@ _GLOBAL(power9_idle_stop)
|
|
* cr3 - set to gt if waking up with partial/complete hypervisor state loss
|
|
* cr3 - set to gt if waking up with partial/complete hypervisor state loss
|
|
*/
|
|
*/
|
|
_GLOBAL(pnv_restore_hyp_resource)
|
|
_GLOBAL(pnv_restore_hyp_resource)
|
|
- ld r2,PACATOC(r13);
|
|
|
|
BEGIN_FTR_SECTION
|
|
BEGIN_FTR_SECTION
|
|
|
|
+ ld r2,PACATOC(r13);
|
|
/*
|
|
/*
|
|
* POWER ISA 3. Use PSSCR to determine if we
|
|
* POWER ISA 3. Use PSSCR to determine if we
|
|
* are waking up from deep idle state
|
|
* are waking up from deep idle state
|
|
@@ -395,6 +395,9 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300)
|
|
*/
|
|
*/
|
|
clrldi r5,r13,63
|
|
clrldi r5,r13,63
|
|
clrrdi r13,r13,1
|
|
clrrdi r13,r13,1
|
|
|
|
+
|
|
|
|
+ /* Now that we are sure r13 is corrected, load TOC */
|
|
|
|
+ ld r2,PACATOC(r13);
|
|
cmpwi cr4,r5,1
|
|
cmpwi cr4,r5,1
|
|
mtspr SPRN_HSPRG0,r13
|
|
mtspr SPRN_HSPRG0,r13
|
|
|
|
|