From patchwork Thu Jul 12 12:21:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 141823 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1445811ljj; Thu, 12 Jul 2018 05:22:05 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdqqd8k1rZAf2p/PB+wqtznk4UmqBrmZnxIeJCBcsP+h7Rvs9fbAyF+RCDra871c5irFOZ/ X-Received: by 2002:a17:902:8a87:: with SMTP id p7-v6mr1957436plo.281.1531398125065; Thu, 12 Jul 2018 05:22:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531398125; cv=none; d=google.com; s=arc-20160816; b=ieaawAWACP+4KBzb9nc4GBrcrWGfhXD27/wui2KnQf5JVphdvP2cwkoiHdKCAPxOeg 9vKdSr2sR6SxPVwOl4HV2wEfySF162OQj+oHUlNA18P/9tOH4BWpV9nPjWtIJYrPXO1G oHLUlKGBmAoARDjSG+Q8S17satKo6+KRp0USnTFNbJZYbg6udVMf899DGxanjzEc0D6Y jXsTheGTul/+9KknN83R1OijpcgXuaz7NikbygR2JV/17BrT6tk36HvI/8s3AeWaPywl v3xMyW9qR9GtJHnEKTl+KbQnqnzvy+yJ/4tB9Gmhq5nFrgAQkHHe+kckqh3FBvEfdvFA B0Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=JV1uVoUDq/3jhH69BLaIYv9CzyL9eJOVly68vFzBSMw=; b=xxCWmygIzmnRnmHjLQa0m3Ukdiq0lQWXwMcW4zhI1cq6VHpNK2v9EWdevyuTRP2C66 FTbZ9LLdEQf0HCvJWUhENhxEoRyuayo2map5Mcn4pAdWJ/FI25KAWIZkgMPsatIqtGor zjc/Q3D2Mgd2jQdgEx2JYrQ4MZe9hWnPyHkWAAtzyE2V5+aNE8pRVB+NbzLegbAAoYUW bh65u6kW9fBGl+U3U572F/YKG6P7LNnfBTsyK9vHlyHL04h+wNmPykyaSf6pvlUIDKvS oRbE8B0UboBhU5Yyafq0X4M0/5sVKBlWVH4Z9OV3lJPqo3O4u5Ceh81RmqqoTfczwAQ5 112w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=FFDl+jlz; spf=pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-efi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v8-v6si7016131pff.248.2018.07.12.05.22.04; Thu, 12 Jul 2018 05:22:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=FFDl+jlz; spf=pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-efi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726810AbeGLMbX (ORCPT + 3 others); Thu, 12 Jul 2018 08:31:23 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:43136 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726650AbeGLMbX (ORCPT ); Thu, 12 Jul 2018 08:31:23 -0400 Received: by mail-wr1-f66.google.com with SMTP id b15-v6so21527448wrv.10 for ; Thu, 12 Jul 2018 05:22:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lXByrcLbJy+t9KQq8NWgJSOFOA/CgZkdv1BMwsVKOaA=; b=FFDl+jlzEMwdWGdLSEc56EbVwCUoiQftcAN/IGo4AhOdZ+6XJdkPX+B2cQl0Mi+84i H0S4ztDPKgh6z32WrKC3HpSPjTzr7SvlgNuw98RQKB1DDjlkQHntYdoyxOhcjbOArNpB aSgC2fiVy6+unpHWvJHfYvtlqMOweZw05vwlE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lXByrcLbJy+t9KQq8NWgJSOFOA/CgZkdv1BMwsVKOaA=; b=Eis3bGY91yvHgKZmzz7FtuNAkHRAMBaGGXCfezL/gB1BGB9ZxYGJliky3no3WoFMC5 pPGSLGcz6gTadleQqZd/We6LTMw0U7f3ZgqlDsTZwy7cuKaM+/whspCqyboAKrw2/QZ6 3TGJiNV07jRYNENvSev/JL8boWr7vDDomf08YEmXICDXodNv9viVW6D5m+kpZNRp7b/D sQfkr2BmFwtNu76mi3KE77Y13feRe6zRohro6ogtcUeqtM1zI/xbGjg67Vv6cfZKyvyY RGElmplOaGfUT1duPjGZL0iadvi2CI5rNmMr5e3605DLyMCJbyXDnreXt5rYuqb9yxfe /VDQ== X-Gm-Message-State: AOUpUlFPnOJKXvR3Fn/mV/Bc9cZTUeVJpsn1GQ3sNkEoCEjmOXMNNqtO P6FT6sdw49dO5vj9uK/O3gpQjI5dpss= X-Received: by 2002:adf:ef03:: with SMTP id e3-v6mr1517049wro.182.1531398122531; Thu, 12 Jul 2018 05:22:02 -0700 (PDT) Received: from localhost.localdomain (33.153.69.91.rev.sfr.net. [91.69.153.33]) by smtp.gmail.com with ESMTPSA id y3-v6sm3551246wmd.24.2018.07.12.05.22.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Jul 2018 05:22:01 -0700 (PDT) From: Ard Biesheuvel To: linux-efi@vger.kernel.org Cc: sai.praneeth.prakhya@intel.com, mingo@kernel.org, hdegoede@redhat.com, lukas@wunner.de, Ard Biesheuvel Subject: [PATCH 3/6] efi/x86: align efi_uga_draw_protocol typedef names to convention Date: Thu, 12 Jul 2018 14:21:51 +0200 Message-Id: <20180712122154.13819-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180712122154.13819-1-ard.biesheuvel@linaro.org> References: <20180712122154.13819-1-ard.biesheuvel@linaro.org> Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org The linux-efi subsystem uses typedefs with the _t suffix to declare data structures that originate in the UEFI spec. Our type mangling for mixed mode depends on this convention, so rename the UGA drawing protocols to allow efi_call_proto() to be used with them in a subsequent patch. Signed-off-by: Ard Biesheuvel --- arch/x86/boot/compressed/eboot.c | 4 ++-- arch/x86/boot/compressed/eboot.h | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) -- 2.17.1 -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c index c72550783c16..011d5c289449 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c @@ -321,7 +321,7 @@ static void setup_quirks(struct boot_params *boot_params) static efi_status_t setup_uga32(void **uga_handle, unsigned long size, u32 *width, u32 *height) { - struct efi_uga_draw_protocol *uga = NULL, *first_uga; + efi_uga_draw_protocol_t *uga = NULL, *first_uga; efi_guid_t uga_proto = EFI_UGA_PROTOCOL_GUID; unsigned long nr_ugas; u32 *handles = (u32 *)uga_handle; @@ -366,7 +366,7 @@ setup_uga32(void **uga_handle, unsigned long size, u32 *width, u32 *height) static efi_status_t setup_uga64(void **uga_handle, unsigned long size, u32 *width, u32 *height) { - struct efi_uga_draw_protocol *uga = NULL, *first_uga; + efi_uga_draw_protocol_t *uga = NULL, *first_uga; efi_guid_t uga_proto = EFI_UGA_PROTOCOL_GUID; unsigned long nr_ugas; u64 *handles = (u64 *)uga_handle; diff --git a/arch/x86/boot/compressed/eboot.h b/arch/x86/boot/compressed/eboot.h index e799dc5c6448..8297387c4676 100644 --- a/arch/x86/boot/compressed/eboot.h +++ b/arch/x86/boot/compressed/eboot.h @@ -12,22 +12,22 @@ #define DESC_TYPE_CODE_DATA (1 << 0) -struct efi_uga_draw_protocol_32 { +typedef struct { u32 get_mode; u32 set_mode; u32 blt; -}; +} efi_uga_draw_protocol_32_t; -struct efi_uga_draw_protocol_64 { +typedef struct { u64 get_mode; u64 set_mode; u64 blt; -}; +} efi_uga_draw_protocol_64_t; -struct efi_uga_draw_protocol { +typedef struct { void *get_mode; void *set_mode; void *blt; -}; +} efi_uga_draw_protocol_t; #endif /* BOOT_COMPRESSED_EBOOT_H */