All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Maydell <peter.maydell@linaro.org>
To: Anthony Liguori <aliguori@us.ibm.com>
Cc: qemu-devel@nongnu.org, Paul Brook <paul@codesourcery.com>
Subject: [Qemu-devel] [PULL 06/10] arm/boot: Allow boards to modify the FDT blob
Date: Mon, 22 Jul 2013 12:43:43 +0100	[thread overview]
Message-ID: <1374493427-3254-7-git-send-email-peter.maydell@linaro.org> (raw)
In-Reply-To: <1374493427-3254-1-git-send-email-peter.maydell@linaro.org>

Add a callback hook in arm_boot_info to allow board models to
modify the device tree blob if they need to. (The major expected
use case is to add virtio-mmio nodes for virtio-mmio transports
that exist in QEMU but not in the hardware.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1373977512-28932-7-git-send-email-peter.maydell@linaro.org
---
 hw/arm/boot.c        |    5 +++++
 include/hw/arm/arm.h |    4 ++++
 2 files changed, 9 insertions(+)

diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index 1780316..9fbe5d2 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -294,6 +294,11 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo)
             goto fail;
         }
     }
+
+    if (binfo->modify_dtb) {
+        binfo->modify_dtb(binfo, fdt);
+    }
+
     qemu_devtree_dumpdtb(fdt, size);
 
     cpu_physical_memory_write(addr, fdt, size);
diff --git a/include/hw/arm/arm.h b/include/hw/arm/arm.h
index 7b2b02d..bae87c6 100644
--- a/include/hw/arm/arm.h
+++ b/include/hw/arm/arm.h
@@ -55,6 +55,10 @@ struct arm_boot_info {
                                  const struct arm_boot_info *info);
     void (*secondary_cpu_reset_hook)(ARMCPU *cpu,
                                      const struct arm_boot_info *info);
+    /* if a board needs to be able to modify a device tree provided by
+     * the user it should implement this hook.
+     */
+    void (*modify_dtb)(const struct arm_boot_info *info, void *fdt);
     /* Used internally by arm_boot.c */
     int is_linux;
     hwaddr initrd_start;
-- 
1.7.9.5

  parent reply	other threads:[~2013-07-22 11:54 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-22 11:43 [Qemu-devel] [PULL 00/10] arm-devs queue Peter Maydell
2013-07-22 11:43 ` [Qemu-devel] [PULL 01/10] device_tree: Add qemu_devtree_setprop_sized_cells() utility functions Peter Maydell
2013-07-22 11:43 ` [Qemu-devel] [PULL 02/10] arm/boot: Use qemu_devtree_setprop_sized_cells() Peter Maydell
2013-07-22 11:43 ` [Qemu-devel] [PULL 03/10] virtio: Add support for guest setting of queue size Peter Maydell
2013-07-22 11:43 ` [Qemu-devel] [PULL 04/10] virtio: Support transports which can specify the vring alignment Peter Maydell
2013-07-22 11:43 ` [Qemu-devel] [PULL 05/10] virtio: Implement MMIO based virtio transport Peter Maydell
2013-07-22 11:43 ` Peter Maydell [this message]
2013-07-22 11:43 ` [Qemu-devel] [PULL 07/10] vexpress: Make VEDBoardInfo extend arm_boot_info Peter Maydell
2013-07-22 11:43 ` [Qemu-devel] [PULL 08/10] vexpress: Add virtio-mmio transports Peter Maydell
2013-07-22 11:43 ` [Qemu-devel] [PULL 09/10] hw/loader: Support ramdisk with u-boot header Peter Maydell
2013-07-22 11:43 ` [Qemu-devel] [PULL 10/10] hw/arm: Use 'load_ramdisk()' for loading ramdisks w/ U-Boot header Peter Maydell

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=1374493427-3254-7-git-send-email-peter.maydell@linaro.org \
    --to=peter.maydell@linaro.org \
    --cc=aliguori@us.ibm.com \
    --cc=paul@codesourcery.com \
    --cc=qemu-devel@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.