From patchwork Tue Dec 16 10:42:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 42316 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 17EA226C54 for ; Tue, 16 Dec 2014 10:42:59 +0000 (UTC) Received: by mail-la0-f71.google.com with SMTP id q1sf8493985lam.6 for ; Tue, 16 Dec 2014 02:42:57 -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=u/M1WlgmCGOUife2kqxsl6ohrBUb0Z7joum60npAdUM=; b=TfJHqP+NVq16/9YArom+4I6hvcMoadRBxUXXdi+zGjY+Tn1ILB8uRpAP9qklPE9ksr JBqgvRkjjIJLFQMW+8f6gyydD3J/8LDfKJEKDK7BvyI3ETD71x5fgHNMcDuXj62Vxin1 QGPz9RPx9/B49i6tVRSSIsn3lSYi8NWnT6SEfT1BYJFE/s9z2EjL1rddim9bmuzC3JhI Gc8PrR9ArKnhu+S2gcpiAFSBXOJgsSFgm8h4kKdD0bh53pf3R+8HVIxdItOhjC/pNHMi hNCTAmuR3kFtsl6BtpzqSgCrafPRgo3llWA/sm0Qj30wFrffdVhWr7qeOXjue1/nH+26 fkFQ== X-Gm-Message-State: ALoCoQloRwpoj+tlYfVfpH5XI83MXwuc8zzTzWpisB5HEFdSYlfx+k8nhJeOW10v3HBpfsvGaCFa X-Received: by 10.112.32.163 with SMTP id k3mr168123lbi.17.1418726577499; Tue, 16 Dec 2014 02:42:57 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.136 with SMTP id m8ls711033laf.67.gmail; Tue, 16 Dec 2014 02:42:57 -0800 (PST) X-Received: by 10.112.139.196 with SMTP id ra4mr35240964lbb.95.1418726577091; Tue, 16 Dec 2014 02:42:57 -0800 (PST) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id c6si422277laa.50.2014.12.16.02.42.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 16 Dec 2014 02:42:57 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by mail-la0-f42.google.com with SMTP id gd6so11136716lab.29 for ; Tue, 16 Dec 2014 02:42:57 -0800 (PST) X-Received: by 10.152.37.7 with SMTP id u7mr11189013laj.74.1418726576965; Tue, 16 Dec 2014 02:42:56 -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.142.69 with SMTP id ru5csp993238lbb; Tue, 16 Dec 2014 02:42:56 -0800 (PST) X-Received: by 10.194.176.100 with SMTP id ch4mr61320265wjc.101.1418726575618; Tue, 16 Dec 2014 02:42:55 -0800 (PST) Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com. [74.125.82.45]) by mx.google.com with ESMTPS id n1si21192820wix.100.2014.12.16.02.42.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 16 Dec 2014 02:42:55 -0800 (PST) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 74.125.82.45 as permitted sender) client-ip=74.125.82.45; Received: by mail-wg0-f45.google.com with SMTP id b13so17136161wgh.18 for ; Tue, 16 Dec 2014 02:42:55 -0800 (PST) X-Received: by 10.180.101.200 with SMTP id fi8mr3519806wib.77.1418726573873; Tue, 16 Dec 2014 02:42:53 -0800 (PST) Received: from midway01-04-00.lavalab ([81.128.185.50]) by mx.google.com with ESMTPSA id l9sm16441901wic.21.2014.12.16.02.42.53 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 16 Dec 2014 02:42:53 -0800 (PST) From: Eric Auger To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org, agraf@suse.de, pbonzini@redhat.com, ard.biesheuvel@linaro.org, zhaoshenglong@huawei.com, a.rigo@virtualopensystems.com, joel.schopp@amd.com Cc: eric.auger@linaro.org, kvmarm@lists.cs.columbia.edu, patches@linaro.org, alex.williamson@redhat.com, peter.maydell@linaro.org, a.motakis@virtualopensystems.com Subject: [PATCH v7 2/3] hw/arm/boot: arm_load_kernel implemented as a machine init done notifier Date: Tue, 16 Dec 2014 10:42:34 +0000 Message-Id: <1418726555-20532-3-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1418726555-20532-1-git-send-email-eric.auger@linaro.org> References: <1418726555-20532-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.42 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 --- 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 e6a3c5b..1f01692 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -478,7 +478,7 @@ static void do_cpu_reset(void *opaque) } } -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; @@ -489,6 +489,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 = + container_of(notifier, ArmLoadKernelNotifier, 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 @@ -667,3 +672,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 cefc9e6..88cf80b 100644 --- a/include/hw/arm/arm.h +++ b/include/hw/arm/arm.h @@ -19,6 +19,16 @@ 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 { + ARMCPU *cpu; /* handle to the first cpu object */ + Notifier notifier; /* actual notifier */ +} ArmLoadKernelNotifier; + + /* arm_boot.c */ struct arm_boot_info { uint64_t ram_size; @@ -61,12 +71,30 @@ 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; hwaddr initrd_size; hwaddr entry; }; + +/** + * 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