On Wed, 26 Jul 2017 15:47:18 +1000 David Gibson <da...@gibson.dropbear.id.au> wrote:
> On Tue, Jul 25, 2017 at 08:02:03PM +0200, Greg Kurz wrote:
> > From: Nathan Fontenot <nf...@linux.vnet.ibm.com>
> >
> > This add entries to the root OF node to advertise our PHBs as being
> > DR-capable in accordance with PAPR specification.
> >
> > Signed-off-by: Nathan Fontenot <nf...@linux.vnet.ibm.com>
> > Signed-off-by: Michael Roth <mdr...@linux.vnet.ibm.com>
> > Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
> > Signed-off-by: Greg Kurz <gr...@kaod.org>
> > ---
> > Changes since RFC:
> > - rebased against ppc-for-2.10
> > - use error_report
> > ---
> > hw/ppc/spapr.c | 10 ++++++++++
> > 1 file changed, 10 insertions(+)
> >
> > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> > index 5950c009ab7e..632040f35ecc 100644
> > --- a/hw/ppc/spapr.c
> > +++ b/hw/ppc/spapr.c
> > @@ -1151,6 +1151,16 @@ static void *spapr_build_fdt(sPAPRMachineState
> > *spapr,
> > exit(1);
> > }
> >
> > + if (smc->dr_phb_enabled) {
> > + int offset = fdt_path_offset(fdt, "/");
>
> Offset of the root node is guaranteed to be 0, so you don't need
> fdt_path_offset().
>
Oh, I didn't know that.
BTW, there are two other places that also need to be fixed then:
$ git grep -n 'fdt_path_offset(fdt, "/")'
hw/ppc/pnv.c:95: cpus_offset = fdt_add_subnode(fdt, fdt_path_offset(fdt,
"/"),
hw/ppc/spapr.c:355: cpus_offset = fdt_add_subnode(fdt,
fdt_path_offset(fdt, "/"),
I'll send a patch.
> > + ret = spapr_drc_populate_dt(fdt, offset, NULL,
> > + SPAPR_DR_CONNECTOR_TYPE_PHB);
> > + if (ret < 0) {
> > + error_report("Couldn't set up PHB DR device tree properties");
> > + exit(1);
> > + }
> > + }
> > +
> > return fdt;
> > }
> >
> >
>
pgp9Stq4kP5L9.pgp
Description: OpenPGP digital signature
