From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tiejun Chen Subject: [RFC][PATCH 12/13] hvmloader/pci: skip reserved ranges Date: Fri, 10 Apr 2015 17:22:03 +0800 Message-ID: <1428657724-3498-13-git-send-email-tiejun.chen@intel.com> References: <1428657724-3498-1-git-send-email-tiejun.chen@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1428657724-3498-1-git-send-email-tiejun.chen@intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: JBeulich@suse.com, tim@xen.org, konrad.wilk@oracle.com, andrew.cooper3@citrix.com, kevin.tian@intel.com, yang.z.zhang@intel.com, ian.campbell@citrix.com, wei.liu2@citrix.com, Ian.Jackson@eu.citrix.com, stefano.stabellini@citrix.com Cc: xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org When allocating mmio address for PCI bars, we need to make sure they don't overlap with reserved regions. Signed-off-by: Tiejun Chen --- tools/firmware/hvmloader/pci.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/tools/firmware/hvmloader/pci.c b/tools/firmware/hvmloader/pci.c index 4e8d803..51aa65d 100644 --- a/tools/firmware/hvmloader/pci.c +++ b/tools/firmware/hvmloader/pci.c @@ -59,8 +59,8 @@ void pci_setup(void) uint32_t bar_reg; uint64_t bar_sz; } *bars = (struct bars *)scratch_start; - unsigned int i, nr_bars = 0; - uint64_t mmio_hole_size = 0; + unsigned int i, j, nr_bars = 0; + uint64_t mmio_hole_size = 0, reserved_end; const char *s; /* @@ -393,8 +393,23 @@ void pci_setup(void) } base = (resource->base + bar_sz - 1) & ~(uint64_t)(bar_sz - 1); + reallocate_mmio: bar_data |= (uint32_t)base; bar_data_upper = (uint32_t)(base >> 32); + for ( j = 0; j < memory_map.nr_map ; j++ ) + { + if ( memory_map.map[j].type != E820_RAM ) + { + reserved_end = memory_map.map[j].addr + memory_map.map[j].size; + if ( check_hole_conflict(base, bar_sz, + memory_map.map[j].addr, + memory_map.map[j].size) ) + { + base = (reserved_end + bar_sz - 1) & ~(uint64_t)(bar_sz - 1); + goto reallocate_mmio; + } + } + } base += bar_sz; if ( (base < resource->base) || (base > resource->max) ) -- 1.9.1