[PATCH 7/7] powerpc/64s: idle POWER8 avoid full state loss recovery where possible
Nicholas Piggin
npiggin at gmail.com
Tue Mar 21 04:19:13 AEDT 2017
On Mon, 20 Mar 2017 22:01:15 +0530
Gautham R Shenoy <ego at linux.vnet.ibm.com> wrote:
> > What do you want to do about your DD1 fix? I think there are some minor
> > clashes between them. I'm happy to rebase on top of yours if you prefer
> > it to go in first.
>
> I have sent an updated version of the DD1 fix today rebasing on
> v4.11-rc3.
>
> I applied your series on top of that and noticed some minor conflict
> with patches 1,2,3 and 7.
>
> If you are ok with it, I would like the DD1 Hotplug fixes to go in
> first.
This would be fine with me. Your clashing hunk is pretty trivial to fix
on top of my series though (it actually becomes nicer):
diff --git a/arch/powerpc/kernel/idle_book3s.S b/arch/powerpc/kernel/idle_book3s
index 3330a4293d1a..6d8e022da183 100644
--- a/arch/powerpc/kernel/idle_book3s.S
+++ b/arch/powerpc/kernel/idle_book3s.S
@@ -414,6 +414,9 @@ pnv_powersave_wakeup_mce:
.global pnv_powersave_wakeup
pnv_powersave_wakeup:
BEGIN_FTR_SECTION
+BEGIN_FTR_SECTION_NESTED(70)
+ bl power9_dd1_recover_paca
+END_FTR_SECTION_NESTED(CPU_FTR_POWER9_DD1, CPU_FTR_POWER9_DD1, 70)
bl pnv_restore_hyp_resource_arch300
FTR_SECTION_ELSE
bl pnv_restore_hyp_resource_arch207
So we could easily do it the other way around too. The question is, when will
they get merged, and what needs to be backported. I'll let you and mpe decide
that :)
Thanks,
Nick
More information about the Linuxppc-dev
mailing list