|
 |
9ae3a8 |
From 1e726d2e4db2132cb5f0ee985745c87174e6f599 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
Message-Id: <1e726d2e4db2132cb5f0ee985745c87174e6f599.1387298827.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
In-Reply-To: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
References: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
From: "Michael S. Tsirkin" <mst@redhat.com>
|
|
|
9ae3a8 |
Date: Tue, 17 Dec 2013 15:17:05 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 07/56] pci: add helper to retrieve the 64-bit range
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1387293161-4085-8-git-send-email-mst@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 56312
|
|
|
9ae3a8 |
O-Subject: [PATCH qemu-kvm RHEL7.0 v2 07/57] pci: add helper to retrieve the 64-bit range
|
|
|
9ae3a8 |
Bugzilla: 1034876
|
|
|
9ae3a8 |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 438640695723f33be6d0081ac1e690aa40975c39)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Conflicts:
|
|
|
9ae3a8 |
include/hw/pci/pci.h
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
include/hw/pci/pci.h | 1 +
|
|
|
9ae3a8 |
hw/pci/pci.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
|
9ae3a8 |
2 files changed, 51 insertions(+)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/pci/pci.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
|
9ae3a8 |
include/hw/pci/pci.h | 1 +
|
|
|
9ae3a8 |
2 files changed, 51 insertions(+)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
|
|
|
9ae3a8 |
index 26995d7..d550851 100644
|
|
|
9ae3a8 |
--- a/hw/pci/pci.c
|
|
|
9ae3a8 |
+++ b/hw/pci/pci.c
|
|
|
9ae3a8 |
@@ -2244,6 +2244,56 @@ void pci_setup_iommu(PCIBus *bus, PCIDMAContextFunc fn, void *opaque)
|
|
|
9ae3a8 |
bus->dma_context_opaque = opaque;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
+static void pci_dev_get_w64(PCIBus *b, PCIDevice *dev, void *opaque)
|
|
|
9ae3a8 |
+{
|
|
|
9ae3a8 |
+ Range *range = opaque;
|
|
|
9ae3a8 |
+ PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(dev);
|
|
|
9ae3a8 |
+ uint16_t cmd = pci_get_word(dev->config + PCI_COMMAND);
|
|
|
9ae3a8 |
+ int r;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ if (!(cmd & PCI_COMMAND_MEMORY)) {
|
|
|
9ae3a8 |
+ return;
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ if (pc->is_bridge) {
|
|
|
9ae3a8 |
+ pcibus_t base = pci_bridge_get_base(dev, PCI_BASE_ADDRESS_MEM_PREFETCH);
|
|
|
9ae3a8 |
+ pcibus_t limit = pci_bridge_get_limit(dev, PCI_BASE_ADDRESS_MEM_PREFETCH);
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ base = MAX(base, 0x1ULL << 32);
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ if (limit >= base) {
|
|
|
9ae3a8 |
+ Range pref_range;
|
|
|
9ae3a8 |
+ pref_range.begin = base;
|
|
|
9ae3a8 |
+ pref_range.end = limit + 1;
|
|
|
9ae3a8 |
+ range_extend(range, &pref_range);
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+ for (r = 0; r < PCI_NUM_REGIONS; ++r) {
|
|
|
9ae3a8 |
+ PCIIORegion *region = &dev->io_regions[r];
|
|
|
9ae3a8 |
+ Range region_range;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ if (!region->size ||
|
|
|
9ae3a8 |
+ (region->type & PCI_BASE_ADDRESS_SPACE_IO) ||
|
|
|
9ae3a8 |
+ !(region->type & PCI_BASE_ADDRESS_MEM_TYPE_64)) {
|
|
|
9ae3a8 |
+ continue;
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+ region_range.begin = pci_get_quad(dev->config + pci_bar(dev, r));
|
|
|
9ae3a8 |
+ region_range.end = region_range.begin + region->size;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ region_range.begin = MAX(region_range.begin, 0x1ULL << 32);
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ if (region_range.end - 1 >= region_range.begin) {
|
|
|
9ae3a8 |
+ range_extend(range, ®ion_range);
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+}
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+void pci_bus_get_w64_range(PCIBus *bus, Range *range)
|
|
|
9ae3a8 |
+{
|
|
|
9ae3a8 |
+ range->begin = range->end = 0;
|
|
|
9ae3a8 |
+ pci_for_each_device_under_bus(bus, pci_dev_get_w64, range);
|
|
|
9ae3a8 |
+}
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
static const TypeInfo pci_device_type_info = {
|
|
|
9ae3a8 |
.name = TYPE_PCI_DEVICE,
|
|
|
9ae3a8 |
.parent = TYPE_DEVICE,
|
|
|
9ae3a8 |
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
|
|
|
9ae3a8 |
index 8d075ab..e7760dd 100644
|
|
|
9ae3a8 |
--- a/include/hw/pci/pci.h
|
|
|
9ae3a8 |
+++ b/include/hw/pci/pci.h
|
|
|
9ae3a8 |
@@ -395,6 +395,7 @@ int pci_find_domain(const PCIBus *bus);
|
|
|
9ae3a8 |
PCIDevice *pci_find_device(PCIBus *bus, int bus_num, uint8_t devfn);
|
|
|
9ae3a8 |
int pci_qdev_find_device(const char *id, PCIDevice **pdev);
|
|
|
9ae3a8 |
PCIBus *pci_get_bus_devfn(int *devfnp, const char *devaddr);
|
|
|
9ae3a8 |
+void pci_bus_get_w64_range(PCIBus *bus, Range *range);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
int pci_read_devaddr(Monitor *mon, const char *addr, int *domp, int *busp,
|
|
|
9ae3a8 |
unsigned *slotp);
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.11.7
|
|
|
9ae3a8 |
|