From: Laszlo Ersek <lersek@redhat.com> To: devel@edk2.groups.io, anthony.perard@citrix.com Cc: Jordan Justen <jordan.l.justen@intel.com>, Julien Grall <julien.grall@arm.com>, xen-devel@lists.xenproject.org, Ard Biesheuvel <ard.biesheuvel@linaro.org> Subject: Re: [edk2-devel] [PATCH v2 24/31] OvmfPkg/XenPlatformPei: Ignore missing PCI Host Bridge on Xen PVH Date: Mon, 15 Apr 2019 15:33:07 +0200 [thread overview] Message-ID: <311d1bb2-1a25-6e39-9e9d-b27ef44b45b4@redhat.com> (raw) In-Reply-To: <f423bad2-fc57-40fe-960b-061ac9f144aa@redhat.com> On 04/15/19 15:29, Laszlo Ersek wrote: > On 04/09/19 13:08, Anthony PERARD wrote: >> When the device ID of the host bridge is unknown, check if we are >> running as a PVH guest as there is no PCI bus in that case. >> >> Contributed-under: TianoCore Contribution Agreement 1.1 >> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> >> --- >> >> Notes: >> v2: >> - Use new XEN_PVH_PCI_HOST_BRIDGE_DEVICE_ID macro >> >> OvmfPkg/Include/OvmfPlatforms.h | 6 ++++++ >> OvmfPkg/XenPlatformPei/Platform.c | 7 +++++++ >> 2 files changed, 13 insertions(+) >> >> diff --git a/OvmfPkg/Include/OvmfPlatforms.h b/OvmfPkg/Include/OvmfPlatforms.h >> index cc67f40a88..1ce71e18ec 100644 >> --- a/OvmfPkg/Include/OvmfPlatforms.h >> +++ b/OvmfPkg/Include/OvmfPlatforms.h >> @@ -43,4 +43,10 @@ >> // >> #define ACPI_TIMER_OFFSET 0x8 >> >> +// >> +// When running OVMF on a Xen PVH guest there is no PCI, >> +// so -1 is return for the Host Bridge Device ID. >> +// >> +#define XEN_PVH_PCI_HOST_BRIDGE_DEVICE_ID 0xFFFF >> + >> #endif > > We split the i440fx and Q35 host bridge device IDs to separate files, > under "OvmfPkg/Include/IndustryStandard/", in commit cb2e300766ae > ("OvmfPkg: split Include/OvmfPlatforms.h", 2015-05-13). > > (1) I'd prefer if we could introduce the above macro similarly -- and > include that header only in XenPlatformPei (plus wherever else it is > necessary). sorry, for a second I missed: #include <IndustryStandard/Q35MchIch9.h> #include <IndustryStandard/I440FxPiix4.h> in "OvmfPlatforms.h". So it's fine to #include the new Xen-specific header in "OvmfPlatforms.h", centrally. Thanks Laszlo > > Thanks! > Laszlo > > >> diff --git a/OvmfPkg/XenPlatformPei/Platform.c b/OvmfPkg/XenPlatformPei/Platform.c >> index 5e6d553ad5..d91cd98bf4 100644 >> --- a/OvmfPkg/XenPlatformPei/Platform.c >> +++ b/OvmfPkg/XenPlatformPei/Platform.c >> @@ -278,6 +278,13 @@ MiscInitialization ( >> AcpiEnBit = ICH9_ACPI_CNTL_ACPI_EN; >> break; >> default: >> + if (XenPvhDetected ()) { >> + // >> + // There is no PCI bus in this case >> + // >> + PcdSet16S (PcdOvmfHostBridgePciDevId, XEN_PVH_PCI_HOST_BRIDGE_DEVICE_ID); >> + return; >> + } >> DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n", >> __FUNCTION__, mHostBridgeDevId)); >> ASSERT (FALSE); >> > _______________________________________________ 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: Laszlo Ersek <lersek@redhat.com> To: devel@edk2.groups.io, anthony.perard@citrix.com Cc: Jordan Justen <jordan.l.justen@intel.com>, Julien Grall <julien.grall@arm.com>, xen-devel@lists.xenproject.org, Ard Biesheuvel <ard.biesheuvel@linaro.org> Subject: Re: [Xen-devel] [edk2-devel] [PATCH v2 24/31] OvmfPkg/XenPlatformPei: Ignore missing PCI Host Bridge on Xen PVH Date: Mon, 15 Apr 2019 15:33:07 +0200 [thread overview] Message-ID: <311d1bb2-1a25-6e39-9e9d-b27ef44b45b4@redhat.com> (raw) Message-ID: <20190415133307.3E0XktrTWUjIZBYB814WuEO5-Czxp4QEjnSH1x-0Lic@z> (raw) In-Reply-To: <f423bad2-fc57-40fe-960b-061ac9f144aa@redhat.com> On 04/15/19 15:29, Laszlo Ersek wrote: > On 04/09/19 13:08, Anthony PERARD wrote: >> When the device ID of the host bridge is unknown, check if we are >> running as a PVH guest as there is no PCI bus in that case. >> >> Contributed-under: TianoCore Contribution Agreement 1.1 >> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> >> --- >> >> Notes: >> v2: >> - Use new XEN_PVH_PCI_HOST_BRIDGE_DEVICE_ID macro >> >> OvmfPkg/Include/OvmfPlatforms.h | 6 ++++++ >> OvmfPkg/XenPlatformPei/Platform.c | 7 +++++++ >> 2 files changed, 13 insertions(+) >> >> diff --git a/OvmfPkg/Include/OvmfPlatforms.h b/OvmfPkg/Include/OvmfPlatforms.h >> index cc67f40a88..1ce71e18ec 100644 >> --- a/OvmfPkg/Include/OvmfPlatforms.h >> +++ b/OvmfPkg/Include/OvmfPlatforms.h >> @@ -43,4 +43,10 @@ >> // >> #define ACPI_TIMER_OFFSET 0x8 >> >> +// >> +// When running OVMF on a Xen PVH guest there is no PCI, >> +// so -1 is return for the Host Bridge Device ID. >> +// >> +#define XEN_PVH_PCI_HOST_BRIDGE_DEVICE_ID 0xFFFF >> + >> #endif > > We split the i440fx and Q35 host bridge device IDs to separate files, > under "OvmfPkg/Include/IndustryStandard/", in commit cb2e300766ae > ("OvmfPkg: split Include/OvmfPlatforms.h", 2015-05-13). > > (1) I'd prefer if we could introduce the above macro similarly -- and > include that header only in XenPlatformPei (plus wherever else it is > necessary). sorry, for a second I missed: #include <IndustryStandard/Q35MchIch9.h> #include <IndustryStandard/I440FxPiix4.h> in "OvmfPlatforms.h". So it's fine to #include the new Xen-specific header in "OvmfPlatforms.h", centrally. Thanks Laszlo > > Thanks! > Laszlo > > >> diff --git a/OvmfPkg/XenPlatformPei/Platform.c b/OvmfPkg/XenPlatformPei/Platform.c >> index 5e6d553ad5..d91cd98bf4 100644 >> --- a/OvmfPkg/XenPlatformPei/Platform.c >> +++ b/OvmfPkg/XenPlatformPei/Platform.c >> @@ -278,6 +278,13 @@ MiscInitialization ( >> AcpiEnBit = ICH9_ACPI_CNTL_ACPI_EN; >> break; >> default: >> + if (XenPvhDetected ()) { >> + // >> + // There is no PCI bus in this case >> + // >> + PcdSet16S (PcdOvmfHostBridgePciDevId, XEN_PVH_PCI_HOST_BRIDGE_DEVICE_ID); >> + return; >> + } >> DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n", >> __FUNCTION__, mHostBridgeDevId)); >> ASSERT (FALSE); >> > _______________________________________________ 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-15 13:33 UTC|newest] Thread overview: 168+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-09 11:08 [PATCH v2 00/31] Specific platform to run OVMF in Xen PVH and HVM guests Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-09 11:08 ` [PATCH v2 01/31] OvmfPkg/ResetSystemLib: Add missing dependency on PciLib Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-10 8:48 ` [edk2-devel] " Laszlo Ersek 2019-04-10 8:48 ` [Xen-devel] " Laszlo Ersek 2019-04-10 9:16 ` Jordan Justen 2019-04-10 9:16 ` [Xen-devel] " Jordan Justen 2019-04-09 11:08 ` [PATCH v2 02/31] OvmfPkg: Create platform XenOvmf Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-10 9:32 ` [edk2-devel] " Laszlo Ersek 2019-04-10 9:32 ` [Xen-devel] " Laszlo Ersek 2019-04-15 10:53 ` Anthony PERARD 2019-04-15 10:53 ` [Xen-devel] " Anthony PERARD 2019-04-10 9:48 ` Jordan Justen 2019-04-10 9:48 ` [Xen-devel] " Jordan Justen 2019-04-10 14:27 ` Laszlo Ersek 2019-04-10 14:27 ` [Xen-devel] " Laszlo Ersek 2019-04-10 16:27 ` Ard Biesheuvel 2019-04-10 16:27 ` [Xen-devel] " Ard Biesheuvel 2019-04-10 18:37 ` Jordan Justen 2019-04-10 18:37 ` [Xen-devel] " Jordan Justen 2019-04-11 7:34 ` Laszlo Ersek 2019-04-11 7:34 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 03/31] OvmfPkg: Introduce XenResetVector Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-10 9:46 ` [edk2-devel] " Laszlo Ersek 2019-04-10 9:46 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 04/31] OvmfPkg: Introduce XenPlatformPei Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-10 10:37 ` [edk2-devel] " Laszlo Ersek 2019-04-10 10:37 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 05/31] OvmfPkg/XenOvmf: Creating an ELF header Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-11 10:43 ` [edk2-devel] " Laszlo Ersek 2019-04-11 10:43 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 06/31] OvmfPkg/XenResetVector: Add new entry point for Xen PVH Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-11 10:49 ` [edk2-devel] " Laszlo Ersek 2019-04-11 10:49 ` [Xen-devel] " Laszlo Ersek 2019-04-11 12:52 ` Andrew Cooper 2019-04-11 12:52 ` [Xen-devel] " Andrew Cooper 2019-04-15 11:25 ` Anthony PERARD 2019-04-15 11:25 ` [Xen-devel] " Anthony PERARD 2019-04-15 13:28 ` Andrew Cooper 2019-04-15 13:28 ` [Xen-devel] " Andrew Cooper 2019-04-09 11:08 ` [PATCH v2 07/31] OvmfPkg/XenResetVector: Saving start of day pointer for PVH guests Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-11 11:09 ` [edk2-devel] " Laszlo Ersek 2019-04-11 11:09 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 08/31] OvmfPkg/XenResetVector: Allow to jumpstart from either hvmloader or PVH Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-11 11:19 ` [edk2-devel] " Laszlo Ersek 2019-04-11 11:19 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 09/31] OvmfPkg/XenOvmf: use a TimerLib instance that depends only on the CPU Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-11 11:25 ` [edk2-devel] " Laszlo Ersek 2019-04-11 11:25 ` [Xen-devel] " Laszlo Ersek 2019-04-11 11:33 ` Laszlo Ersek 2019-04-11 11:33 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 10/31] OvmfPkg/XenPlatformPei: Detect OVMF_INFO from hvmloader Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-11 11:47 ` [edk2-devel] " Laszlo Ersek 2019-04-11 11:47 ` [Xen-devel] " Laszlo Ersek 2019-04-11 11:47 ` Laszlo Ersek 2019-04-11 11:47 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 11/31] OvmfPkg/XenPlatformPei: Use mXenHvmloaderInfo to get E820 Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-11 11:49 ` [edk2-devel] " Laszlo Ersek 2019-04-11 11:49 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 12/31] OvmfPkg/XenPlatformPei: Grab RSDP from PVH guest start of day struct Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-11 11:58 ` [edk2-devel] " Laszlo Ersek 2019-04-11 11:58 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 13/31] OvmfPkg/Library/XenPlatformLib: New library Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-11 12:10 ` [edk2-devel] " Laszlo Ersek 2019-04-11 12:10 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 14/31] OvmfPkg/AcpiPlatformDxe: Use PVH RSDP if exist Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-11 12:20 ` [edk2-devel] " Laszlo Ersek 2019-04-11 12:20 ` [Xen-devel] " Laszlo Ersek 2019-04-11 12:23 ` Laszlo Ersek 2019-04-11 12:23 ` [Xen-devel] " Laszlo Ersek 2019-04-11 12:31 ` Laszlo Ersek 2019-04-11 12:31 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 15/31] OvmfPkg/XenHypercallLib: Enable it in PEIM Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-12 9:07 ` [edk2-devel] " Laszlo Ersek 2019-04-12 9:07 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 16/31] OvmfPkg/XenPlatformPei: Introduce XenHvmloaderDetected Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-12 9:08 ` [edk2-devel] " Laszlo Ersek 2019-04-12 9:08 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 17/31] OvmfPkg/XenPlatformPei: Reserve hvmloader's memory only when it as runned Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-12 9:09 ` [edk2-devel] " Laszlo Ersek 2019-04-12 9:09 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 18/31] OvmfPkg/XenPlatformPei: Setup HyperPages earlier Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-12 9:17 ` [edk2-devel] " Laszlo Ersek 2019-04-12 9:17 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 19/31] OvmfPkg/XenPlatformPei: Introduce XenPvhDetected Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-12 9:20 ` [edk2-devel] " Laszlo Ersek 2019-04-12 9:20 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 20/31] OvmfPkg: Import XENMEM_memory_map hypercall to Xen/memory.h Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-12 9:22 ` [edk2-devel] " Laszlo Ersek 2019-04-12 9:22 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 21/31] OvmfPkg/XenPlatformPei: Get E820 table via hypercall Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-12 9:33 ` [edk2-devel] " Laszlo Ersek 2019-04-12 9:33 ` [Xen-devel] " Laszlo Ersek 2019-04-12 9:45 ` Andrew Cooper 2019-04-12 9:45 ` [Xen-devel] " Andrew Cooper 2019-04-09 11:08 ` [PATCH v2 22/31] OvmfPkg/XenPlatformPei: Rework memory detection Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-12 11:15 ` [edk2-devel] " Laszlo Ersek 2019-04-12 11:15 ` [Xen-devel] " Laszlo Ersek 2019-04-15 13:42 ` Anthony PERARD 2019-04-15 13:42 ` [Xen-devel] " Anthony PERARD 2019-04-09 11:08 ` [PATCH v2 23/31] OvmfPkg/XenPlatformPei: Reserve VGA memory region, to boot Linux Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-15 13:21 ` [edk2-devel] " Laszlo Ersek 2019-04-15 13:21 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 24/31] OvmfPkg/XenPlatformPei: Ignore missing PCI Host Bridge on Xen PVH Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-15 13:29 ` [edk2-devel] " Laszlo Ersek 2019-04-15 13:29 ` [Xen-devel] " Laszlo Ersek 2019-04-15 13:33 ` Laszlo Ersek [this message] 2019-04-15 13:33 ` Laszlo Ersek 2019-04-15 13:37 ` Andrew Cooper 2019-04-15 13:37 ` [Xen-devel] " Andrew Cooper 2019-04-09 11:08 ` [PATCH v2 25/31] OvmfPkg/PlatformBootManagerLib: Handle the absence of PCI bus " Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-15 13:33 ` [edk2-devel] " Laszlo Ersek 2019-04-15 13:33 ` [Xen-devel] " Laszlo Ersek 2019-04-15 13:49 ` Laszlo Ersek 2019-04-15 13:49 ` [Xen-devel] " Laszlo Ersek 2019-04-15 14:40 ` Anthony PERARD 2019-04-15 14:40 ` [Xen-devel] " Anthony PERARD 2019-04-15 17:57 ` Laszlo Ersek 2019-04-15 17:57 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 26/31] OvmfPkg/XenOvmf: Override PcdFSBClock to Xen vLAPIC timer frequency Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-15 13:52 ` [edk2-devel] " Laszlo Ersek 2019-04-15 13:52 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 27/31] OvmfPkg/XenOvmf: Introduce XenTimerDxe Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-15 14:07 ` [edk2-devel] " Laszlo Ersek 2019-04-15 14:07 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 28/31] OvmfPkg/PlatformBootManagerLib: Use a Xen console for ConOut/ConIn Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-15 14:56 ` [edk2-devel] " Laszlo Ersek 2019-04-15 14:56 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 29/31] OvmfPkg: Introduce XenIoPvhDxe to initialize Grant Tables Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-16 8:49 ` [edk2-devel] " Laszlo Ersek 2019-04-16 8:49 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 30/31] OvmfPkg: Move XenRealTimeClockLib from ArmVirtPkg Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-16 8:53 ` [edk2-devel] " Laszlo Ersek 2019-04-16 8:53 ` [Xen-devel] " Laszlo Ersek 2019-04-09 11:08 ` [PATCH v2 31/31] OvmfPkg/XenOvmf: use RealTimeClockRuntimeDxe from EmbeddedPkg Anthony PERARD 2019-04-09 11:08 ` [Xen-devel] " Anthony PERARD 2019-04-16 8:58 ` [edk2-devel] " Laszlo Ersek 2019-04-16 8:58 ` [Xen-devel] " Laszlo Ersek
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=311d1bb2-1a25-6e39-9e9d-b27ef44b45b4@redhat.com \ --to=lersek@redhat.com \ --cc=anthony.perard@citrix.com \ --cc=ard.biesheuvel@linaro.org \ --cc=devel@edk2.groups.io \ --cc=jordan.l.justen@intel.com \ --cc=julien.grall@arm.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.