From patchwork Wed Jul 2 12:54:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 32980 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f197.google.com (mail-pd0-f197.google.com [209.85.192.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 662D220560 for ; Wed, 2 Jul 2014 12:57:33 +0000 (UTC) Received: by mail-pd0-f197.google.com with SMTP id fp1sf52021559pdb.8 for ; Wed, 02 Jul 2014 05:57:32 -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=AHW6B/izaYVFUcrth1NJMcdUCsg2sWTAP8R7BvFdUns=; b=NkBOe8TbyVF0GEXAjNJs4wPKpesyvRRyTFbyGN4c6hbYAMY5Lcnbxvv3YsHXl/19Ey fepAkAyipMLFL0u7SodBAq7VIAqz8bJI7p7zDr2Lo7LHAA7usWsP8GVN4cA8cBAGtm5f qV9TCTBot0SzO97oItm6xax9dbq0SRiQCcW64c2groIH19JBmp9uYx2ZK6k39JHH4HKJ ERLl2x3KUCQ7KgoC+ozjljKsGR4TmCmhkDRaG+81awiTVdcSqOs3zaRY3XV8Up20HJp3 OqEmTbyGfxqaMKjSTJ3B3LH4siVCvhwfcoF1dFlFhIzW2XMCxP2RtQRbw7QNp2qq0Lzi oH4Q== X-Gm-Message-State: ALoCoQlP3v5GyBs0Gpo9FY/BcDo5sdWqFZrwl4c2IDLD6KwqSlUkv8y44KoMtfDI/HuG+U4MknU1 X-Received: by 10.66.137.2 with SMTP id qe2mr1470090pab.43.1404305852752; Wed, 02 Jul 2014 05:57:32 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.104.177 with SMTP id a46ls28936qgf.7.gmail; Wed, 02 Jul 2014 05:57:32 -0700 (PDT) X-Received: by 10.58.248.34 with SMTP id yj2mr173113vec.43.1404305852608; Wed, 02 Jul 2014 05:57:32 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id og7si12857461vcb.23.2014.07.02.05.57.32 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 02 Jul 2014 05:57:32 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.177 as permitted sender) client-ip=209.85.128.177; Received: by mail-ve0-f177.google.com with SMTP id i13so11025569veh.36 for ; Wed, 02 Jul 2014 05:57:32 -0700 (PDT) X-Received: by 10.53.13.200 with SMTP id fa8mr123646vdd.57.1404305852492; Wed, 02 Jul 2014 05:57:32 -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 tc5csp291148vcb; Wed, 2 Jul 2014 05:57:32 -0700 (PDT) X-Received: by 10.68.90.68 with SMTP id bu4mr69393507pbb.5.1404305851813; Wed, 02 Jul 2014 05:57:31 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id mr8si30173301pbb.181.2014.07.02.05.57.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Jul 2014 05:57:31 -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 1X2K4H-0007g4-BR; Wed, 02 Jul 2014 12:55:21 +0000 Received: from mail-wg0-f45.google.com ([74.125.82.45]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X2K4E-0006ZZ-Q8 for linux-arm-kernel@lists.infradead.org; Wed, 02 Jul 2014 12:55:19 +0000 Received: by mail-wg0-f45.google.com with SMTP id l18so10969587wgh.4 for ; Wed, 02 Jul 2014 05:54:56 -0700 (PDT) X-Received: by 10.194.92.177 with SMTP id cn17mr60555215wjb.71.1404305696239; Wed, 02 Jul 2014 05:54:56 -0700 (PDT) Received: from ards-macbook-pro.local ([37.183.67.249]) by mx.google.com with ESMTPSA id r9sm54934910wia.17.2014.07.02.05.54.54 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 02 Jul 2014 05:54:55 -0700 (PDT) From: Ard Biesheuvel To: matt.fleming@intel.com, x86@kernel.org Subject: [PATCH v3 1/5] efi/arm64: Avoid EFI_ERROR as a generic return code Date: Wed, 2 Jul 2014 14:54:39 +0200 Message-Id: <1404305683-26501-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1404305683-26501-1-git-send-email-ard.biesheuvel@linaro.org> References: <1404305683-26501-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140702_055518_992335_778D7650 X-CRM114-Status: GOOD ( 10.48 ) 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.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.45 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [74.125.82.45 listed in wl.mailspike.net] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: linux-efi@vger.kernel.org, Ard Biesheuvel , catalin.marinas@arm.com, msalter@redhat.com, leif.lindholm@linaro.org, roy.franz@linaro.org, hpa@zytor.com, linux-arm-kernel@lists.infradead.org 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.128.177 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 As EFI_ERROR is not a UEFI result code but a local invention only intended to allow get_dram_base() to signal failure, we should not use it elsewhere. Replace with EFI_LOAD_ERROR. Signed-off-by: Ard Biesheuvel Signed-off-by: Matt Fleming Acked-by: Roy Franz --- arch/arm64/kernel/efi-stub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/efi-stub.c b/arch/arm64/kernel/efi-stub.c index e786e6cdc400..7aa7155a9740 100644 --- a/arch/arm64/kernel/efi-stub.c +++ b/arch/arm64/kernel/efi-stub.c @@ -69,7 +69,7 @@ static efi_status_t handle_kernel_image(efi_system_table_t *sys_table, 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_ERROR; + return EFI_LOAD_ERROR; } *image_size = kernel_memsize; }