From patchwork Wed Apr 15 15:34:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 6221731 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8EB729F389 for ; Wed, 15 Apr 2015 15:45:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 67608202A1 for ; Wed, 15 Apr 2015 15:45:22 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A8EE4202D1 for ; Wed, 15 Apr 2015 15:45:19 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YiPSF-0006VE-PL; Wed, 15 Apr 2015 15:42:19 +0000 Received: from mail-wg0-f47.google.com ([74.125.82.47]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YiPN2-0001Nh-6l for linux-arm-kernel@lists.infradead.org; Wed, 15 Apr 2015 15:36:56 +0000 Received: by wgsk9 with SMTP id k9so51084219wgs.3 for ; Wed, 15 Apr 2015 08:36:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lYw979lvQAYb/qcapwP9XguN2kTbI0ZNbqrh7UOeC8k=; b=E2wfbHCoX1uCaWyNZ4d6Sy0n/WCmruMPtiN+q0qrd1FI9X/dFXaueAfadBOLdd5VHp ++zviGPRFzdnQnDZ4Vzyux/RwS26gvGzIcDlt3705dlDwxi96T3rGkrENRTLxJlEYzw7 csXDVoOBpCjwYTV53SkbRCKm7gOdadW13SOw5TEDE2Mx5HPjOTDLi+c/93s4DqTOWTiJ R5vW8pr03gG2AFhKyHKLUaC7qiwUZcTvjOJVdN0dk49V4JvsbQj0VH07BEglD324w7Bj 3w33rFrqmpiWlY7ghbG7okSkv1vUsi0DLXmcKvqNUSFlIt8QINcUjAzAlN8KyqAQmyZD Uh6A== X-Gm-Message-State: ALoCoQnHOkMe10wqj7CuGUY5W8hLEh4IHHBNcc+zCPo+3uVmL7ZxEhNhmMcUwvVh9IJ2QD8QKzLY X-Received: by 10.194.248.132 with SMTP id ym4mr4580153wjc.74.1429112194174; Wed, 15 Apr 2015 08:36:34 -0700 (PDT) Received: from ards-macbook-pro.local ([90.174.5.175]) by mx.google.com with ESMTPSA id eh5sm7674765wic.20.2015.04.15.08.36.24 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 15 Apr 2015 08:36:33 -0700 (PDT) From: Ard Biesheuvel To: mark.rutland@arm.com, catalin.marinas@arm.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 13/13] arm64/efi: adapt to relaxed kernel Image placement requirements Date: Wed, 15 Apr 2015 17:34:24 +0200 Message-Id: <1429112064-19952-14-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1429112064-19952-1-git-send-email-ard.biesheuvel@linaro.org> References: <1429112064-19952-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150415_083656_398165_5283A3F5 X-CRM114-Status: GOOD ( 11.01 ) X-Spam-Score: -0.7 (/) Cc: Ard Biesheuvel X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This adapts the EFI stub kernel placement to the new relaxed requirements, by placing the kernel Image at the highest available 2 MB offset in physical memory. Signed-off-by: Ard Biesheuvel --- arch/arm64/kernel/efi-stub.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/efi-stub.c b/arch/arm64/kernel/efi-stub.c index f5374065ad53..60ae3324e26e 100644 --- a/arch/arm64/kernel/efi-stub.c +++ b/arch/arm64/kernel/efi-stub.c @@ -10,6 +10,7 @@ * */ #include +#include #include #include @@ -28,8 +29,8 @@ efi_status_t __init handle_kernel_image(efi_system_table_t *sys_table, kernel_size = _edata - _text; if (*image_addr != (dram_base + TEXT_OFFSET)) { kernel_memsize = kernel_size + (_end - _edata); - status = efi_low_alloc(sys_table, kernel_memsize + TEXT_OFFSET, - SZ_2M, reserve_addr); + status = efi_high_alloc(sys_table, kernel_memsize + TEXT_OFFSET, + MIN_KIMG_ALIGN, reserve_addr, ULONG_MAX); if (status != EFI_SUCCESS) { pr_efi_err(sys_table, "Failed to relocate kernel\n"); return status;