diff for duplicates of <1466572287.8686.1.camel@neuling.org> diff --git a/a/1.txt b/N1/1.txt index d1568c3..d3de6ea 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,66 +1,63 @@ On Wed, 2016-06-22 at 11:54 +1000, Benjamin Herrenschmidt wrote: > On Wed, 2016-06-08 at 11:54 -0500, Shreyas B. Prabhu wrote: -> >=20 +> > > > pnv_init_idle_states discovers supported idle states from the > > device tree and does the required initialization. Set power_save > > function pointer only after this initialization is done -> >=20 +> > > > Reviewed-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com> > > Signed-off-by: Shreyas B. Prabhu <shreyas@linux.vnet.ibm.com> > Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> ->=20 +> > Please merge that one as-is now, no need to wait for the rest, as > otherwise pwoer9 crashes at boot. It doesn't need to wait for the > rest of the series. Acked-by: Michael Neuling <mikey@neuling.org> -For the same reason. Without this we need powersave=3Doff on the cmdline on +For the same reason. Without this we need powersave=off on the cmdline on POWER9. Mikey ->=20 +> > Cheers, > Ben. ->=20 -> >=20 +> +> > > > --- > > - No changes since v1 -> >=20 -> > =C2=A0arch/powerpc/platforms/powernv/idle.c=C2=A0=C2=A0| 3 +++ -> > =C2=A0arch/powerpc/platforms/powernv/setup.c | 2 +- -> > =C2=A02 files changed, 4 insertions(+), 1 deletion(-) -> >=20 +> > +> > arch/powerpc/platforms/powernv/idle.c | 3 +++ +> > arch/powerpc/platforms/powernv/setup.c | 2 +- +> > 2 files changed, 4 insertions(+), 1 deletion(-) +> > > > diff --git a/arch/powerpc/platforms/powernv/idle.c > > b/arch/powerpc/platforms/powernv/idle.c > > index fcc8b68..fbb09fb 100644 > > --- a/arch/powerpc/platforms/powernv/idle.c > > +++ b/arch/powerpc/platforms/powernv/idle.c > > @@ -285,6 +285,9 @@ static int __init pnv_init_idle_states(void) -> > =C2=A0 } -> > =C2=A0 -> > =C2=A0 pnv_alloc_idle_core_states(); +> > } +> > +> > pnv_alloc_idle_core_states(); > > + > > + if (supported_cpuidle_states & OPAL_PM_NAP_ENABLED) -> > + ppc_md.power_save =3D power7_idle; -> > =C2=A0out_free: -> > =C2=A0 kfree(flags); -> > =C2=A0out: +> > + ppc_md.power_save = power7_idle; +> > out_free: +> > kfree(flags); +> > out: > > diff --git a/arch/powerpc/platforms/powernv/setup.c > > b/arch/powerpc/platforms/powernv/setup.c > > index ee6430b..8492bbb 100644 > > --- a/arch/powerpc/platforms/powernv/setup.c > > +++ b/arch/powerpc/platforms/powernv/setup.c > > @@ -315,7 +315,7 @@ define_machine(powernv) { -> > =C2=A0 .get_proc_freq=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= -=C2=A0=C2=A0=3D pnv_get_proc_freq, -> > =C2=A0 .progress =3D pnv_progress, -> > =C2=A0 .machine_shutdown =3D pnv_shutdown, -> > - .power_save=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= -=A0=C2=A0=C2=A0=C2=A0=3D power7_idle, -> > + .power_save=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= -=A0=C2=A0=C2=A0=C2=A0=3D NULL, -> > =C2=A0 .calibrate_decr =3D generic_calibrate_decr, -> > =C2=A0#ifdef CONFIG_KEXEC -> > =C2=A0 .kexec_cpu_down =3D pnv_kexec_cpu_down, +> > .get_proc_freq = pnv_get_proc_freq, +> > .progress = pnv_progress, +> > .machine_shutdown = pnv_shutdown, +> > - .power_save = power7_idle, +> > + .power_save = NULL, +> > .calibrate_decr = generic_calibrate_decr, +> > #ifdef CONFIG_KEXEC +> > .kexec_cpu_down = pnv_kexec_cpu_down, diff --git a/a/content_digest b/N1/content_digest index 6bb899a..171daf7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -15,69 +15,66 @@ "b\0" "On Wed, 2016-06-22 at 11:54 +1000, Benjamin Herrenschmidt wrote:\n" "> On Wed, 2016-06-08 at 11:54 -0500, Shreyas B. Prabhu wrote:\n" - "> >=20\n" + "> > \n" "> > pnv_init_idle_states discovers supported idle states from the\n" "> > device tree and does the required initialization. Set power_save\n" "> > function pointer only after this initialization is done\n" - "> >=20\n" + "> > \n" "> > Reviewed-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>\n" "> > Signed-off-by: Shreyas B. Prabhu <shreyas@linux.vnet.ibm.com>\n" "> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>\n" - ">=20\n" + "> \n" "> Please merge that one as-is now, no need to wait for the rest, as\n" "> otherwise pwoer9 crashes at boot. It doesn't need to wait for the\n" "> rest of the series.\n" "\n" "Acked-by: Michael Neuling <mikey@neuling.org>\n" "\n" - "For the same reason. Without this we need powersave=3Doff on the cmdline on\n" + "For the same reason. Without this we need powersave=off on the cmdline on\n" "POWER9.\n" "\n" "Mikey\n" "\n" - ">=20\n" + "> \n" "> Cheers,\n" "> Ben.\n" - ">=20\n" - "> >=20\n" + "> \n" + "> > \n" "> > ---\n" "> > - No changes since v1\n" - "> >=20\n" - "> > =C2=A0arch/powerpc/platforms/powernv/idle.c=C2=A0=C2=A0| 3 +++\n" - "> > =C2=A0arch/powerpc/platforms/powernv/setup.c | 2 +-\n" - "> > =C2=A02 files changed, 4 insertions(+), 1 deletion(-)\n" - "> >=20\n" + "> > \n" + "> > \302\240arch/powerpc/platforms/powernv/idle.c\302\240\302\240| 3 +++\n" + "> > \302\240arch/powerpc/platforms/powernv/setup.c | 2 +-\n" + "> > \302\2402 files changed, 4 insertions(+), 1 deletion(-)\n" + "> > \n" "> > diff --git a/arch/powerpc/platforms/powernv/idle.c\n" "> > b/arch/powerpc/platforms/powernv/idle.c\n" "> > index fcc8b68..fbb09fb 100644\n" "> > --- a/arch/powerpc/platforms/powernv/idle.c\n" "> > +++ b/arch/powerpc/platforms/powernv/idle.c\n" "> > @@ -285,6 +285,9 @@ static int __init pnv_init_idle_states(void)\n" - "> > =C2=A0\t}\n" - "> > =C2=A0\n" - "> > =C2=A0\tpnv_alloc_idle_core_states();\n" + "> > \302\240\t}\n" + "> > \302\240\n" + "> > \302\240\tpnv_alloc_idle_core_states();\n" "> > +\n" "> > +\tif (supported_cpuidle_states & OPAL_PM_NAP_ENABLED)\n" - "> > +\t\tppc_md.power_save =3D power7_idle;\n" - "> > =C2=A0out_free:\n" - "> > =C2=A0\tkfree(flags);\n" - "> > =C2=A0out:\n" + "> > +\t\tppc_md.power_save = power7_idle;\n" + "> > \302\240out_free:\n" + "> > \302\240\tkfree(flags);\n" + "> > \302\240out:\n" "> > diff --git a/arch/powerpc/platforms/powernv/setup.c\n" "> > b/arch/powerpc/platforms/powernv/setup.c\n" "> > index ee6430b..8492bbb 100644\n" "> > --- a/arch/powerpc/platforms/powernv/setup.c\n" "> > +++ b/arch/powerpc/platforms/powernv/setup.c\n" "> > @@ -315,7 +315,7 @@ define_machine(powernv) {\n" - "> > =C2=A0\t.get_proc_freq=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=\n" - "=C2=A0=C2=A0=3D pnv_get_proc_freq,\n" - "> > =C2=A0\t.progress\t\t=3D pnv_progress,\n" - "> > =C2=A0\t.machine_shutdown\t=3D pnv_shutdown,\n" - "> > -\t.power_save=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=\n" - "=A0=C2=A0=C2=A0=C2=A0=3D power7_idle,\n" - "> > +\t.power_save=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=\n" - "=A0=C2=A0=C2=A0=C2=A0=3D NULL,\n" - "> > =C2=A0\t.calibrate_decr\t\t=3D generic_calibrate_decr,\n" - "> > =C2=A0#ifdef CONFIG_KEXEC\n" - "> > =C2=A0\t.kexec_cpu_down\t\t=3D pnv_kexec_cpu_down," + "> > \302\240\t.get_proc_freq\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240= pnv_get_proc_freq,\n" + "> > \302\240\t.progress\t\t= pnv_progress,\n" + "> > \302\240\t.machine_shutdown\t= pnv_shutdown,\n" + "> > -\t.power_save\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240= power7_idle,\n" + "> > +\t.power_save\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240= NULL,\n" + "> > \302\240\t.calibrate_decr\t\t= generic_calibrate_decr,\n" + "> > \302\240#ifdef CONFIG_KEXEC\n" + "> > \302\240\t.kexec_cpu_down\t\t= pnv_kexec_cpu_down," -e38c87d98650e49a6865dbd101fff21614636dc6545d28d15cd480347463318e +3e73418149a20035215f4dd6aff090c9e3e7dcc48ffacd6bb78030b4e3caf97c
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.