From patchwork Mon Jul 22 15:18:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 169409 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp7652702ilk; Mon, 22 Jul 2019 08:18:33 -0700 (PDT) X-Google-Smtp-Source: APXvYqyDMJeUlmN0PYT7pInHdXh7426G/ybNmREen1hD07V/1jAJzlHJoGP2ajBBJBnGbib4S490 X-Received: by 2002:a67:8cc7:: with SMTP id o190mr43156254vsd.24.1563808713286; Mon, 22 Jul 2019 08:18:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563808713; cv=none; d=google.com; s=arc-20160816; b=vxN9eRHtJvLtyl9XxxxLPjxTJUjEgn6dQbAPCk5fTs0KKfMTgjTz4PUagjUtakzCsT zSS4tb2kCMlg99YDBX1vpzz7G2FJnm4rLCGhiDX9A7KN4w1DOKTbmbDlB51zTBeJadLx mQ3pU3PQo57Zs70ns6krzR2D0KxqichKOeRNmjRinlcpNtkBCa7F1In9Si5gxHJpXjxM N9Lr5OVFlW1fMSdOK3ewyI4CaVTZR7+S2EDKb1ZS+ACnTueUSYKrtMA2tntl0gpKq5aI IMUUIcbAvGN6cZ4y8c+NfVXdZCVveDmjeOfpxD0msGjY4k66sVeXIJxHnme9rml4xAJK Orrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=OYBMZusYqESde0qHUOjc4d/ttVAW59Cu3YSqerf0Vp0=; b=EZhyFd7kGJ+9I/lv2k79cnk6cAsMPZH3ApS59cRwlrwX2LrI18Fo7SJd3VTf7KE0gY fymMA49pbYil6MoT3W8Kj8lziB/l/n2kP2Sn7jDnUPEyCVI4MXz4CC0M3bSXBzmrVncn /RTlesNONIgWUz0QoLlSKbmO4xvArKsNFud1Rn8CaXAVrNPpGOeJlqt3yaqh9jXQwOZ8 Ie3bFiAD1ZQHQ9YEgI7721JjkglIoGdJwK3/33Xs5NyR+9U/0edhFtEDv7kGJwYwNePh ++soPx1HOalnNbNOVzCJqqR07atH6nHA/36XZ0ZEtgaG4eh0BtbFHWeGLbTnW1iOIAsH dfJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="BYAkNYV/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k128si9873326vsd.302.2019.07.22.08.18.33 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Jul 2019 08:18:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="BYAkNYV/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpa5A-0002kv-49 for patch@linaro.org; Mon, 22 Jul 2019 11:18:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46765) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpa4o-0002hv-FY for qemu-devel@nongnu.org; Mon, 22 Jul 2019 11:18:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpa4n-00023G-AT for qemu-devel@nongnu.org; Mon, 22 Jul 2019 11:18:10 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:35935) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hpa4n-00022A-1L for qemu-devel@nongnu.org; Mon, 22 Jul 2019 11:18:09 -0400 Received: by mail-wr1-x442.google.com with SMTP id n4so39913882wrs.3 for ; Mon, 22 Jul 2019 08:18:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OYBMZusYqESde0qHUOjc4d/ttVAW59Cu3YSqerf0Vp0=; b=BYAkNYV/IKOanaijq53MZGBHOwjZxQ+QrPknvcXKF1JZrvOoF3xLjGRjSv+AOSGWWr 3wLEJvLq83zDi3Tr8DYh0kP6legijgYfAJ5pic8mCSgAodAS6hbCPfYrbOLQihe6mUf6 MIShX/Qg7GRlEYWKZt+LLOugBAxF25tAVs5nrVUg8VOFth7YlXqYduETHvOREtxDPe0P n4lqU/hFR4Y/kp6XQDjnOjjegGATmq7/Hokrx9zDtu8zkY6/zaSbsTU9O7BHi+omt/gU 9ntK94Dc+SyGsCmyvxiGABsFDTE5cD8LNcWcqXUGiUH06LI2jlKf6BetGmbtRTqIWNXZ 7ToA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OYBMZusYqESde0qHUOjc4d/ttVAW59Cu3YSqerf0Vp0=; b=iBTuvid7wHSfczpIKFQbsYUJhHTftDllbkFBQUECRPDD3g/nv0p62+EJUKbQzQTwav qW1a5ixFiSw2+H/CoMkeWVnWEqMlh0szbx1r3SFFbCBtg39ZFvMtB1GPKXJB4aKjmf/3 UP7ifk9Imos0jkzp0k64T/SMnNSWiI1ck594yiJX8cJ1jIAQ+WDLYUWiiQ93W9sLVKHB Hg0Fns4eahZmtTrutq/5kgEDJMfEtW13BGwRw2QXk5pDUR/Gecf3Cs22hWGQDJP2SjxY ncEuARFCiHqbE0RJtg/uxerX/GHuUnTPhxkXbTB6fQTVzyR5FsUR96tRAcIRghQPo8DZ SIMw== X-Gm-Message-State: APjAAAVbuSW/ZpObmhNQaaxSwZ5pqyxW5/JdOMB3Ut9Qa++lfqb5yh9l Rw5AglC/Js6oP5B5RqVFvBR3SA== X-Received: by 2002:adf:dd51:: with SMTP id u17mr72073092wrm.218.1563808687889; Mon, 22 Jul 2019 08:18:07 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id s15sm23163990wrw.21.2019.07.22.08.18.06 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 22 Jul 2019 08:18:07 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Date: Mon, 22 Jul 2019 16:18:03 +0100 Message-Id: <20190722151804.25467-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190722151804.25467-1-peter.maydell@linaro.org> References: <20190722151804.25467-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH for-4.1? 1/2] hw/arm/boot: Rename elf_{low, high}_addr to image_{low, high}_addr X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Rename the elf_low_addr and elf_high_addr variables to image_low_addr and image_high_addr -- in the next commit we will extend them to be set for other kinds of image file and not just ELF files. Signed-off-by: Peter Maydell --- hw/arm/boot.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) -- 2.20.1 Reviewed-by: Alex Bennée Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 1fb24fbef27..b7b31753aca 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -986,7 +986,9 @@ static void arm_setup_direct_kernel_boot(ARMCPU *cpu, int kernel_size; int initrd_size; int is_linux = 0; - uint64_t elf_entry, elf_low_addr, elf_high_addr; + uint64_t elf_entry; + /* Addresses of first byte used and first byte not used by the image */ + uint64_t image_low_addr, image_high_addr; int elf_machine; hwaddr entry; static const ARMInsnFixup *primary_loader; @@ -1014,24 +1016,24 @@ static void arm_setup_direct_kernel_boot(ARMCPU *cpu, info->nb_cpus = 1; /* Assume that raw images are linux kernels, and ELF images are not. */ - kernel_size = arm_load_elf(info, &elf_entry, &elf_low_addr, - &elf_high_addr, elf_machine, as); + kernel_size = arm_load_elf(info, &elf_entry, &image_low_addr, + &image_high_addr, elf_machine, as); if (kernel_size > 0 && have_dtb(info)) { /* * If there is still some room left at the base of RAM, try and put * the DTB there like we do for images loaded with -bios or -pflash. */ - if (elf_low_addr > info->loader_start - || elf_high_addr < info->loader_start) { + if (image_low_addr > info->loader_start + || image_high_addr < info->loader_start) { /* - * Set elf_low_addr as address limit for arm_load_dtb if it may be + * Set image_low_addr as address limit for arm_load_dtb if it may be * pointing into RAM, otherwise pass '0' (no limit) */ - if (elf_low_addr < info->loader_start) { - elf_low_addr = 0; + if (image_low_addr < info->loader_start) { + image_low_addr = 0; } info->dtb_start = info->loader_start; - info->dtb_limit = elf_low_addr; + info->dtb_limit = image_low_addr; } } entry = elf_entry;