From patchwork Fri Jul 20 01:47:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 142399 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2392037ljj; Thu, 19 Jul 2018 18:47:58 -0700 (PDT) X-Google-Smtp-Source: AAOMgpd5mZMmRvywCcYuI+GjCIbXJaAuL/CWixlW4m5lFGGlFkleOv1d0mmyGn0ExBenBG0bP+3f X-Received: by 2002:a17:902:7b97:: with SMTP id w23-v6mr132323pll.66.1532051277918; Thu, 19 Jul 2018 18:47:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532051277; cv=none; d=google.com; s=arc-20160816; b=KUHEacuGh1hWhnWiQvNxly8G/KdGKIpJPzS6naAXqs5OX8LadlSiEhaHvXEROTmzOD s4zztjo4YLKK1/r9T+GJQ0J5yo6lLYh3nxWw9KsENhtMYtEvSOM0C0F1CqbSExsDVZ3c WFCb2eqdAsUFBwDyDseWOO6R4nWpOQPGLns2U08BgG6jwH7g/gZh7CQtgb9pvk1+KyyS 1FixEckq+bRp7ToHeKEmoitVmSktb8KHDgl6HgwYmfVejtvDcd4nKIZ6zD/QHKBE4jbs fSaHicFauq2tnWtRwhf7liTiOb64EtOFYkmYIeawessB7COwWg1rMvXOtguDPWkLbOMr cqxQ== 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=R8FjDx/5/AYorqRHRnJLtJOBe70TB1GfwZzlNyciYuw=; b=o2JWLu2ErQl6V84DkHlu5NCa9cahTirJwI1M1gY2prgUmGVR6lywnRpmiIWwLoEeGM XMggg3/s9fGHZnZeB1cueAHnWMZJcIRcP/gybTBo/EzTGIRHfn5lCAaVkTVyZTulkhvY YmI9faHusfnL2avb94bJugpNc5FPxCMa5tRhHyFC43AbmgsyntTZUC2mz7WvwbEBnlSr jYOhGoIQw4QxpwQFN05YefHK2q5/JBeyjP7Qyp0XmUhNFqvLRja+ANPUZ6JfQRgYXgp2 /k3hIeNbmGHuSgCGokAwlcdfEkcKcKroq3RorPbPg0Xe2TlJii9bur4e8WDMOMtIkh/S xIzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=HnLFsnyv; 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 j17-v6si656419pfj.104.2018.07.19.18.47.57; Thu, 19 Jul 2018 18:47:57 -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=HnLFsnyv; 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 S1731209AbeGTCdq (ORCPT + 3 others); Thu, 19 Jul 2018 22:33:46 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:36652 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731147AbeGTCdp (ORCPT ); Thu, 19 Jul 2018 22:33:45 -0400 Received: by mail-pg1-f196.google.com with SMTP id s7-v6so1931834pgv.3 for ; Thu, 19 Jul 2018 18:47:55 -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=W3c4yJISsZ8njlrY27mOkZhrtgEwHQwsD2YRlK07pNU=; b=HnLFsnyvmq5bavtChtfoZG4xE36AR7SILCwwrOp2cvK4w0jROFyuOqe47PW4V2B3xm ZaMskY0oT0cuHVoypgl6eOgJR+IsXocd1P5gsd+Burz1y2JH6t/natdGZmS/wXNO5Tp5 g2PLVKhSPpAM1jbdgdtDQy4Jj9Ryl/r2VLUN4= 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=W3c4yJISsZ8njlrY27mOkZhrtgEwHQwsD2YRlK07pNU=; b=pcWG7LPu3YmkohkVXQEKumMEdXW9HPD1BFRyKKbrl0+iki2jHGhMSIz9P3TLzXMStj ogJTdtME1EV3QlNRnuFYpW2ULxKHp9Qk7S2jU6t00rxlPvCFfLo4lh8zck2EHgIoS/Ni W2OeHC75CdZSX7T1sVhKS8sN5L60+CMlzUkKrzyldBB/2IaOnfBx8Krylimsdlzpzboe VBBNWsfrR1w+jPS2EOgTaxD+gXLUrCBWeNoOvFoZPsVBObIlyfdX/5C32gHK67u5dnOk AxOLVo+kVjF5y7kCIpuPKY2iWlla99GYjJnvjg+51A7Rl+EgrJUt6PZKbk2gW93qMsl5 18MA== X-Gm-Message-State: AOUpUlEWFMxqK2ZPFtyak0x2D8oVu6K2cyGLcEnWnvW+55pwxg1FlL42 b0NiyRzaJPvj6Qzf03vWcMOLAXQtxRI= X-Received: by 2002:a63:1c5f:: with SMTP id c31-v6mr73888pgm.321.1532051274708; Thu, 19 Jul 2018 18:47:54 -0700 (PDT) Received: from localhost.localdomain (fs76eedbeb.tkyc508.ap.nuro.jp. [118.238.219.235]) by smtp.gmail.com with ESMTPSA id 203-v6sm475868pgb.14.2018.07.19.18.47.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jul 2018 18:47:54 -0700 (PDT) From: Ard Biesheuvel To: linux-efi@vger.kernel.org, Ingo Molnar , Thomas Gleixner Cc: Ard Biesheuvel , linux-kernel@vger.kernel.org, Andy Shevchenko , Hans de Goede , Lukas Wunner Subject: [PATCH 3/9] efi/x86: align efi_uga_draw_protocol typedef names to convention Date: Fri, 20 Jul 2018 10:47:20 +0900 Message-Id: <20180720014726.24031-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180720014726.24031-1-ard.biesheuvel@linaro.org> References: <20180720014726.24031-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. Tested-by: Hans de Goede 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 */