From: David Gibson <david@gibson.dropbear.id.au>
To: Greg Kurz <groug@kaod.org>
Cc: lvivier@redhat.com, qemu-devel@nongnu.org, qemu-ppc@nongnu.org,
clg@kaod.org, mdroth@linux.vnet.ibm.com
Subject: Re: [for-5.0 1/4] spapr: Don't trigger a CAS reboot for XICS/XIVE mode changeover
Date: Mon, 2 Dec 2019 18:59:43 +1100 [thread overview]
Message-ID: <20191202075943.GB37909@umbus.fritz.box> (raw)
In-Reply-To: <20191202085009.44f3909f@bahia.w3ibm.bluemix.net>
[-- Attachment #1: Type: text/plain, Size: 4471 bytes --]
On Mon, Dec 02, 2019 at 08:50:09AM +0100, Greg Kurz wrote:
> On Fri, 29 Nov 2019 16:33:53 +1100
> David Gibson <david@gibson.dropbear.id.au> wrote:
>
> > PAPR allows the interrupt controller used on a POWER9 machine (XICS or
> > XIVE) to be selected by the guest operating system, by using the
> > ibm,client-architecture-support (CAS) feature negotiation call.
> >
> > Currently, if the guest selects an interrupt controller different from the
> > one selected at initial boot, this causes the system to be reset with the
> > new model and the boot starts again. This means we run through the SLOF
> > boot process twice, as well as any other bootloader (e.g. grub) in use
> > before the OS calls CAS. This can be confusing and/or inconvenient for
> > users.
> >
> > Thanks to two fairly recent changes, we no longer need this reboot. 1) we
> > now completely regenerate the device tree when CAS is called (meaning we
> > don't need special case updates for all the device tree changes caused by
> > the interrupt controller mode change), 2) we now have explicit code paths
> > to activate and deactivate the different interrupt controllers, rather than
> > just implicitly calling those at machine reset time.
> >
> > We can therefore eliminate the reboot for changing irq mode, simply by
> > putting a called to spapr_irq_update_active_intc() before we call
>
> putting a call
Fixed, thanks.
> > spapr_h_cas_compose_response() (which gives the updated device tree to the
> > guest firmware and OS).
> >
> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> > ---
>
> Convenient indeed ! :)
>
> Reviewed-by: Greg Kurz <groug@kaod.org>
>
> > hw/ppc/spapr_hcall.c | 33 +++++++++++++--------------------
> > 1 file changed, 13 insertions(+), 20 deletions(-)
> >
> > diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
> > index 140f05c1c6..05a7ca275b 100644
> > --- a/hw/ppc/spapr_hcall.c
> > +++ b/hw/ppc/spapr_hcall.c
> > @@ -1767,21 +1767,10 @@ static target_ulong h_client_architecture_support(PowerPCCPU *cpu,
> > }
> > spapr->cas_pre_isa3_guest = !spapr_ovec_test(ov1_guest, OV1_PPC_3_00);
> > spapr_ovec_cleanup(ov1_guest);
> > - if (!spapr->cas_reboot) {
> > - /* If spapr_machine_reset() did not set up a HPT but one is necessary
> > - * (because the guest isn't going to use radix) then set it up here. */
> > - if ((spapr->patb_entry & PATE1_GR) && !guest_radix) {
> > - /* legacy hash or new hash: */
> > - spapr_setup_hpt_and_vrma(spapr);
> > - }
> > - spapr->cas_reboot =
> > - (spapr_h_cas_compose_response(spapr, args[1], args[2],
> > - ov5_updates) != 0);
> > - }
> >
> > /*
> > - * Ensure the guest asks for an interrupt mode we support; otherwise
> > - * terminate the boot.
> > + * Ensure the guest asks for an interrupt mode we support;
> > + * otherwise terminate the boot.
> > */
> > if (guest_xive) {
> > if (!spapr->irq->xive) {
> > @@ -1797,14 +1786,18 @@ static target_ulong h_client_architecture_support(PowerPCCPU *cpu,
> > }
> > }
> >
> > - /*
> > - * Generate a machine reset when we have an update of the
> > - * interrupt mode. Only required when the machine supports both
> > - * modes.
> > - */
> > + spapr_irq_update_active_intc(spapr);
> > +
> > if (!spapr->cas_reboot) {
> > - spapr->cas_reboot = spapr_ovec_test(ov5_updates, OV5_XIVE_EXPLOIT)
> > - && spapr->irq->xics && spapr->irq->xive;
> > + /* If spapr_machine_reset() did not set up a HPT but one is necessary
> > + * (because the guest isn't going to use radix) then set it up here. */
> > + if ((spapr->patb_entry & PATE1_GR) && !guest_radix) {
> > + /* legacy hash or new hash: */
> > + spapr_setup_hpt_and_vrma(spapr);
> > + }
> > + spapr->cas_reboot =
> > + (spapr_h_cas_compose_response(spapr, args[1], args[2],
> > + ov5_updates) != 0);
> > }
> >
> > spapr_ovec_cleanup(ov5_updates);
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2019-12-02 8:37 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-29 5:33 [for-5.0 0/4] spapr: Improvements to CAS feature negotiation David Gibson
2019-11-29 5:33 ` [for-5.0 1/4] spapr: Don't trigger a CAS reboot for XICS/XIVE mode changeover David Gibson
2019-12-02 7:03 ` Cédric Le Goater
2019-12-02 7:50 ` Greg Kurz
2019-12-02 7:59 ` David Gibson [this message]
2019-11-29 5:33 ` [for-5.0 2/4] spapr: Improve handling of fdt buffer size David Gibson
2019-12-02 7:04 ` Cédric Le Goater
2019-12-02 7:52 ` Greg Kurz
2019-11-29 5:33 ` [for-5.0 3/4] spapr: Fold h_cas_compose_response() into h_client_architecture_support() David Gibson
2019-12-02 7:04 ` Cédric Le Goater
2019-12-02 8:23 ` Greg Kurz
2019-12-02 8:40 ` David Gibson
2019-11-29 5:33 ` [for-5.0 4/4] spapr: Simplify ovec diff David Gibson
2019-12-02 7:04 ` Cédric Le Goater
2019-12-02 7:05 ` [for-5.0 0/4] spapr: Improvements to CAS feature negotiation Cédric Le Goater
2019-12-03 5:00 ` David Gibson
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=20191202075943.GB37909@umbus.fritz.box \
--to=david@gibson.dropbear.id.au \
--cc=clg@kaod.org \
--cc=groug@kaod.org \
--cc=lvivier@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).