[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/14] pci: add helper to retrieve the 64-bit range
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 04/14] pci: add helper to retrieve the 64-bit range |
Date: |
Sun, 29 Sep 2013 10:00:00 +0300 |
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/pci/pci.h | 1 +
hw/pci/pci.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+)
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index 37979aa..4b90e5d 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -397,6 +397,7 @@ const char *pci_root_bus_path(PCIDevice *dev);
PCIDevice *pci_find_device(PCIBus *bus, int bus_num, uint8_t devfn);
int pci_qdev_find_device(const char *id, PCIDevice **pdev);
PCIBus *pci_get_bus_devfn(int *devfnp, PCIBus *root, const char *devaddr);
+void pci_bus_get_w64_range(PCIBus *bus, Range *range);
int pci_parse_devaddr(const char *addr, int *domp, int *busp,
unsigned int *slotp, unsigned int *funcp);
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index ad1c1ca..52cbab7 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -2257,6 +2257,56 @@ void pci_setup_iommu(PCIBus *bus, PCIIOMMUFunc fn, void
*opaque)
bus->iommu_opaque = opaque;
}
+static void pci_dev_get_w64(PCIBus *b, PCIDevice *dev, void *opaque)
+{
+ Range *range = opaque;
+ PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(dev);
+ uint16_t cmd = pci_get_word(dev->config + PCI_COMMAND);
+ int r;
+
+ if (!(cmd & PCI_COMMAND_MEMORY)) {
+ return;
+ }
+
+ if (pc->is_bridge) {
+ pcibus_t base = pci_bridge_get_base(dev,
PCI_BASE_ADDRESS_MEM_PREFETCH);
+ pcibus_t limit = pci_bridge_get_limit(dev,
PCI_BASE_ADDRESS_MEM_PREFETCH);
+
+ base = MAX(base, 0x1ULL << 32);
+
+ if (limit >= base) {
+ Range pref_range;
+ pref_range.begin = base;
+ pref_range.end = limit + 1;
+ range_extend(range, &pref_range);
+ }
+ }
+ for (r = 0; r < PCI_NUM_REGIONS; ++r) {
+ PCIIORegion *region = &dev->io_regions[r];
+ Range region_range;
+
+ if (!region->size ||
+ (region->type & PCI_BASE_ADDRESS_SPACE_IO) ||
+ !(region->type & PCI_BASE_ADDRESS_MEM_TYPE_64)) {
+ continue;
+ }
+ region_range.begin = pci_get_quad(dev->config + pci_bar(dev, r));
+ region_range.end = region_range.begin + region->size;
+
+ region_range.begin = MAX(region_range.begin, 0x1ULL << 32);
+
+ if (region_range.end - 1 >= region_range.begin) {
+ range_extend(range, ®ion_range);
+ }
+ }
+}
+
+void pci_bus_get_w64_range(PCIBus *bus, Range *range)
+{
+ range->begin = range->end = 0;
+ pci_for_each_device_under_bus(bus, pci_dev_get_w64, range);
+}
+
static const TypeInfo pci_device_type_info = {
.name = TYPE_PCI_DEVICE,
.parent = TYPE_DEVICE,
--
MST
- [Qemu-devel] [PULL 00/14] pc,pci,virtio fixes and cleanups, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 01/14] q35: make pci window address/size match guest cfg, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 02/14] range: add Range to typedefs, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 03/14] range: add min/max operations on ranges, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 04/14] pci: add helper to retrieve the 64-bit range,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 05/14] q35: use 64 bit window programmed by guest, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 07/14] piix4: disable io on reset, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 06/14] piix: use 64 bit window programmed by guest, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 08/14] pci: remove explicit check to 64K ioport size, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 09/14] virtio-net: fix up HMP NIC info string on reset, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 10/14] smbios: Normalize smbios_entry_add()'s error handling to exit(1), Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 11/14] smbios: Convert to QemuOpts, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 12/14] smbios: Improve diagnostics for conflicting entries, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 13/14] smbios: Make multiple -smbios type= accumulate sanely, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 14/14] smbios: Factor out smbios_maybe_add_str(), Michael S. Tsirkin, 2013/09/29