From: Greg Kurz <groug@kaod.org>
To: Alexey Kardashevskiy <aik@ozlabs.ru>
Cc: qemu-devel@nongnu.org, qemu-ppc@nongnu.org,
David Gibson <david@gibson.dropbear.id.au>
Subject: Re: [Qemu-devel] [Qemu-ppc] [PATCH qemu] spapr: Drop unused parameters from fdt building helper
Date: Wed, 30 Jan 2019 13:43:03 +0100 [thread overview]
Message-ID: <20190130134303.754a43ab@bahia.lan> (raw)
In-Reply-To: <20190130014216.98287-1-aik@ozlabs.ru>
On Wed, 30 Jan 2019 12:42:16 +1100
Alexey Kardashevskiy <aik@ozlabs.ru> wrote:
> spapr_load_rtas() handles now RTAS address and size information in the FDT
> so drop them from spapr_build_fdt().
>
> While we are here, fix a small typo.
>
> Fixes: 2cac78c12ade9 "pseries: Consolidate RTAS loading"
One nit. The last rtas_* user in spapr_build_fdt() was removed by the
following hunk:
@@ -949,12 +966,6 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr,
}
}
- /* RTAS */
- ret = spapr_rtas_device_tree_setup(fdt, rtas_addr, rtas_size);
- if (ret < 0) {
- error_report("Couldn't set up RTAS device tree properties");
- }
-
/* cpus */
spapr_populate_cpus_dt_node(fdt, spapr);
from commit:
3f5dabceba24 "pseries: Consolidate construction of /rtas device tree node"
Reviewed-by: Greg Kurz <groug@kaod.org>
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> ---
> hw/ppc/spapr.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index a217c7f..fa12723 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -1225,9 +1225,7 @@ static void spapr_dt_hypervisor(sPAPRMachineState *spapr, void *fdt)
> }
> }
>
> -static void *spapr_build_fdt(sPAPRMachineState *spapr,
> - hwaddr rtas_addr,
> - hwaddr rtas_size)
> +static void *spapr_build_fdt(sPAPRMachineState *spapr)
> {
> MachineState *machine = MACHINE(spapr);
> MachineClass *mc = MACHINE_GET_CLASS(machine);
> @@ -1644,14 +1642,14 @@ static void spapr_machine_reset(void)
>
> /*
> * We place the device tree and RTAS just below either the top of the RMA,
> - * or just below 2GB, whichever is lowere, so that it can be
> + * or just below 2GB, whichever is lower, so that it can be
> * processed with 32-bit real mode code if necessary
> */
> rtas_limit = MIN(spapr->rma_size, RTAS_MAX_ADDR);
> rtas_addr = rtas_limit - RTAS_MAX_SIZE;
> fdt_addr = rtas_addr - FDT_MAX_SIZE;
>
> - fdt = spapr_build_fdt(spapr, rtas_addr, spapr->rtas_size);
> + fdt = spapr_build_fdt(spapr);
>
> spapr_load_rtas(spapr, fdt, rtas_addr);
>
next prev parent reply other threads:[~2019-01-30 12:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-30 1:42 [Qemu-devel] [PATCH qemu] spapr: Drop unused parameters from fdt building helper Alexey Kardashevskiy
2019-01-30 12:43 ` Greg Kurz [this message]
2019-01-30 16:43 ` [Qemu-devel] [Qemu-ppc] " Philippe Mathieu-Daudé
2019-01-30 16:53 ` Greg Kurz
2019-01-30 22:50 ` 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=20190130134303.754a43ab@bahia.lan \
--to=groug@kaod.org \
--cc=aik@ozlabs.ru \
--cc=david@gibson.dropbear.id.au \
--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 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.