From patchwork Fri Apr 28 12:03:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Nikoleris X-Patchwork-Id: 13226320 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA8FFC77B7F for ; Fri, 28 Apr 2023 12:05:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346064AbjD1MFe (ORCPT ); Fri, 28 Apr 2023 08:05:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346012AbjD1MFW (ORCPT ); Fri, 28 Apr 2023 08:05:22 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 059E05B88 for ; Fri, 28 Apr 2023 05:05:12 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id EDFAE1515; Fri, 28 Apr 2023 05:05:55 -0700 (PDT) Received: from godel.lab.cambridge.arm.com (godel.lab.cambridge.arm.com [10.7.66.42]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E1FBF3F5A1; Fri, 28 Apr 2023 05:05:10 -0700 (PDT) From: Nikos Nikoleris To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, andrew.jones@linux.dev Cc: pbonzini@redhat.com, alexandru.elisei@arm.com, ricarkol@google.com, Andrew Jones Subject: [kvm-unit-tests PATCH v5 20/29] lib: Avoid ms_abi for calls related to EFI on arm64 Date: Fri, 28 Apr 2023 13:03:56 +0100 Message-Id: <20230428120405.3770496-21-nikos.nikoleris@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230428120405.3770496-1-nikos.nikoleris@arm.com> References: <20230428120405.3770496-1-nikos.nikoleris@arm.com> MIME-Version: 1.0 X-ARM-No-Footer: FoSSMail Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org x86_64 requires that EFI calls use the ms_abi calling convention. For arm64 this is unnecessary. Signed-off-by: Nikos Nikoleris Reviewed-by: Andrew Jones --- lib/linux/efi.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/linux/efi.h b/lib/linux/efi.h index 9a1cf87b..53748dd4 100644 --- a/lib/linux/efi.h +++ b/lib/linux/efi.h @@ -33,7 +33,11 @@ typedef u16 efi_char16_t; /* UNICODE character */ typedef u64 efi_physical_addr_t; typedef void *efi_handle_t; +#ifdef __x86_64__ #define __efiapi __attribute__((ms_abi)) +#else +#define __efiapi +#endif /* * The UEFI spec and EDK2 reference implementation both define EFI_GUID as