From patchwork Thu Jun 26 14:23:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 4427971 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 97CB4BEEAA for ; Thu, 26 Jun 2014 14:27:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C6F0F2025B for ; Thu, 26 Jun 2014 14:27:27 +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 E64D72014A for ; Thu, 26 Jun 2014 14:27:26 +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 1X0AcH-0006MC-Jl; Thu, 26 Jun 2014 14:25:33 +0000 Received: from mail-we0-f176.google.com ([74.125.82.176]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X0Aaz-0003sh-Eh for linux-arm-kernel@lists.infradead.org; Thu, 26 Jun 2014 14:24:17 +0000 Received: by mail-we0-f176.google.com with SMTP id u56so3644852wes.21 for ; Thu, 26 Jun 2014 07:23:46 -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=fvFfjodsm17e5WSTnqpsdttteGFe47AcsahgbH4bFEI=; b=KU7odSsEWxt3QFBaQANFY/WVGmqq5k4PNcE4hc2t6pYzRMBBE77ruG7c0uFx7XGqxM fJucZcSPD2ugIgEIzMeyp5Plp8CFAJOcLp8VAoVHrtPZ7y8Yo/qxuG3KB+eAOV8QXgzg Ilref31PhCm2EVeoC4KwUaCReAF0wGCPLNW7xD4KKOZNIDN/yo9/SYn+Txm6/816AJA/ 7+tGo1KKl3P6Tqg6sSUg2CejnHzq44bFDrf4VYCh43L7MAatyih0CFgbCOUc0Jk01oK/ TggF2wuwQ47j9gDBibVuw3EvuV/Y9LkRepJVQNKvM1Fzocs23bVU6uOt2JkPSMx3tmjB 7E4Q== X-Gm-Message-State: ALoCoQmaU+l4/2Ymx6u2mdDOc3Zro2RlC++w0FcZ0IHBSBf1q6qm0vLmYWVFnrVpgJq9efsN4QfO X-Received: by 10.180.90.233 with SMTP id bz9mr4692598wib.42.1403792626283; Thu, 26 Jun 2014 07:23:46 -0700 (PDT) Received: from ards-macbook-pro.local ([109.114.99.252]) by mx.google.com with ESMTPSA id jb16sm25046864wic.10.2014.06.26.07.23.44 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Jun 2014 07:23:45 -0700 (PDT) From: Ard Biesheuvel To: matt.fleming@intel.com, x86@kernel.org Subject: [PATCH v2 1/5] efi/arm64: avoid EFI_ERROR as a generic return code Date: Thu, 26 Jun 2014 16:23:33 +0200 Message-Id: <1403792617-25792-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1403792617-25792-1-git-send-email-ard.biesheuvel@linaro.org> References: <1403792617-25792-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140626_072413_704068_D228E846 X-CRM114-Status: GOOD ( 10.36 ) X-Spam-Score: -0.7 (/) 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+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, 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 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 --- 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; }