| Message ID | 1322156679-9441-7-git-send-email-anthony.perard@citrix.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Nov 24, 2011 at 05:44:35PM +0000, Anthony PERARD wrote: > From: Yuji Shimada <shimada-yxb@necst.nec.co.jp> > > This function help Xen PCI Passthrough device to check for overlap. helps > > Signed-off-by: Yuji Shimada <shimada-yxb@necst.nec.co.jp> > Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> > --- > hw/pci.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ > hw/pci.h | 3 +++ > 2 files changed, 50 insertions(+), 0 deletions(-) > > diff --git a/hw/pci.c b/hw/pci.c > index 399227f..563bb37 100644 > --- a/hw/pci.c > +++ b/hw/pci.c > @@ -2038,3 +2038,50 @@ MemoryRegion *pci_address_space_io(PCIDevice *dev) > { > return dev->bus->address_space_io; > } > + > +int pci_check_bar_overlap(PCIDevice *dev, > + pcibus_t addr, pcibus_t size, uint8_t type) > +{ > + PCIBus *bus = dev->bus; > + PCIDevice *devices = NULL; > + PCIIORegion *r; > + int i, j; > + int rc = 0; > + > + /* check Overlapped to Base Address */ > + for (i = 0; i < ARRAY_SIZE(bus->devices); i++) { > + devices = bus->devices[i]; > + if (!devices) { > + continue; > + } > + > + /* skip itself */ > + if (devices->devfn == dev->devfn) { > + continue; > + } > + > + for (j = 0; j < PCI_NUM_REGIONS; j++) { > + r = &devices->io_regions[j]; > + > + /* skip different resource type, but don't skip when > + * prefetch and non-prefetch memory are compared. > + */ > + if (type != r->type) { > + if (type == PCI_BASE_ADDRESS_SPACE_IO || > + r->type == PCI_BASE_ADDRESS_SPACE_IO) { > + continue; > + } > + } > + > + if ((addr < (r->addr + r->size)) && ((addr + size) > r->addr)) { > + printf("Overlapped to device[%02x:%02x.%x][Region:%d]" > + "[Address:%"PRIx64"h][Size:%"PRIx64"h]\n", > + pci_bus_num(bus), PCI_SLOT(devices->devfn), > + PCI_FUNC(devices->devfn), j, r->addr, r->size); > + rc = 1; > + } > + } > + } > + > + return rc; > +} > diff --git a/hw/pci.h b/hw/pci.h > index 625e717..9a723d2 100644 > --- a/hw/pci.h > +++ b/hw/pci.h > @@ -552,4 +552,7 @@ static inline void pci_dma_sglist_init(QEMUSGList *qsg, PCIDevice *dev, > qemu_sglist_init(qsg, alloc_hint); > } > > +int pci_check_bar_overlap(PCIDevice *dev, > + pcibus_t addr, pcibus_t size, uint8_t type); > + > #endif > -- > Anthony PERARD > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel
diff --git a/hw/pci.c b/hw/pci.c index 399227f..563bb37 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -2038,3 +2038,50 @@ MemoryRegion *pci_address_space_io(PCIDevice *dev) { return dev->bus->address_space_io; } + +int pci_check_bar_overlap(PCIDevice *dev, + pcibus_t addr, pcibus_t size, uint8_t type) +{ + PCIBus *bus = dev->bus; + PCIDevice *devices = NULL; + PCIIORegion *r; + int i, j; + int rc = 0; + + /* check Overlapped to Base Address */ + for (i = 0; i < ARRAY_SIZE(bus->devices); i++) { + devices = bus->devices[i]; + if (!devices) { + continue; + } + + /* skip itself */ + if (devices->devfn == dev->devfn) { + continue; + } + + for (j = 0; j < PCI_NUM_REGIONS; j++) { + r = &devices->io_regions[j]; + + /* skip different resource type, but don't skip when + * prefetch and non-prefetch memory are compared. + */ + if (type != r->type) { + if (type == PCI_BASE_ADDRESS_SPACE_IO || + r->type == PCI_BASE_ADDRESS_SPACE_IO) { + continue; + } + } + + if ((addr < (r->addr + r->size)) && ((addr + size) > r->addr)) { + printf("Overlapped to device[%02x:%02x.%x][Region:%d]" + "[Address:%"PRIx64"h][Size:%"PRIx64"h]\n", + pci_bus_num(bus), PCI_SLOT(devices->devfn), + PCI_FUNC(devices->devfn), j, r->addr, r->size); + rc = 1; + } + } + } + + return rc; +} diff --git a/hw/pci.h b/hw/pci.h index 625e717..9a723d2 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -552,4 +552,7 @@ static inline void pci_dma_sglist_init(QEMUSGList *qsg, PCIDevice *dev, qemu_sglist_init(qsg, alloc_hint); } +int pci_check_bar_overlap(PCIDevice *dev, + pcibus_t addr, pcibus_t size, uint8_t type); + #endif