From patchwork Mon Apr 8 14:23:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 10889655 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4214417E0 for ; Mon, 8 Apr 2019 14:29:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2633D27F90 for ; Mon, 8 Apr 2019 14:29:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1AC8528396; Mon, 8 Apr 2019 14:29:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A4D1527F90 for ; Mon, 8 Apr 2019 14:29:53 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hDVFi-0002G4-VQ; Mon, 08 Apr 2019 14:28:02 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hDVFh-0002EF-Hb for xen-devel@lists.xenproject.org; Mon, 08 Apr 2019 14:28:01 +0000 X-Inumbo-ID: 82ee592a-5a0a-11e9-92d7-bc764e045a96 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 82ee592a-5a0a-11e9-92d7-bc764e045a96; Mon, 08 Apr 2019 14:28:00 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.60,325,1549929600"; d="scan'208";a="83010331" From: Anthony PERARD To: Date: Mon, 8 Apr 2019 15:23:52 +0100 Message-ID: <20190408142408.30419-16-anthony.perard@citrix.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190408142408.30419-1-anthony.perard@citrix.com> References: <20190408142408.30419-1-anthony.perard@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v2 15/31] OvmfPkg/XenHypercallLib: Enable it in PEIM X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ard Biesheuvel , Jordan Justen , Julien Grall , Anthony PERARD , xen-devel@lists.xenproject.org, Laszlo Ersek Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Allow to use Xen hypercalls earlier, during the PEIM stage, but XenHypercallLibReInit() must be called once the XenInfo HOB is created with the HyperPage setup. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Anthony PERARD --- OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf | 2 +- OvmfPkg/XenPlatformPei/XenPlatformPei.inf | 1 + OvmfPkg/Include/Library/XenHypercallLib.h | 12 ++++++++++++ OvmfPkg/Library/XenHypercallLib/X86XenHypercall.c | 11 +++++++++++ OvmfPkg/XenPlatformPei/Xen.c | 7 +++++++ 5 files changed, 32 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf b/OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf index d268e540fe..e0a1889171 100644 --- a/OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf +++ b/OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf @@ -21,7 +21,7 @@ [Defines] CONSTRUCTOR = XenHypercallLibInit [Defines.IA32, Defines.X64] - LIBRARY_CLASS = XenHypercallLib|DXE_DRIVER UEFI_DRIVER + LIBRARY_CLASS = XenHypercallLib|PEIM DXE_DRIVER UEFI_DRIVER [Defines.ARM, Defines.AARCH64] LIBRARY_CLASS = XenHypercallLib diff --git a/OvmfPkg/XenPlatformPei/XenPlatformPei.inf b/OvmfPkg/XenPlatformPei/XenPlatformPei.inf index 1870e39208..bc6065a709 100644 --- a/OvmfPkg/XenPlatformPei/XenPlatformPei.inf +++ b/OvmfPkg/XenPlatformPei/XenPlatformPei.inf @@ -66,6 +66,7 @@ [LibraryClasses] MtrrLib MemEncryptSevLib PcdLib + XenHypercallLib [Pcd] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase diff --git a/OvmfPkg/Include/Library/XenHypercallLib.h b/OvmfPkg/Include/Library/XenHypercallLib.h index 36e3344e2f..38e64ab108 100644 --- a/OvmfPkg/Include/Library/XenHypercallLib.h +++ b/OvmfPkg/Include/Library/XenHypercallLib.h @@ -16,6 +16,18 @@ #ifndef __XEN_HYPERCALL_LIB_H__ #define __XEN_HYPERCALL_LIB_H__ +/** + To call when the gEfiXenInfoGuid HOB became available after the library init + function has already been executed. + + This allow to make hypercall in the PEIM stage. +**/ +VOID +EFIAPI +XenHypercallLibReInit ( + VOID + ); + /** Check if the Xen Hypercall library is able to make calls to the Xen hypervisor. diff --git a/OvmfPkg/Library/XenHypercallLib/X86XenHypercall.c b/OvmfPkg/Library/XenHypercallLib/X86XenHypercall.c index 7cb7f46c9b..2ac7254759 100644 --- a/OvmfPkg/Library/XenHypercallLib/X86XenHypercall.c +++ b/OvmfPkg/Library/XenHypercallLib/X86XenHypercall.c @@ -78,6 +78,17 @@ XenHypercallLibInit ( return RETURN_SUCCESS; } +VOID +EFIAPI +XenHypercallLibReInit ( + VOID + ) +{ + if (HyperPage == NULL) { + XenHypercallLibInit(); + } +} + /** This function will put the two arguments in the right place (registers) and invoke the hypercall identified by HypercallID. diff --git a/OvmfPkg/XenPlatformPei/Xen.c b/OvmfPkg/XenPlatformPei/Xen.c index fb01094ba9..9d9e9f8020 100644 --- a/OvmfPkg/XenPlatformPei/Xen.c +++ b/OvmfPkg/XenPlatformPei/Xen.c @@ -32,6 +32,7 @@ #include #include #include +#include #include "Platform.h" #include "Xen.h" @@ -157,6 +158,12 @@ XenConnect ( sizeof(mXenInfo) ); + // + // Initialize the XenHypercall library, now that the XenInfo HOB is + // available + // + XenHypercallLibReInit (); + return EFI_SUCCESS; }