From patchwork Thu Jan 15 10:31:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 43167 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0B5E0240D7 for ; Thu, 15 Jan 2015 10:31:56 +0000 (UTC) Received: by mail-wg0-f72.google.com with SMTP id a1sf7442071wgh.3 for ; Thu, 15 Jan 2015 02:31:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=KIo8l8ZOZxFNdvTEZIbiQUcd9iawmv9E84Rw4RWnJVg=; b=kAZb+H7xIiJIqgWzo/aKrGXT01PcQ8LnZSTAL3S9d0h9Gsw8BuLc/fk/wUGnokgbuh d40fmJjaURV6ZUP9LlM3VI5DIXl+WjN5XZdgQ61E4NPYSUWcFclV7UZVWo0rq6LVLFjP HBCDUh4ofVPhNB1tJ+O7/U+sx8KJwpFn80S+ACaAIVbMAWPfxitnwEUi+W+nvceYeZft hyzNOc1QskqfOo+sJfDkOTwkXOIW5fUlqXYA6G8nKXFxijKkfOyATB486vq761HvMSfg iNAdOf9D2GzlzLenycLe98j+2SXc8eCJZHDB1+Rqqs7l/TPS8iRUH7dLDQVJHmo1MwTg mmlw== X-Gm-Message-State: ALoCoQmBMZvg+lHDxp1pcR29dGuCmWQLG9aa+NXflCwMNuEjTO35j5w/JaiTyFrsC9bv8PsR2IOY X-Received: by 10.194.176.200 with SMTP id ck8mr1154986wjc.0.1421317915345; Thu, 15 Jan 2015 02:31:55 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.229 with SMTP id v5ls211441lav.11.gmail; Thu, 15 Jan 2015 02:31:55 -0800 (PST) X-Received: by 10.112.173.202 with SMTP id bm10mr418110lbc.24.1421317915045; Thu, 15 Jan 2015 02:31:55 -0800 (PST) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com. [209.85.215.50]) by mx.google.com with ESMTPS id lb3si1055490lab.20.2015.01.15.02.31.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 Jan 2015 02:31:54 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by mail-la0-f50.google.com with SMTP id pn19so12765784lab.9 for ; Thu, 15 Jan 2015 02:31:54 -0800 (PST) X-Received: by 10.112.173.202 with SMTP id bm10mr418092lbc.24.1421317914781; Thu, 15 Jan 2015 02:31:54 -0800 (PST) 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.112.9.200 with SMTP id c8csp1986034lbb; Thu, 15 Jan 2015 02:31:54 -0800 (PST) X-Received: by 10.180.72.199 with SMTP id f7mr60007055wiv.53.1421317913871; Thu, 15 Jan 2015 02:31:53 -0800 (PST) Received: from mail-we0-f181.google.com (mail-we0-f181.google.com. [74.125.82.181]) by mx.google.com with ESMTPS id bz7si1892678wjc.135.2015.01.15.02.31.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 Jan 2015 02:31:53 -0800 (PST) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 74.125.82.181 as permitted sender) client-ip=74.125.82.181; Received: by mail-we0-f181.google.com with SMTP id q58so13828764wes.12 for ; Thu, 15 Jan 2015 02:31:53 -0800 (PST) X-Received: by 10.181.12.112 with SMTP id ep16mr4479013wid.38.1421317913586; Thu, 15 Jan 2015 02:31:53 -0800 (PST) Received: from midway01-04-00.lavalab ([81.128.185.50]) by mx.google.com with ESMTPSA id cg8sm1530253wjc.1.2015.01.15.02.31.52 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 Jan 2015 02:31:53 -0800 (PST) From: Eric Auger To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org, kim.phillips@freescale.com, zhaoshenglong@huawei.com, a.rigo@virtualopensystems.com, agraf@suse.de, peter.maydell@linaro.org, pbonzini@redhat.com, afaerber@suse.de Cc: eric.auger@linaro.org, kvmarm@lists.cs.columbia.edu, patches@linaro.org, Bharat.Bhushan@freescale.com, alex.williamson@redhat.com Subject: [PATCH v10 2/4] hw/arm/boot: arm_load_kernel implemented as a machine init done notifier Date: Thu, 15 Jan 2015 10:31:37 +0000 Message-Id: <1421317899-32642-3-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1421317899-32642-1-git-send-email-eric.auger@linaro.org> References: <1421317899-32642-1-git-send-email-eric.auger@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: eric.auger@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) 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: , Device tree nodes for the platform bus and its children dynamic sysbus devices are added in a machine init done notifier. To load the dtb once, after those latter nodes are built and before ROM freeze, the actual arm_load_kernel existing code is moved into a notifier notify function, arm_load_kernel_notify. arm_load_kernel now only registers the corresponding notifier. Machine files that do not support platform bus stay unchanged. Machine files willing to support dynamic sysbus devices must call arm_load_kernel before sysbus-fdt arm_register_platform_bus_fdt_creator to make sure dynamic sysbus device nodes are integrated in the dtb. Signed-off-by: Eric Auger Reviewed-by: Shannon Zhao Reviewed-by: Alexander Graf --- v8 -> v9: - fix compilation with arm-linux-user - reorder fields in ArmLoadKernelNotifier and use DO_UPCAST v7 -> v8: - Add Reviewed-by from Alex & Shannon - rebase on 2.2.0 v6: creation of this patch file --- hw/arm/boot.c | 14 +++++++++++++- include/hw/arm/arm.h | 28 ++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 52ebd8b..1af00e0 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -537,7 +537,7 @@ static void load_image_to_fw_cfg(FWCfgState *fw_cfg, uint16_t size_key, fw_cfg_add_bytes(fw_cfg, data_key, data, size); } -void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) +static void arm_load_kernel_notify(Notifier *notifier, void *data) { CPUState *cs; int kernel_size; @@ -548,6 +548,11 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) hwaddr entry, kernel_load_offset; int big_endian; static const ARMInsnFixup *primary_loader; + ArmLoadKernelNotifier *n = DO_UPCAST(ArmLoadKernelNotifier, + notifier, notifier); + ARMCPU *cpu = n->cpu; + struct arm_boot_info *info = + container_of(n, struct arm_boot_info, load_kernel_notifier); /* CPU objects (unlike devices) are not automatically reset on system * reset, so we must always register a handler to do so. If we're @@ -755,3 +760,10 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) ARM_CPU(cs)->env.boot_info = info; } } + +void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) +{ + info->load_kernel_notifier.cpu = cpu; + info->load_kernel_notifier.notifier.notify = arm_load_kernel_notify; + qemu_add_machine_init_done_notifier(&info->load_kernel_notifier.notifier); +} diff --git a/include/hw/arm/arm.h b/include/hw/arm/arm.h index c4bf56d..3b4cfdd 100644 --- a/include/hw/arm/arm.h +++ b/include/hw/arm/arm.h @@ -13,12 +13,22 @@ #include "exec/memory.h" #include "hw/irq.h" +#include "qemu/notify.h" /* armv7m.c */ qemu_irq *armv7m_init(MemoryRegion *system_memory, int flash_size, int sram_size, const char *kernel_filename, const char *cpu_model); +/* + * struct used as a parameter of the arm_load_kernel machine init + * done notifier + */ +typedef struct { + Notifier notifier; /* actual notifier */ + ARMCPU *cpu; /* handle to the first cpu object */ +} ArmLoadKernelNotifier; + /* arm_boot.c */ struct arm_boot_info { uint64_t ram_size; @@ -65,6 +75,8 @@ struct arm_boot_info { * the user it should implement this hook. */ void (*modify_dtb)(const struct arm_boot_info *info, void *fdt); + /* machine init done notifier executing arm_load_dtb */ + ArmLoadKernelNotifier load_kernel_notifier; /* Used internally by arm_boot.c */ int is_linux; hwaddr initrd_start; @@ -76,6 +88,22 @@ struct arm_boot_info { */ bool firmware_loaded; }; + +/** + * arm_load_kernel - Loads memory with everything needed to boot + * + * @cpu: handle to the first CPU object + * @info: handle to the boot info struct + * Registers a machine init done notifier that copies to memory + * everything needed to boot, depending on machine and user options: + * kernel image, boot loaders, initrd, dtb. Also registers the CPU + * reset handler. + * + * In case the machine file supports the platform bus device and its + * dynamically instantiable sysbus devices, this function must be called + * before sysbus-fdt arm_register_platform_bus_fdt_creator. Indeed the + * machine init done notifiers are called in registration reverse order. + */ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info); /* Multiplication factor to convert from system clock ticks to qemu timer