From patchwork Fri Jul 12 20:37:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 18350 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f71.google.com (mail-yh0-f71.google.com [209.85.213.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D5E1525E05 for ; Fri, 12 Jul 2013 20:55:53 +0000 (UTC) Received: by mail-yh0-f71.google.com with SMTP id f73sf12323246yha.6 for ; Fri, 12 Jul 2013 13:55:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=iHKe6QTXdRbAE3gYmg+SSEsck2rduQpI0e5HAPnIi3s=; b=cay6vJCE/vP1ZSQp3PMoO03zwKaIkVWNeKd3TGWlRxZK7/83wU7ft2Tosam0WZpyoF uILyKRP4qBLNQVwRCnK8CUB6PwHzc/ctyfC4iaCYd0D4sAU4Jly89Fv+XK9QclJqfOu0 jSs/uSC+q5MyzQchQZhbfawvU8y4D7gz/l1E1ET8yZ2QdECNckM2uinWTv54gccmFpUL VnKLYdps/jIl5TxAcVCIwc+dvRyw4nYXPB+Oj6XFWm6qHsUyKuplC7NPHXfPZS/b0+AY VZ/F2EtjhOy35JGtWrFHO3+Ydx5gtNtk+LA6KrMxgVAD4zYDBDWVqLBofjMQ4U3432m6 7sLw== X-Received: by 10.236.185.4 with SMTP id t4mr22816688yhm.21.1373662553594; Fri, 12 Jul 2013 13:55:53 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.85.232 with SMTP id k8ls3406720qez.55.gmail; Fri, 12 Jul 2013 13:55:53 -0700 (PDT) X-Received: by 10.52.91.202 with SMTP id cg10mr21454196vdb.85.1373662553408; Fri, 12 Jul 2013 13:55:53 -0700 (PDT) Received: from mail-vb0-f48.google.com (mail-vb0-f48.google.com [209.85.212.48]) by mx.google.com with ESMTPS id sj10si12712544vdc.14.2013.07.12.13.55.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 12 Jul 2013 13:55:53 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.48 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.48; Received: by mail-vb0-f48.google.com with SMTP id w15so1922134vbf.35 for ; Fri, 12 Jul 2013 13:55:53 -0700 (PDT) X-Received: by 10.58.211.227 with SMTP id nf3mr19978186vec.20.1373662553328; Fri, 12 Jul 2013 13:55:53 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.149.77 with SMTP id s13csp148442vcv; Fri, 12 Jul 2013 13:55:52 -0700 (PDT) X-Received: by 10.15.98.3 with SMTP id bi3mr47479400eeb.124.1373662552363; Fri, 12 Jul 2013 13:55:52 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id s8si34267790ees.238.2013.07.12.13.55.51 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 12 Jul 2013 13:55:52 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Uxk5P-00069b-J5; Fri, 12 Jul 2013 21:37:03 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Anthony Liguori , Alexander Graf , David Gibson , kvmarm@lists.cs.columbia.edu Subject: [PATCH v2 6/8] arm/boot: Allow boards to modify the FDT blob Date: Fri, 12 Jul 2013 21:37:00 +0100 Message-Id: <1373661422-23606-7-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1373661422-23606-1-git-send-email-peter.maydell@linaro.org> References: <1373661422-23606-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQloDveE9N9TgGLrFjaM8KA+j8z+NOF/8YL9tuZUNkocd8GUPNDx5x29TU7MFfxsWyavpyUO X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.48 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 --- 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 1166632..72ae562 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -293,6 +293,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;