From patchwork Fri Apr 10 13:53:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 6197201 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 664F5BF4A6 for ; Fri, 10 Apr 2015 14:06:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 865A02022A for ; Fri, 10 Apr 2015 14:06:12 +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 584BE203E3 for ; Fri, 10 Apr 2015 14:06:06 +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 1YgZVv-0005T9-PH; Fri, 10 Apr 2015 14:02:31 +0000 Received: from mail-wi0-f172.google.com ([209.85.212.172]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YgZOU-0006LG-Gs for linux-arm-kernel@lists.infradead.org; Fri, 10 Apr 2015 13:54:51 +0000 Received: by wiax7 with SMTP id x7so16751635wia.0 for ; Fri, 10 Apr 2015 06:54:29 -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=aAeO7L093ELuZVUqhOWqj0AFXBSvToyT7NwwUNk9hJ0=; b=m687mmlbLDoAjy7+e0c/WDqLL/jKk0uUIEt+l56Bxuia4edk85tQ0s7WdGBzklm4v9 MZSkA070kc2hCAJUXCehEsfoSP4Bwlb0BmpP13oGRzoi7yUjBxfjYY0A3me5AuVeGqnp 0IyBvFSWbHy2MtD50ZAHguw0OAMiCSZ+PJufRPFzRO2pLJpBO+3BSZLv/5etuSKkw6Ls b/uudDJ036Y8dmejQdhwskDQkA4AnwcZoTye7nIljkorea4sY37YwHukxmFnT7G5Eput GSdAhj5/KXeSNltERu/V9WPECUy+TnAeidONG/j67VJuYB+48vqa7oIzyhgv5IMijupk Tpsg== X-Gm-Message-State: ALoCoQkZ7DSt9OXKNEa08e7XYhnIm4sVEXkluFnwKRfxYQ60iIn5x2LxOEcvAaq1JqihB9wVVW9g X-Received: by 10.194.88.131 with SMTP id bg3mr3356569wjb.119.1428674069182; Fri, 10 Apr 2015 06:54:29 -0700 (PDT) Received: from ards-macbook-pro.local ([84.78.25.50]) by mx.google.com with ESMTPSA id e2sm3051482wjy.46.2015.04.10.06.54.27 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 Apr 2015 06:54:28 -0700 (PDT) From: Ard Biesheuvel To: mark.rutland@arm.com, catalin.marinas@arm.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 11/11] arm64/efi: adapt to relaxed kernel Image placement requirements Date: Fri, 10 Apr 2015 15:53:55 +0200 Message-Id: <1428674035-26603-12-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1428674035-26603-1-git-send-email-ard.biesheuvel@linaro.org> References: <1428674035-26603-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150410_065450_734283_FB2774FE X-CRM114-Status: GOOD ( 10.61 ) 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/efi-stub.c b/arch/arm64/kernel/efi-stub.c index f5374065ad53..c2141ed8a043 100644 --- a/arch/arm64/kernel/efi-stub.c +++ b/arch/arm64/kernel/efi-stub.c @@ -28,8 +28,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, + SZ_2M, reserve_addr, ULONG_MAX); if (status != EFI_SUCCESS) { pr_efi_err(sys_table, "Failed to relocate kernel\n"); return status;