From patchwork Wed Jan 24 14:04:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 125665 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp437482ljf; Wed, 24 Jan 2018 06:05:33 -0800 (PST) X-Google-Smtp-Source: AH8x225EerGcDss83V8Mwy3BOGoVZLghCQCXHbHZR/mMFPPs55brWukRAtSsEkRJKmiXbS5RQlHr X-Received: by 10.80.158.238 with SMTP id a101mr23836795edf.166.1516802733612; Wed, 24 Jan 2018 06:05:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516802733; cv=none; d=google.com; s=arc-20160816; b=rG8m+f5sAo+SjHmPx4bqInygK6YC4py1X7vCSeq74MhMUv5YSZ9jpaUiJYF34Zwrw9 GTnxynvk6J6ZvqOb6+KOprsdss8HVzayZuu4lLXHF4IY3UfWwBc46D5w+V84K3W+QVVt BIdSEIt9WcDrQ8URpEQK7L8p0IvGR7dXFFXWVJX4DA8ItXj+7v3HEhacTO8Gqu4vmqsJ UzsFylMkbEG3sAWfFwMBXZSLYq1UK3NEPaF1xxqCbu5YwxibJWRicPpzAN47PbgWgZRA IW2XGKqMKwmQHAzyEgI46+J3n62lgj2z+WaK4dISf0MjxHwOU8i1ClkXH5eD68DTSnpC okXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:arc-authentication-results; bh=gsmFIM0PEpGLjKduGx/RtCfW6yl7i8QruQDuaD72Y2k=; b=ynnqQjqEGdZMsNYewrv8WTMWqo1Wq9IejhFFf25wHKcGosQOhe9iDveXU22ENYrsHE kEuU2iEA5BzwsLvFGXO6egZ2bSmfv2+GUYqORRUPLIa/j0yoj9Z15x4FF65fubW3iuXQ PJ1MA0BNxOkllYmWJgYpEq0JsvLUUZbkRjCAjSzLzSuk2lKGYzZHp5V1rwSf0HhFaCtf dL3Jzf7CVKegNqso50ybz27oBuMTugLjio4wB0A0W+NGlzWURTHy/zWcK5ZbYnWpydNv Y6FPvhajzsieSerOP/O7on/qXE3uqaabqlop4Jqt/MJxUatP4zskMOOC5qfytmBMJ6T2 +sZA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id m59si216225ede.46.2018.01.24.06.05.33; Wed, 24 Jan 2018 06:05:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 3CFCBC2224F; Wed, 24 Jan 2018 14:05:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 6310AC22227; Wed, 24 Jan 2018 14:04:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 89AB8C21F2B; Wed, 24 Jan 2018 14:04:55 +0000 (UTC) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by lists.denx.de (Postfix) with ESMTPS id 16F8CC21F5B for ; Wed, 24 Jan 2018 14:04:55 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 9F470ADF6; Wed, 24 Jan 2018 14:04:54 +0000 (UTC) From: Alexander Graf To: u-boot@lists.denx.de Date: Wed, 24 Jan 2018 15:04:54 +0100 Message-Id: <20180124140454.82768-2-agraf@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20180124140454.82768-1-agraf@suse.de> References: <20180124140454.82768-1-agraf@suse.de> Cc: Heinrich Schuchardt Subject: [U-Boot] [PATCH 2/2] efi_loader: Always use EFIAPI instead of asmlinkage X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" EFI calls are usually defined as asmlinkage. That means we pass all parameters to functions via the stack x86_32. On x86_64 however, we need to also stick to the MS ABI calling conventions, which the EFIAPI define conveniently handles for us. Most EFI functions were also marked with EFIAPI, except for the entry call. So this patch adjusts all entry calls to use EFIAPI instead of the manual asmlinkage attribute. While at it, we also change the prototype of the entry point to return efi_status_t instead of ulong, as this is the correct prototype definition. Signed-off-by: Alexander Graf --- cmd/bootefi.c | 11 ++++++----- lib/efi_loader/efi_boottime.c | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 51213c0293..545cfecc12 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -126,8 +126,9 @@ static void *copy_fdt(void *fdt) static efi_status_t efi_do_enter( efi_handle_t image_handle, struct efi_system_table *st, - asmlinkage ulong (*entry)(efi_handle_t image_handle, - struct efi_system_table *st)) + EFIAPI efi_status_t (*entry)( + efi_handle_t image_handle, + struct efi_system_table *st)) { efi_status_t ret = EFI_LOAD_ERROR; @@ -138,7 +139,7 @@ static efi_status_t efi_do_enter( } #ifdef CONFIG_ARM64 -static efi_status_t efi_run_in_el2(asmlinkage ulong (*entry)( +static efi_status_t efi_run_in_el2(EFIAPI efi_status_t (*entry)( efi_handle_t image_handle, struct efi_system_table *st), efi_handle_t image_handle, struct efi_system_table *st) { @@ -162,8 +163,8 @@ static efi_status_t do_bootefi_exec(void *efi, void *fdt, struct efi_device_path *memdp = NULL; ulong ret; - ulong (*entry)(efi_handle_t image_handle, struct efi_system_table *st) - asmlinkage; + EFIAPI efi_status_t (*entry)(efi_handle_t image_handle, + struct efi_system_table *st); ulong fdt_pages, fdt_size, fdt_start, fdt_end; const efi_guid_t fdt_guid = EFI_FDT_GUID; bootm_headers_t img = { 0 }; diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 39d8511fe3..5b78740bff 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1534,8 +1534,8 @@ static efi_status_t EFIAPI efi_start_image(efi_handle_t image_handle, unsigned long *exit_data_size, s16 **exit_data) { - asmlinkage ulong (*entry)(efi_handle_t image_handle, - struct efi_system_table *st); + EFIAPI ulong (*entry)(efi_handle_t image_handle, + struct efi_system_table *st); struct efi_loaded_image *info = image_handle; efi_status_t ret;