From: Michael Neuling <mikey@neuling.org>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
linuxppc-dev@lists.ozlabs.org
Cc: Anton Blanchard <anton@au1.ibm.com>
Subject: Re: [PATCH] powerpc/64: Fix setting of AIL in hypervisor mode
Date: Fri, 18 Nov 2016 09:38:26 +1100 [thread overview]
Message-ID: <1479422306.6542.32.camel@neuling.org> (raw)
In-Reply-To: <1479184113.2608.45.camel@kernel.crashing.org>
On Tue, 2016-11-15 at 15:28 +1100, Benjamin Herrenschmidt wrote:
> Commit d3cbff1b5 "powerpc: Put exception configuration in a common place"
> broke the setting of the AIL bit (which enables taking exceptions with
> the MMU still on) on all processors, moving it incorrectly to a function
> called only on the boot CPU. This was correct for the guest case but
> not when running in hypervisor mode.
>=20
> This fixes it by partially reverting that commit, putting the setting
> back in cpu_ready_for_interrupts()
>=20
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Fixes: d3cbff1b5 ("powerpc: Put exception configuration in a common place=
")
> CC: stable@vger.kernel.org # v4.8+
Acked-By: Michael Neuling <mikey@neuling.org>
> ---
> =C2=A0arch/powerpc/kernel/setup_64.c | 20 ++++++++++++++------
> =C2=A01 file changed, 14 insertions(+), 6 deletions(-)
>=20
> diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_6=
4.c
> index 7ac8e6e..ac75224 100644
> --- a/arch/powerpc/kernel/setup_64.c
> +++ b/arch/powerpc/kernel/setup_64.c
> @@ -226,17 +226,25 @@ static void __init configure_exceptions(void)
> =C2=A0 if (firmware_has_feature(FW_FEATURE_OPAL))
> =C2=A0 opal_configure_cores();
> =C2=A0
> - /* Enable AIL if supported, and we are in hypervisor mode */
> - if (early_cpu_has_feature(CPU_FTR_HVMODE) &&
> - =C2=A0=C2=A0=C2=A0=C2=A0early_cpu_has_feature(CPU_FTR_ARCH_207S)) {
> - unsigned long lpcr =3D mfspr(SPRN_LPCR);
> - mtspr(SPRN_LPCR, lpcr | LPCR_AIL_3);
> - }
> + /* AIL on native is done in cpu_ready_for_interrupts */
> =C2=A0 }
> =C2=A0}
> =C2=A0
> =C2=A0static void cpu_ready_for_interrupts(void)
> =C2=A0{
> + /*
> + =C2=A0* Enable AIL if supported, and we are in hypervisor mode. This
> + =C2=A0* is called once for every processor.
> + =C2=A0*
> + =C2=A0* If we are not in hypervisor mode the job is done once for
> + =C2=A0* the whole partition in configure_exceptions().
> + =C2=A0*/
> + if (early_cpu_has_feature(CPU_FTR_HVMODE) &&
> + =C2=A0=C2=A0=C2=A0=C2=A0early_cpu_has_feature(CPU_FTR_ARCH_207S)) {
> + unsigned long lpcr =3D mfspr(SPRN_LPCR);
> + mtspr(SPRN_LPCR, lpcr | LPCR_AIL_3);
> + }
> +
> =C2=A0 /* Set IR and DR in PACA MSR */
> =C2=A0 get_paca()->kernel_msr =3D MSR_KERNEL;
> =C2=A0}
>=20
prev parent reply other threads:[~2016-11-17 22:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-15 4:28 [PATCH] powerpc/64: Fix setting of AIL in hypervisor mode Benjamin Herrenschmidt
2016-11-17 5:00 ` Michael Ellerman
2016-11-17 22:38 ` Michael Neuling [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1479422306.6542.32.camel@neuling.org \
--to=mikey@neuling.org \
--cc=anton@au1.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=linuxppc-dev@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.