On Mon, May 09, 2016 at 09:07:33AM +0000, Ni, Ruiyu wrote:
> Gary,
> Have you applied 3/6?
> Based on your debug log, it seems like you didn't apply it.
>
Hi Ray,
I branched XenOvmf from your git repo and removed the test commit, so I
believe the patch has been applied. Besides, 6/6 also depends on 3/6.
Reversing 6/6 makes OVMF/KVM work again.
Thanks,
Gary Lin
>
> diff --git a/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c
> b/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c
>
> index 1d3d10a..9e01498 100644
>
> --- a/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c
>
> +++ b/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c
>
> @@ -125,11 +125,11 @@ InitRootBridge (
>
> RootBus->DmaAbove4G = FALSE;
>
> RootBus->AllocationAttributes = EFI_PCI_HOST_BRIDGE_COMBINE_MEM_PMEM;
>
> - RootBus->PMem.Base = 0;
>
> + RootBus->PMem.Base = MAX_UINT64;
>
> RootBus->PMem.Limit = 0;
>
> - RootBus->PMemAbove4G.Base = 0;
>
> + RootBus->PMemAbove4G.Base = MAX_UINT64;
>
> RootBus->PMemAbove4G.Limit = 0;
>
> - RootBus->MemAbove4G.Base = 0;
>
> + RootBus->MemAbove4G.Base = MAX_UINT64;
>
> RootBus->MemAbove4G.Limit = 0;
>
> if (PcdGet64 (PcdPciMmio64Size) > 0) {
>
>
> Regards,
> Ray
>
> From: Gary Lin [mailto:[email protected]]
> Sent: Monday, May 9, 2016 4:32 PM
> To: Ni, Ruiyu <[email protected]>
> Cc: [email protected]
> Subject: Re: [edk2] [Patch 0/6] PciHostBridgeDxe: Bug fix and OVMF above Xen
> support
>
> On Mon, May 09, 2016 at 02:26:29PM +0800, Ruiyu Ni wrote:
> > The patch serials fix two bugs in PciHostBridgeDxe driver.
> > And it adds a new field in PCI_ROOT_BRIDGE structure to support OVMF above
> > Xen support.
> >
> Hi Ray,
>
> The patches work for OVMF/Xen. The system booted into OS without
> problem. However, With OVMF/KVM, I got this:
>
> [...]
> Select Item: 0x0
> FW CFG Signature: 0x554D4551
> Select Item: 0x1
> FW CFG Revision: 0x3
> QemuFwCfg interface is supported.
> Select Item: 0x19
> InitRootBridge: populated root bus 0, with room for 255 subordinate bus(es)
> RootBridge: PciRoot(0x0)
> Support/Attr: 70069 / 70069
> DmaAbove4G: No
> NoExtConfSpace: No
> AllocAttr: 3 (CombineMemPMem Mem64Decode)
> Bus: 0 - FF
> Io: C000 - FFFF
> Mem: 90000000 - FBFFFFFF
> MemAbove4G: 800000000 - FFFFFFFFF
> PMem: 0 - 0
> PMemAbove4G: 0 - 0
> ASSERT
> /home/gary/git/edk2/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c(116):
> Bridge->PMemAbove4G.Base >= 0x0000000100000000ULL
>
> Would you mind to check it?
>
> Gary Lin
>
> > Ruiyu Ni (6):
> > MdeModulePkg/PciHostBridgeDxe: Don't miss prefetchable MMIO aperture
> > MdeModulePkg/PciHostBridgeDxe: Fix a Base/Limit comparing bug
> > OvmfPkg/PciHostBridgeLib: Set correct Base/Limit for absent resource
> > MdeModulePkg/PciHostBridgeLib: Add ResourceAssigned field
> > MdeModulePkg/PciHostBridgeDxe: Honor ResourceAssigned
> > OvmfPkg/PciHostBridgeLib: Scan for root bridges when running over Xen
> >
> > .../Bus/Pci/PciHostBridgeDxe/PciHostBridge.c | 96 +++-
> > .../Bus/Pci/PciHostBridgeDxe/PciRootBridge.h | 4 +-
> > .../Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c | 106 ++--
> > MdeModulePkg/Include/Library/PciHostBridgeLib.h | 2 +
> > .../Library/PciHostBridgeLib/PciHostBridgeLib.c | 550
> > +++++++++++++++++++--
> > .../Library/PciHostBridgeLib/PciHostBridgeLib.inf | 1 +
> > 6 files changed, 658 insertions(+), 101 deletions(-)
> >
> > --
> > 2.7.0.windows.1
> >
> > _______________________________________________
> > edk2-devel mailing list
> > [email protected]<mailto:[email protected]>
> > https://lists.01.org/mailman/listinfo/edk2-devel
> >
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel