From: Anthony PERARD <anthony.perard@citrix.com> To: edk2-devel@lists.01.org Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>, Jordan Justen <jordan.l.justen@intel.com>, Julien Grall <julien.grall@arm.com>, Anthony PERARD <anthony.perard@citrix.com>, xen-devel@lists.xenproject.org, Laszlo Ersek <lersek@redhat.com> Subject: [PATCH v2 18/31] OvmfPkg/XenPlatformPei: Setup HyperPages earlier Date: Mon, 8 Apr 2019 15:23:55 +0100 [thread overview] Message-ID: <20190408142408.30419-19-anthony.perard@citrix.com> (raw) In-Reply-To: <20190408142408.30419-1-anthony.perard@citrix.com> We are going to need to make an hypercall in order to retreive the E820 table from the hypervisor before been able to setup the memory. Calling XenConnect earlier will allow to setup the XenHypercallLib earlier to allow to make hypercalls. While here, add some comments in XenConnect(). Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> --- OvmfPkg/XenPlatformPei/Platform.h | 5 +++++ OvmfPkg/XenPlatformPei/Platform.c | 2 ++ OvmfPkg/XenPlatformPei/Xen.c | 23 ++++++++++---------- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/OvmfPkg/XenPlatformPei/Platform.h b/OvmfPkg/XenPlatformPei/Platform.h index 5565d47e34..a524c23a43 100644 --- a/OvmfPkg/XenPlatformPei/Platform.h +++ b/OvmfPkg/XenPlatformPei/Platform.h @@ -85,6 +85,11 @@ InstallClearCacheCallback ( VOID ); +EFI_STATUS +XenConnect ( + VOID + ); + EFI_STATUS InitializeXen ( VOID diff --git a/OvmfPkg/XenPlatformPei/Platform.c b/OvmfPkg/XenPlatformPei/Platform.c index 2d567a4760..5e6d553ad5 100644 --- a/OvmfPkg/XenPlatformPei/Platform.c +++ b/OvmfPkg/XenPlatformPei/Platform.c @@ -421,6 +421,8 @@ InitializeXenPlatform ( CpuDeadLoop (); } + XenConnect (); + BootModeInitialization (); AddressWidthInitialization (); diff --git a/OvmfPkg/XenPlatformPei/Xen.c b/OvmfPkg/XenPlatformPei/Xen.c index 22c7a22c88..b36eff524d 100644 --- a/OvmfPkg/XenPlatformPei/Xen.c +++ b/OvmfPkg/XenPlatformPei/Xen.c @@ -78,14 +78,11 @@ XenGetE820Map ( /** Connects to the Hypervisor. - @param XenLeaf CPUID index used to connect. - @return EFI_STATUS **/ EFI_STATUS XenConnect ( - UINT32 XenLeaf ) { UINT32 Index; @@ -96,7 +93,13 @@ XenConnect ( CHAR8 Sig[sizeof (Info->Signature) + 1]; UINT32 *PVHResetVectorData; - AsmCpuid (XenLeaf + 2, &TransferPages, &TransferReg, NULL, NULL); + ASSERT (mXenLeaf != 0); + + // + // Prepare HyperPages to be able to make hypercalls + // + + AsmCpuid (mXenLeaf + 2, &TransferPages, &TransferReg, NULL, NULL); mXenInfo.HyperPages = AllocatePages (TransferPages); if (!mXenInfo.HyperPages) { return EFI_OUT_OF_RESOURCES; @@ -108,7 +111,11 @@ XenConnect ( (Index << EFI_PAGE_SHIFT) + Index); } - AsmCpuid (XenLeaf + 1, &XenVersion, NULL, NULL, NULL); + // + // Find out the Xen version + // + + AsmCpuid (mXenLeaf + 1, &XenVersion, NULL, NULL, NULL); DEBUG ((EFI_D_ERROR, "Detected Xen version %d.%d\n", XenVersion >> 16, XenVersion & 0xFFFF)); mXenInfo.VersionMajor = (UINT16)(XenVersion >> 16); @@ -265,12 +272,6 @@ InitializeXen ( { RETURN_STATUS PcdStatus; - if (mXenLeaf == 0) { - return EFI_NOT_FOUND; - } - - XenConnect (mXenLeaf); - // // Reserve away HVMLOADER reserved memory [0xFC000000,0xFD000000). // This needs to match HVMLOADER RESERVED_MEMBASE/RESERVED_MEMSIZE. -- Anthony PERARD _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
WARNING: multiple messages have this Message-ID (diff)
From: Anthony PERARD <anthony.perard@citrix.com> To: <edk2-devel@lists.01.org> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>, Jordan Justen <jordan.l.justen@intel.com>, Julien Grall <julien.grall@arm.com>, Anthony PERARD <anthony.perard@citrix.com>, xen-devel@lists.xenproject.org, Laszlo Ersek <lersek@redhat.com> Subject: [Xen-devel] [PATCH v2 18/31] OvmfPkg/XenPlatformPei: Setup HyperPages earlier Date: Mon, 8 Apr 2019 15:23:55 +0100 [thread overview] Message-ID: <20190408142408.30419-19-anthony.perard@citrix.com> (raw) Message-ID: <20190408142355.Ihc-CijSZKWTQt-Lu3GfswkCCDcKod8NfZxhoVMZ6C4@z> (raw) In-Reply-To: <20190408142408.30419-1-anthony.perard@citrix.com> We are going to need to make an hypercall in order to retreive the E820 table from the hypervisor before been able to setup the memory. Calling XenConnect earlier will allow to setup the XenHypercallLib earlier to allow to make hypercalls. While here, add some comments in XenConnect(). Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> --- OvmfPkg/XenPlatformPei/Platform.h | 5 +++++ OvmfPkg/XenPlatformPei/Platform.c | 2 ++ OvmfPkg/XenPlatformPei/Xen.c | 23 ++++++++++---------- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/OvmfPkg/XenPlatformPei/Platform.h b/OvmfPkg/XenPlatformPei/Platform.h index 5565d47e34..a524c23a43 100644 --- a/OvmfPkg/XenPlatformPei/Platform.h +++ b/OvmfPkg/XenPlatformPei/Platform.h @@ -85,6 +85,11 @@ InstallClearCacheCallback ( VOID ); +EFI_STATUS +XenConnect ( + VOID + ); + EFI_STATUS InitializeXen ( VOID diff --git a/OvmfPkg/XenPlatformPei/Platform.c b/OvmfPkg/XenPlatformPei/Platform.c index 2d567a4760..5e6d553ad5 100644 --- a/OvmfPkg/XenPlatformPei/Platform.c +++ b/OvmfPkg/XenPlatformPei/Platform.c @@ -421,6 +421,8 @@ InitializeXenPlatform ( CpuDeadLoop (); } + XenConnect (); + BootModeInitialization (); AddressWidthInitialization (); diff --git a/OvmfPkg/XenPlatformPei/Xen.c b/OvmfPkg/XenPlatformPei/Xen.c index 22c7a22c88..b36eff524d 100644 --- a/OvmfPkg/XenPlatformPei/Xen.c +++ b/OvmfPkg/XenPlatformPei/Xen.c @@ -78,14 +78,11 @@ XenGetE820Map ( /** Connects to the Hypervisor. - @param XenLeaf CPUID index used to connect. - @return EFI_STATUS **/ EFI_STATUS XenConnect ( - UINT32 XenLeaf ) { UINT32 Index; @@ -96,7 +93,13 @@ XenConnect ( CHAR8 Sig[sizeof (Info->Signature) + 1]; UINT32 *PVHResetVectorData; - AsmCpuid (XenLeaf + 2, &TransferPages, &TransferReg, NULL, NULL); + ASSERT (mXenLeaf != 0); + + // + // Prepare HyperPages to be able to make hypercalls + // + + AsmCpuid (mXenLeaf + 2, &TransferPages, &TransferReg, NULL, NULL); mXenInfo.HyperPages = AllocatePages (TransferPages); if (!mXenInfo.HyperPages) { return EFI_OUT_OF_RESOURCES; @@ -108,7 +111,11 @@ XenConnect ( (Index << EFI_PAGE_SHIFT) + Index); } - AsmCpuid (XenLeaf + 1, &XenVersion, NULL, NULL, NULL); + // + // Find out the Xen version + // + + AsmCpuid (mXenLeaf + 1, &XenVersion, NULL, NULL, NULL); DEBUG ((EFI_D_ERROR, "Detected Xen version %d.%d\n", XenVersion >> 16, XenVersion & 0xFFFF)); mXenInfo.VersionMajor = (UINT16)(XenVersion >> 16); @@ -265,12 +272,6 @@ InitializeXen ( { RETURN_STATUS PcdStatus; - if (mXenLeaf == 0) { - return EFI_NOT_FOUND; - } - - XenConnect (mXenLeaf); - // // Reserve away HVMLOADER reserved memory [0xFC000000,0xFD000000). // This needs to match HVMLOADER RESERVED_MEMBASE/RESERVED_MEMSIZE. -- Anthony PERARD _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2019-04-08 14:27 UTC|newest] Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-08 14:23 [PATCH v2 00/31] Specific platform to run OVMF in Xen PVH and HVM guests Anthony PERARD 2019-04-08 14:23 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:23 ` [PATCH v2 01/31] OvmfPkg/ResetSystemLib: Add missing dependency on PciLib Anthony PERARD 2019-04-08 14:23 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:23 ` [PATCH v2 02/31] OvmfPkg: Create platform XenOvmf Anthony PERARD 2019-04-08 14:23 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:23 ` [PATCH v2 03/31] OvmfPkg: Introduce XenResetVector Anthony PERARD 2019-04-08 14:23 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:23 ` [PATCH v2 04/31] OvmfPkg: Introduce XenPlatformPei Anthony PERARD 2019-04-08 14:23 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:23 ` [PATCH v2 05/31] OvmfPkg/XenOvmf: Creating an ELF header Anthony PERARD 2019-04-08 14:23 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:23 ` [PATCH v2 06/31] OvmfPkg/XenResetVector: Add new entry point for Xen PVH Anthony PERARD 2019-04-08 14:23 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:23 ` [PATCH v2 07/31] OvmfPkg/XenResetVector: Saving start of day pointer for PVH guests Anthony PERARD 2019-04-08 14:23 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:23 ` [PATCH v2 08/31] OvmfPkg/XenResetVector: Allow to jumpstart from either hvmloader or PVH Anthony PERARD 2019-04-08 14:23 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:23 ` [PATCH v2 09/31] OvmfPkg/XenOvmf: use a TimerLib instance that depends only on the CPU Anthony PERARD 2019-04-08 14:23 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:23 ` [PATCH v2 10/31] OvmfPkg/XenPlatformPei: Detect OVMF_INFO from hvmloader Anthony PERARD 2019-04-08 14:23 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:23 ` [PATCH v2 11/31] OvmfPkg/XenPlatformPei: Use mXenHvmloaderInfo to get E820 Anthony PERARD 2019-04-08 14:23 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:23 ` [PATCH v2 12/31] OvmfPkg/XenPlatformPei: Grab RSDP from PVH guest start of day struct Anthony PERARD 2019-04-08 14:23 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:23 ` [PATCH v2 13/31] OvmfPkg/Library/XenPlatformLib: New library Anthony PERARD 2019-04-08 14:23 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:23 ` [PATCH v2 14/31] OvmfPkg/AcpiPlatformDxe: Use PVH RSDP if exist Anthony PERARD 2019-04-08 14:23 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:23 ` [PATCH v2 15/31] OvmfPkg/XenHypercallLib: Enable it in PEIM Anthony PERARD 2019-04-08 14:23 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:23 ` [PATCH v2 16/31] OvmfPkg/XenPlatformPei: Introduce XenHvmloaderDetected Anthony PERARD 2019-04-08 14:23 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:23 ` [PATCH v2 17/31] OvmfPkg/XenPlatformPei: Reserve hvmloader's memory only when it as runned Anthony PERARD 2019-04-08 14:23 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:23 ` Anthony PERARD [this message] 2019-04-08 14:23 ` [Xen-devel] [PATCH v2 18/31] OvmfPkg/XenPlatformPei: Setup HyperPages earlier Anthony PERARD 2019-04-08 14:23 ` [PATCH v2 19/31] OvmfPkg/XenPlatformPei: Introduce XenPvhDetected Anthony PERARD 2019-04-08 14:23 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:23 ` [PATCH v2 20/31] OvmfPkg: Import XENMEM_memory_map hypercall to Xen/memory.h Anthony PERARD 2019-04-08 14:23 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:23 ` [PATCH v2 21/31] OvmfPkg/XenPlatformPei: Get E820 table via hypercall Anthony PERARD 2019-04-08 14:23 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:23 ` [PATCH v2 22/31] OvmfPkg/XenPlatformPei: Rework memory detection Anthony PERARD 2019-04-08 14:23 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:24 ` [PATCH v2 23/31] OvmfPkg/XenPlatformPei: Reserve VGA memory region, to boot Linux Anthony PERARD 2019-04-08 14:24 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:24 ` [PATCH v2 24/31] OvmfPkg/XenPlatformPei: Ignore missing PCI Host Bridge on Xen PVH Anthony PERARD 2019-04-08 14:24 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:24 ` [PATCH v2 25/31] OvmfPkg/PlatformBootManagerLib: Handle the absence of PCI bus " Anthony PERARD 2019-04-08 14:24 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:24 ` [PATCH v2 26/31] OvmfPkg/XenOvmf: Override PcdFSBClock to Xen vLAPIC timer frequency Anthony PERARD 2019-04-08 14:24 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:24 ` [PATCH v2 27/31] OvmfPkg/XenOvmf: Introduce XenTimerDxe Anthony PERARD 2019-04-08 14:24 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:24 ` [PATCH v2 28/31] OvmfPkg/PlatformBootManagerLib: Use a Xen console for ConOut/ConIn Anthony PERARD 2019-04-08 14:24 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:24 ` [PATCH v2 29/31] OvmfPkg: Introduce XenIoPvhDxe to initialize Grant Tables Anthony PERARD 2019-04-08 14:24 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:24 ` [PATCH v2 30/31] OvmfPkg: Move XenRealTimeClockLib from ArmVirtPkg Anthony PERARD 2019-04-08 14:24 ` [Xen-devel] " Anthony PERARD 2019-04-08 14:24 ` [PATCH v2 31/31] OvmfPkg/XenOvmf: use RealTimeClockRuntimeDxe from EmbeddedPkg Anthony PERARD 2019-04-08 14:24 ` [Xen-devel] " Anthony PERARD 2019-04-08 15:50 ` [PATCH v2 00/31] Specific platform to run OVMF in Xen PVH and HVM guests Laszlo Ersek 2019-04-08 15:50 ` [Xen-devel] " Laszlo Ersek 2019-04-09 8:09 ` Laszlo Ersek 2019-04-09 8:09 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:15 ` [edk2-devel] " Philippe Mathieu-Daudé 2019-04-09 11:15 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-04-09 10:50 ` Anthony PERARD 2019-04-09 10:50 ` [Xen-devel] " Anthony PERARD 2019-04-09 11:08 Anthony PERARD 2019-04-09 11:08 ` [PATCH v2 18/31] OvmfPkg/XenPlatformPei: Setup HyperPages earlier Anthony PERARD
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190408142408.30419-19-anthony.perard@citrix.com \ --to=anthony.perard@citrix.com \ --cc=ard.biesheuvel@linaro.org \ --cc=edk2-devel@lists.01.org \ --cc=jordan.l.justen@intel.com \ --cc=julien.grall@arm.com \ --cc=lersek@redhat.com \ --cc=xen-devel@lists.xenproject.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.