From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: citrix.com, ip: 216.71.145.153, mailfrom: anthony.perard@citrix.com) Received: from esa2.hc3370-68.iphmx.com (esa2.hc3370-68.iphmx.com [216.71.145.153]) by groups.io with SMTP; Thu, 04 Jul 2019 07:58:14 -0700 Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=anthony.perard@citrix.com; spf=Pass smtp.mailfrom=anthony.perard@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa2.hc3370-68.iphmx.com: no sender authenticity information available from domain of anthony.perard@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa2.hc3370-68.iphmx.com: domain of anthony.perard@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ~all" Received-SPF: None (esa2.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: AjrJ982ije/yG3O6ggYcbOwxVFQQ7wacJKXpOL2ZR0wudHhR4zEeauCMkomFDRxgEeeMrR50Zo omthIIFfVWQ3xNdOgu5p+CZUuEpgoHXFIdZ7TF5LXxUVNraPZNxPbvr9p3O8gOu1uzyyygq7lh LyXp5A7xhZev1DDO3rbdNdIIe7Sg41CeYXIVHwgjNgrY0kWRX7WRyKZZmmbHhbKNDbYF61nPFe W42QuInPq44T8IsXbDVcWrtgrVup+bZC8rsnWSvS52H0cInekl6hMPp103CuvNA1fiq+Ouh/eL nlU= X-SBRS: 2.7 X-MesageID: 2589148 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.63,451,1557201600"; d="scan'208";a="2589148" From: "Anthony PERARD" To: CC: , Ard Biesheuvel , Jordan Justen , Laszlo Ersek , Julien Grall , Anthony PERARD Subject: [PATCH v3 17/35] OvmfPkg/XenPlatformPei: Reinit XenHypercallLib Date: Thu, 4 Jul 2019 15:42:15 +0100 Message-ID: <20190704144233.27968-18-anthony.perard@citrix.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190704144233.27968-1-anthony.perard@citrix.com> References: <20190704144233.27968-1-anthony.perard@citrix.com> MIME-Version: 1.0 Return-Path: anthony.perard@citrix.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain The XenPlatformPei needs to make hypercalls, but the XenHypercallLib was initialised before the HyperPage was ready. Now that XenPlatformPei has initialised the HyperPage, reinitialise the XenHypercallLib. Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1689 Signed-off-by: Anthony PERARD --- Notes: v3: - new patch split from XenHypercallLib: Enable it in PEIM. - check for Lib initialisation failure. OvmfPkg/XenPlatformPei/XenPlatformPei.inf | 1 + OvmfPkg/XenPlatformPei/Xen.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/OvmfPkg/XenPlatformPei/XenPlatformPei.inf b/OvmfPkg/XenPlatfor= mPei/XenPlatformPei.inf index 4d00206d09..0ef77db92c 100644 --- a/OvmfPkg/XenPlatformPei/XenPlatformPei.inf +++ b/OvmfPkg/XenPlatformPei/XenPlatformPei.inf @@ -59,6 +59,7 @@ [LibraryClasses] MtrrLib=0D MemEncryptSevLib=0D PcdLib=0D + XenHypercallLib=0D =0D [Pcd]=0D gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase=0D diff --git a/OvmfPkg/XenPlatformPei/Xen.c b/OvmfPkg/XenPlatformPei/Xen.c index c5293498c4..877d776de8 100644 --- a/OvmfPkg/XenPlatformPei/Xen.c +++ b/OvmfPkg/XenPlatformPei/Xen.c @@ -26,6 +26,7 @@ #include =0D #include =0D #include =0D +#include =0D =0D #include "Platform.h"=0D #include "Xen.h"=0D @@ -88,6 +89,7 @@ XenConnect ( EFI_XEN_OVMF_INFO *Info;=0D CHAR8 Sig[sizeof (Info->Signature) + 1];=0D UINT32 *PVHResetVectorData;=0D + RETURN_STATUS Status;=0D =0D AsmCpuid (XenLeaf + 2, &TransferPages, &TransferReg, NULL, NULL);=0D mXenInfo.HyperPages =3D AllocatePages (TransferPages);=0D @@ -152,6 +154,13 @@ XenConnect ( sizeof(mXenInfo)=0D );=0D =0D + //=0D + // Initialize the XenHypercall library, now that the XenInfo HOB is=0D + // available=0D + //=0D + Status =3D XenHypercallLibInit ();=0D + ASSERT_RETURN_ERROR (Status);=0D +=0D return EFI_SUCCESS;=0D }=0D =0D --=20 Anthony PERARD