Re: [Qemu-devel] [PATCH 11/21] ppc/pnv: scan ISA bus to populate device tree

[David Gibson <david@gibson.dropbear.id.au>]

[-- Attachment #1: Type: text/plain, Size: 2224 bytes --]

On Wed, Apr 05, 2017 at 02:41:36PM +0200, Cédric Le Goater wrote:
> This is an empty shell that we will use to include nodes in the device
> tree for ISA devices. We expect RTC, UART and IPMI BT devices.
> 
> Signed-off-by: Cédric Le Goater <clg@kaod.org>

This is so simple, I'd probably fold it into the next patch.  But
apart from that.

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

> ---
>  hw/ppc/pnv.c | 32 ++++++++++++++++++++++++++++++++
>  1 file changed, 32 insertions(+)
> 
> diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
> index 493c7eed7980..a3c8f6594d10 100644
> --- a/hw/ppc/pnv.c
> +++ b/hw/ppc/pnv.c
> @@ -281,6 +281,36 @@ static void powernv_populate_chip(PnvChip *chip, void *fdt)
>      g_free(typename);
>  }
>  
> +typedef struct ForeachPopulateArgs {
> +    void *fdt;
> +    int offset;
> +} ForeachPopulateArgs;
> +
> +static int powernv_populate_isa_device(DeviceState *dev, void *opaque)
> +{
> +    return 0;
> +}
> +
> +static void powernv_populate_isa(ISABus *bus, void *fdt)
> +{
> +    int lpc_offset;
> +    ForeachPopulateArgs args;
> +
> +    lpc_offset = fdt_node_offset_by_compatible(fdt, -1, "ibm,lpc");
> +    if (lpc_offset < 0) {
> +        error_report("Could find the lpc node !?");
> +        return;
> +    }
> +
> +    args.fdt = fdt;
> +    args.offset = lpc_offset;
> +
> +    /* ISA devices are not necessarily parented to the ISA bus so we
> +     * can not use object_child_foreach() */
> +    qbus_walk_children(BUS(bus), powernv_populate_isa_device,
> +                       NULL, NULL, NULL, &args);
> +}
> +
>  static void *powernv_create_fdt(MachineState *machine)
>  {
>      const char plat_compat[] = "qemu,powernv\0ibm,powernv";
> @@ -328,6 +358,8 @@ static void *powernv_create_fdt(MachineState *machine)
>      for (i = 0; i < pnv->num_chips; i++) {
>          powernv_populate_chip(pnv->chips[i], fdt);
>      }
> +
> +    powernv_populate_isa(pnv->isa_bus, fdt);
>      return fdt;
>  }
>  

-- 
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: 819 bytes --]