diff options
author | George Dunlap <george.dunlap@eu.citrix.com> | 2013-06-19 14:47:46 +0100 |
---|---|---|
committer | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2013-06-24 12:20:29 +0100 |
commit | 91993aee68cd6b43f72e1ada33b295388fa5c4c1 (patch) | |
tree | 17453707d2747941bc47a2f4693bcd3ecc5a6ed1 /tools/firmware | |
parent | d23749aaf76330730e0d0d86f2ccfc1effd54e3a (diff) | |
download | xen-91993aee68cd6b43f72e1ada33b295388fa5c4c1.tar.gz xen-91993aee68cd6b43f72e1ada33b295388fa5c4c1.tar.bz2 xen-91993aee68cd6b43f72e1ada33b295388fa5c4c1.zip |
hvmloader: Make the printfs more informative
* Warn that you're relocating some BARs to 64-bit
* Warn that you're relocating guest pages, and how many
* Include upper 32-bits of the base register when printing the bar
placement info
v4:
- Move message about relocating guest pages into loop, include number
of pages and guest paddr
- Fixed minor brace style issue
Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
CC: Ian Campbell <ian.campbell@citrix.com>
CC: Ian Jackson <ian.jackson@citrix.com>
CC: Stefano Stabellini <stefano.stabellini@citrix.com>
CC: Hanweidong <hanweidong@huawei.com>
CC: Keir Fraser <keir@xen.org>
Diffstat (limited to 'tools/firmware')
-rw-r--r-- | tools/firmware/hvmloader/pci.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/tools/firmware/hvmloader/pci.c b/tools/firmware/hvmloader/pci.c index c1cb1e9eab..44168e2929 100644 --- a/tools/firmware/hvmloader/pci.c +++ b/tools/firmware/hvmloader/pci.c @@ -214,7 +214,11 @@ void pci_setup(void) pci_mem_start <<= 1; if ( (pci_mem_start << 1) != 0 ) + { + printf("Low MMIO hole not large enough for all devices," + " relocating some BARs to 64-bit\n"); bar64_relocate = 1; + } /* Relocate RAM that overlaps PCI space (in 64k-page chunks). */ while ( (pci_mem_start >> PAGE_SHIFT) < hvm_info->low_mem_pgend ) @@ -227,6 +231,11 @@ void pci_setup(void) if ( hvm_info->high_mem_pgend == 0 ) hvm_info->high_mem_pgend = 1ull << (32 - PAGE_SHIFT); hvm_info->low_mem_pgend -= nr_pages; + printf("Relocating 0x%x pages from "PRIllx" to "PRIllx\ + " for lowmem MMIO hole\n", + nr_pages, + PRIllx_arg(((uint64_t)hvm_info->low_mem_pgend)<<PAGE_SHIFT), + PRIllx_arg(((uint64_t)hvm_info->high_mem_pgend)<<PAGE_SHIFT)); xatp.domid = DOMID_SELF; xatp.space = XENMAPSPACE_gmfn_range; xatp.idx = hvm_info->low_mem_pgend; @@ -301,10 +310,10 @@ void pci_setup(void) pci_writel(devfn, bar_reg, bar_data); if (using_64bar) pci_writel(devfn, bar_reg + 4, bar_data_upper); - printf("pci dev %02x:%x bar %02x size "PRIllx": %08x\n", + printf("pci dev %02x:%x bar %02x size "PRIllx": %x%08x\n", devfn>>3, devfn&7, bar_reg, PRIllx_arg(bar_sz), - bar_data); + bar_data_upper, bar_data); /* Now enable the memory or I/O mapping. */ |