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.155.168, mailfrom: anthony.perard@citrix.com) Received: from esa5.hc3370-68.iphmx.com (esa5.hc3370-68.iphmx.com [216.71.155.168]) by groups.io with SMTP; Thu, 04 Jul 2019 07:58:00 -0700 Authentication-Results: esa5.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 (esa5.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=esa5.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa5.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=esa5.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 (esa5.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=esa5.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: dIQw3QUXFi+/SQk5qM3M+r7+Z/jQ2oLvJO68EkV5pnBxQuz7tQD7LnavFCftsa6iMTnDSI0ihg o6ZDb3tcuk2iaSKl2Wzckw0i+CrQf7VOf0BTIEeakjKaMqdGZksq+LZ/GGpEnxXm7WHopsMQg5 rO+Dkmldb26iyFzPn5SfQeb1hYH5twnJY3LCkWnvHge9JAvpn7KA5zIRdBj0lnGvKth6nWp+pf Dqvl9XtR9ks012bOh0EGHTJicaAM1vUeuXOwELgwKIMy6vlkAheifOYtroZfGLLgqgriqVszUb lMg= X-SBRS: 2.7 X-MesageID: 2623834 X-Ironport-Server: esa5.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="2623834" From: "Anthony PERARD" To: CC: , Ard Biesheuvel , Jordan Justen , Laszlo Ersek , Julien Grall , Anthony PERARD Subject: [PATCH v3 10/35] OvmfPkg/XenPlatformPei: Detect OVMF_INFO from hvmloader Date: Thu, 4 Jul 2019 15:42:08 +0100 Message-ID: <20190704144233.27968-11-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 EFI_XEN_OVMF_INFO is only useful to retrieve the E820 table. The mXenHvmloaderInfo isn't used yet, but will be use in a further patch to retrieve the E820 table. Also remove the unused pointer from the XenInfo HOB as that information is only useful in the XenPlatformPei. Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1689 Signed-off-by: Anthony PERARD Acked-by: Laszlo Ersek --- Notes: v3: - fix coding style - fix commit message OvmfPkg/Include/Guid/XenInfo.h | 4 ---- OvmfPkg/PlatformPei/Xen.c | 3 --- OvmfPkg/XenPlatformPei/Xen.c | 25 +++++++++++++++++++++++-- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/OvmfPkg/Include/Guid/XenInfo.h b/OvmfPkg/Include/Guid/XenInfo.h index 25d76a7828..b052d618fd 100644 --- a/OvmfPkg/Include/Guid/XenInfo.h +++ b/OvmfPkg/Include/Guid/XenInfo.h @@ -18,10 +18,6 @@ typedef struct { ///=0D VOID *HyperPages;=0D ///=0D - /// Location of the hvm_info page.=0D - ///=0D - VOID *HvmInfo;=0D - ///=0D /// Hypervisor major version.=0D ///=0D UINT16 VersionMajor;=0D diff --git a/OvmfPkg/PlatformPei/Xen.c b/OvmfPkg/PlatformPei/Xen.c index 89dc4143b2..3e15b32a73 100644 --- a/OvmfPkg/PlatformPei/Xen.c +++ b/OvmfPkg/PlatformPei/Xen.c @@ -98,9 +98,6 @@ XenConnect ( mXenInfo.VersionMajor =3D (UINT16)(XenVersion >> 16);=0D mXenInfo.VersionMinor =3D (UINT16)(XenVersion & 0xFFFF);=0D =0D - /* TBD: Locate hvm_info and reserve it away. */=0D - mXenInfo.HvmInfo =3D NULL;=0D -=0D BuildGuidDataHob (=0D &gEfiXenInfoGuid,=0D &mXenInfo,=0D diff --git a/OvmfPkg/XenPlatformPei/Xen.c b/OvmfPkg/XenPlatformPei/Xen.c index 81042ab94f..d6361da306 100644 --- a/OvmfPkg/XenPlatformPei/Xen.c +++ b/OvmfPkg/XenPlatformPei/Xen.c @@ -33,6 +33,12 @@ STATIC UINT32 mXenLeaf =3D 0; =0D EFI_XEN_INFO mXenInfo;=0D =0D +//=0D +// Location of the firmware info struct setup by hvmloader.=0D +// Only the E820 table is used by OVMF.=0D +//=0D +EFI_XEN_OVMF_INFO *mXenHvmloaderInfo;=0D +=0D /**=0D Returns E820 map provided by Xen=0D =0D @@ -78,6 +84,8 @@ XenConnect ( UINT32 TransferReg;=0D UINT32 TransferPages;=0D UINT32 XenVersion;=0D + EFI_XEN_OVMF_INFO *Info;=0D + CHAR8 Sig[sizeof (Info->Signature) + 1];=0D =0D AsmCpuid (XenLeaf + 2, &TransferPages, &TransferReg, NULL, NULL);=0D mXenInfo.HyperPages =3D AllocatePages (TransferPages);=0D @@ -97,8 +105,21 @@ XenConnect ( mXenInfo.VersionMajor =3D (UINT16)(XenVersion >> 16);=0D mXenInfo.VersionMinor =3D (UINT16)(XenVersion & 0xFFFF);=0D =0D - /* TBD: Locate hvm_info and reserve it away. */=0D - mXenInfo.HvmInfo =3D NULL;=0D + //=0D + // Check if there are information left by hvmloader=0D + //=0D +=0D + Info =3D (EFI_XEN_OVMF_INFO *)(UINTN) OVMF_INFO_PHYSICAL_ADDRESS;=0D + //=0D + // Copy the signature, and make it null-terminated.=0D + //=0D + AsciiStrnCpyS (Sig, sizeof (Sig), (CHAR8 *) &Info->Signature,=0D + sizeof (Info->Signature));=0D + if (AsciiStrCmp (Sig, "XenHVMOVMF") =3D=3D 0) {=0D + mXenHvmloaderInfo =3D Info;=0D + } else {=0D + mXenHvmloaderInfo =3D NULL;=0D + }=0D =0D BuildGuidDataHob (=0D &gEfiXenInfoGuid,=0D --=20 Anthony PERARD