From patchwork Fri Nov 21 18:07:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alvise Rigo X-Patchwork-Id: 413573 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 081CC140161 for ; Mon, 24 Nov 2014 19:25:57 +1100 (AEDT) Received: from localhost ([::1]:51386 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xsoy2-0005R6-Vr for incoming@patchwork.ozlabs.org; Mon, 24 Nov 2014 03:25:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36912) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsowA-0002xg-61 for qemu-devel@nongnu.org; Mon, 24 Nov 2014 03:24:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xsow1-0005Z6-On for qemu-devel@nongnu.org; Mon, 24 Nov 2014 03:23:58 -0500 Received: from lputeaux-656-1-278-113.w80-15.abo.wanadoo.fr ([80.15.154.113]:35006 helo=alvise-Latitude-E5530.localdomain) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xsow1-0005YS-I8 for qemu-devel@nongnu.org; Mon, 24 Nov 2014 03:23:49 -0500 Received: from alvise-Latitude-E5530.localdomain (alvise-Latitude-E5530.localdomain [127.0.0.1]) by alvise-Latitude-E5530 (8.14.4/8.14.4/Debian-7) with ESMTP id sALI7tp1013801; Fri, 21 Nov 2014 19:07:55 +0100 Received: (from alvise@localhost) by alvise-Latitude-E5530.localdomain (8.14.4/8.14.4/Submit) id sALI7tqA013800; Fri, 21 Nov 2014 19:07:55 +0100 From: Alvise Rigo To: qemu-devel@nongnu.org Date: Fri, 21 Nov 2014 19:07:38 +0100 Message-Id: <1416593261-13751-2-git-send-email-a.rigo@virtualopensystems.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1416593261-13751-1-git-send-email-a.rigo@virtualopensystems.com> References: <1416593261-13751-1-git-send-email-a.rigo@virtualopensystems.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 80.15.154.113 Cc: rob.herring@linaro.org, tech@virtualopensystems.com, claudio.fontana@huawei.com, Alvise Rigo , peter.maydell@linaro.org Subject: [Qemu-devel] [RFC v2 1/4] hw/arm/virt: Allow multiple agents to modify dt X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Keep a global list with all the functions that need to modify the device tree. Using qemu_add_machine_init_done_notifier we register a notifier that executes all the functions on the list and loads the kernel. Signed-off-by: Alvise Rigo --- hw/arm/virt.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 314e55b..e8d527d 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -70,6 +70,16 @@ enum { VIRT_RTC, }; +typedef void (*modify_dtb_func)(void *fdt, DeviceState *dev); +typedef struct DTModifier { + QLIST_ENTRY(DTModifier) entry; + modify_dtb_func modify_dtb; + DeviceState *dev; +} DTModifier; + +static QLIST_HEAD(, DTModifier) dtb_modifiers = + QLIST_HEAD_INITIALIZER(dtb_modifiers); + typedef struct MemMapEntry { hwaddr base; hwaddr size; @@ -149,6 +159,23 @@ static VirtBoardInfo *find_machine_info(const char *cpu) return NULL; } +static void add_dtb_modifier(modify_dtb_func func, DeviceState *dev) +{ + DTModifier *mod_entry = g_new(DTModifier, 1); + mod_entry->modify_dtb = func; + mod_entry->dev = dev; + QLIST_INSERT_HEAD(&dtb_modifiers, mod_entry, entry); +} + +static void free_dtb_modifiers(void) +{ + while (!QLIST_EMPTY(&dtb_modifiers)) { + DTModifier *modifier = QLIST_FIRST(&dtb_modifiers); + QLIST_REMOVE(modifier, entry); + g_free(modifier); + } +} + static void create_fdt(VirtBoardInfo *vbi) { void *fdt = create_device_tree(&vbi->fdt_size); @@ -527,6 +554,29 @@ static void *machvirt_dtb(const struct arm_boot_info *binfo, int *fdt_size) return board->fdt; } +static void machvirt_finalize_dt(Notifier *notify, void *data) +{ + VirtBoardInfo *vbi; + MachineState *machine; + + machine = MACHINE(qdev_get_machine()); + + vbi = find_machine_info(machine->cpu_model); + if (!vbi) { + vbi = find_machine_info("cortex-a15"); + } + + struct DTModifier *modifier, *next; + QLIST_FOREACH_SAFE(modifier, &dtb_modifiers, entry, next) { + modifier->modify_dtb(vbi->fdt, modifier->dev); + } + + free_dtb_modifiers(); + + /* Load the kernel only after that the device tree has been modified. */ + arm_load_kernel(ARM_CPU(first_cpu), &vbi->bootinfo); +} + static void machvirt_init(MachineState *machine) { qemu_irq pic[NUM_IRQS]; @@ -604,6 +654,10 @@ static void machvirt_init(MachineState *machine) */ create_virtio_devices(vbi, pic); + Notifier *finalize_dtb_notifier = g_new(Notifier, 1); + finalize_dtb_notifier->notify = machvirt_finalize_dt; + qemu_add_machine_init_done_notifier(finalize_dtb_notifier); + vbi->bootinfo.ram_size = machine->ram_size; vbi->bootinfo.kernel_filename = machine->kernel_filename; vbi->bootinfo.kernel_cmdline = machine->kernel_cmdline; @@ -612,7 +666,6 @@ static void machvirt_init(MachineState *machine) vbi->bootinfo.board_id = -1; vbi->bootinfo.loader_start = vbi->memmap[VIRT_MEM].base; vbi->bootinfo.get_dtb = machvirt_dtb; - arm_load_kernel(ARM_CPU(first_cpu), &vbi->bootinfo); } static QEMUMachine machvirt_a15_machine = {