On Wed, Apr 05, 2017 at 02:41:39PM +0200, Cédric Le Goater wrote: > When an ipmi-bt device [1] is defined on the ISA bus, we need to > populate the device tree with the object properties. Such devices are > created with the command line options : > > -device ipmi-bmc-sim,id=bmc0 -device isa-ipmi-bt,bmc=bmc0,irq=10 > > [1] https://lists.gnu.org/archive/html/qemu-devel/2015-11/msg03168.html > > Signed-off-by: Cédric Le Goater <c...@kaod.org> > --- > hw/ppc/pnv.c | 35 +++++++++++++++++++++++++++++++++++ > 1 file changed, 35 insertions(+) > > diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c > index 00e594a0cbe3..dfa1cf849b35 100644 > --- a/hw/ppc/pnv.c > +++ b/hw/ppc/pnv.c > @@ -332,6 +332,39 @@ static void powernv_populate_serial(ISADevice *d, void > *fdt, int lpc_off) > _FDT((fdt_setprop_string(fdt, node, "device_type", "serial"))); > } > > +static void powernv_populate_ipmi_bt(ISADevice *d, void *fdt, int lpc_off) > +{ > + const char compatible[] = "bt\0ipmi-bt"; > + uint32_t io_base = 0x0; > + uint32_t io_regs[] = { > + cpu_to_be32(1), > + cpu_to_be32(io_base),
Best not to include this part of the initializer, since you have to
overwrite it later anyway. Either just use 0 with a /*placeholder */
comment, or use designated array initializers.
> + cpu_to_be32(3)
> + };
> + uint32_t irq;
> + char *name;
> + int node;
> +
> + io_base = object_property_get_int(OBJECT(d), "ioport", &error_fatal);
> + io_regs[1] = cpu_to_be32(io_base);
> +
> + irq = object_property_get_int(OBJECT(d), "irq", &error_fatal);
> +
> + name = g_strdup_printf("%s@i%x", qdev_fw_name(DEVICE(d)), io_base);
> + node = fdt_add_subnode(fdt, lpc_off, name);
> + _FDT(node);
> + g_free(name);
> +
> + fdt_setprop(fdt, node, "reg", io_regs, sizeof(io_regs));
> + fdt_setprop(fdt, node, "compatible", compatible, sizeof(compatible));
> +
> + /* Mark it as reserved to avoid Linux trying to claim it */
> + _FDT((fdt_setprop_string(fdt, node, "status", "reserved")));
> + _FDT((fdt_setprop_cell(fdt, node, "interrupts", irq)));
> + _FDT((fdt_setprop_cell(fdt, node, "interrupt-parent",
> + fdt_get_phandle(fdt, lpc_off))));
> +}
> +
> typedef struct ForeachPopulateArgs {
> void *fdt;
> int offset;
> @@ -346,6 +379,8 @@ static int powernv_populate_isa_device(DeviceState *dev,
> void *opaque)
> powernv_populate_rtc(d, args->fdt, args->offset);
> } else if (object_dynamic_cast(OBJECT(dev), TYPE_ISA_SERIAL)) {
> powernv_populate_serial(d, args->fdt, args->offset);
> + } else if (object_dynamic_cast(OBJECT(dev), "isa-ipmi-bt")) {
> + powernv_populate_ipmi_bt(d, args->fdt, args->offset);
> } else {
> error_report("unknown isa device %s@i%x", qdev_fw_name(dev),
> d->ioport_id);
--
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
signature.asc
Description: PGP signature
