From patchwork Wed Jul 30 10:59:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 34510 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0C3C721330 for ; Wed, 30 Jul 2014 11:01:22 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id le20sf3025986vcb.1 for ; Wed, 30 Jul 2014 04:01:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=dy6t5g/jrQ5GQ+MPaM1OR//+qmCqJoIcep/ARh6CX/A=; b=bpf+TBnCleT5rQT1ztPKbLkiJJKismEvcF15ljToZPhgcZfLNJjOix5DjQcMwc5Piq l3GKgxE11AcmVXkdqk3FK+O2G7aCj2p2dqWTgVEmZv3slY4TbaX4tM7Ic5cwvghqpqGe Ix6x+cNEnw/WV/yIgcOPVndNwXdm8AdTYzIlywfK+VXkiPR363K7BtQ2u5wXsqQB9gBB +qPnjnqke4ssbdH28jjQRZlVJhaD6ZQEtBFGm9TlFmYYuanRFY0NZkvJ2HMrf3vbCb8D Y6Ca2/uKA6dwlletPad4afVgwI+6T96bjF4x3L2EDXS0zvFr/VgRPnMSqf5JisVeE9zg 90eA== X-Gm-Message-State: ALoCoQkGCU4bj2r2mrj6pyIDOtS9/OYkWursgTQGGrmsqu8M9oE99WHRLnR6ArOfeNOD3ALbU3gu X-Received: by 10.236.120.206 with SMTP id p54mr1106327yhh.47.1406718081808; Wed, 30 Jul 2014 04:01:21 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.85.40 with SMTP id m37ls484709qgd.18.gmail; Wed, 30 Jul 2014 04:01:21 -0700 (PDT) X-Received: by 10.221.47.9 with SMTP id uq9mr3171466vcb.48.1406718081677; Wed, 30 Jul 2014 04:01:21 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id dm6si1238219vcb.96.2014.07.30.04.01.21 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 30 Jul 2014 04:01:21 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id id10so1443997vcb.35 for ; Wed, 30 Jul 2014 04:01:21 -0700 (PDT) X-Received: by 10.52.231.226 with SMTP id tj2mr6746576vdc.16.1406718081583; Wed, 30 Jul 2014 04:01:21 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp18016vcb; Wed, 30 Jul 2014 04:01:21 -0700 (PDT) X-Received: by 10.66.240.238 with SMTP id wd14mr2870462pac.150.1406718080663; Wed, 30 Jul 2014 04:01:20 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id gj10si2007040pbd.96.2014.07.30.04.01.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jul 2014 04:01:20 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; 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 1XCRc9-00063A-Gq; Wed, 30 Jul 2014 11:00:09 +0000 Received: from mail-we0-f173.google.com ([74.125.82.173]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XCRbk-00054k-Ip for linux-arm-kernel@lists.infradead.org; Wed, 30 Jul 2014 10:59:45 +0000 Received: by mail-we0-f173.google.com with SMTP id q58so1013940wes.18 for ; Wed, 30 Jul 2014 03:59:20 -0700 (PDT) X-Received: by 10.180.38.51 with SMTP id d19mr5020417wik.10.1406717960915; Wed, 30 Jul 2014 03:59:20 -0700 (PDT) Received: from ards-macbook-pro.local (adsl26mo10.tel.net.ba. [95.156.174.10]) by mx.google.com with ESMTPSA id wu6sm4660963wjb.46.2014.07.30.03.59.19 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 30 Jul 2014 03:59:20 -0700 (PDT) From: Ard Biesheuvel To: linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, mark.rutland@arm.com, leif.lindholm@linaro.org, msalter@redhat.com, will.deacon@arm.com Subject: [PATCH v2 3/3] arm64/efi: efistub: don't abort if base of DRAM is occupied Date: Wed, 30 Jul 2014 12:59:04 +0200 Message-Id: <1406717944-24725-4-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1406717944-24725-1-git-send-email-ard.biesheuvel@linaro.org> References: <1406717944-24725-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140730_035944_768097_241F2715 X-CRM114-Status: GOOD ( 12.04 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.173 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [74.125.82.173 listed in wl.mailspike.net] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: matt.fleming@intel.com, 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+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ard.biesheuvel@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.220.176 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 If we cannot relocate the kernel Image to its preferred offset of base of DRAM plus TEXT_OFFSET, instead relocate it to the lowest available 2 MB boundary plus TEXT_OFFSET. We may lose a bit of memory at the low end, but we can still proceed normally otherwise. Signed-off-by: Ard Biesheuvel Acked-by: Mark Salter Acked-by: Mark Rutland --- arch/arm64/kernel/efi-stub.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/arch/arm64/kernel/efi-stub.c b/arch/arm64/kernel/efi-stub.c index 1317fef8dde9..d27dd982ff26 100644 --- a/arch/arm64/kernel/efi-stub.c +++ b/arch/arm64/kernel/efi-stub.c @@ -28,20 +28,16 @@ efi_status_t 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_relocate_kernel(sys_table, image_addr, - kernel_size, kernel_memsize, - dram_base + TEXT_OFFSET, - PAGE_SIZE); + status = efi_low_alloc(sys_table, kernel_memsize + TEXT_OFFSET, + SZ_2M, reserve_addr); if (status != EFI_SUCCESS) { pr_efi_err(sys_table, "Failed to relocate kernel\n"); return status; } - if (*image_addr != (dram_base + TEXT_OFFSET)) { - pr_efi_err(sys_table, "Failed to alloc kernel memory\n"); - efi_free(sys_table, kernel_memsize, *image_addr); - return EFI_LOAD_ERROR; - } - *image_size = kernel_memsize; + memcpy((void *)*reserve_addr + TEXT_OFFSET, (void *)*image_addr, + kernel_size); + *image_addr = *reserve_addr + TEXT_OFFSET; + *reserve_size = kernel_memsize + TEXT_OFFSET; }