|
 |
9ae3a8 |
From 3d461e82d134f7370f28ff2def581d39a3e19729 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
Message-Id: <3d461e82d134f7370f28ff2def581d39a3e19729.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:18:09 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 31/56] q35: expose mmcfg size as a property
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1387293161-4085-32-git-send-email-mst@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 56337
|
|
|
9ae3a8 |
O-Subject: [PATCH qemu-kvm RHEL7.0 v2 31/57] q35: expose mmcfg size as a property
|
|
|
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 |
Address is already exposed, expose size for symmetry.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
Tested-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
9ae3a8 |
Tested-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit cbcaf79e3ce1b14084f3e3f4f64365e9bfd70e6a)
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
include/hw/pci/pcie_host.h | 1 +
|
|
|
9ae3a8 |
hw/pci-host/q35.c | 14 ++++++++++++++
|
|
|
9ae3a8 |
2 files changed, 15 insertions(+)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/pci-host/q35.c | 14 ++++++++++++++
|
|
|
9ae3a8 |
include/hw/pci/pcie_host.h | 1 +
|
|
|
9ae3a8 |
2 files changed, 15 insertions(+)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
|
|
|
9ae3a8 |
index 72d97c8..87691d1 100644
|
|
|
9ae3a8 |
--- a/hw/pci-host/q35.c
|
|
|
9ae3a8 |
+++ b/hw/pci-host/q35.c
|
|
|
9ae3a8 |
@@ -108,6 +108,16 @@ static void q35_host_get_pci_hole64_end(Object *obj, Visitor *v,
|
|
|
9ae3a8 |
visit_type_uint64(v, &w64.end, name, errp);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
+static void q35_host_get_mmcfg_size(Object *obj, Visitor *v,
|
|
|
9ae3a8 |
+ void *opaque, const char *name,
|
|
|
9ae3a8 |
+ Error **errp)
|
|
|
9ae3a8 |
+{
|
|
|
9ae3a8 |
+ PCIExpressHost *e = PCIE_HOST_BRIDGE(obj);
|
|
|
9ae3a8 |
+ uint32_t value = e->size;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ visit_type_uint32(v, &value, name, errp);
|
|
|
9ae3a8 |
+}
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
static Property mch_props[] = {
|
|
|
9ae3a8 |
DEFINE_PROP_UINT64(PCIE_HOST_MCFG_BASE, Q35PCIHost, host.base_addr,
|
|
|
9ae3a8 |
MCH_HOST_BRIDGE_PCIEXBAR_DEFAULT),
|
|
|
9ae3a8 |
@@ -152,6 +162,10 @@ static void q35_host_initfn(Object *obj)
|
|
|
9ae3a8 |
q35_host_get_pci_hole64_end,
|
|
|
9ae3a8 |
NULL, NULL, NULL, NULL);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
+ object_property_add(obj, PCIE_HOST_MCFG_SIZE, "int",
|
|
|
9ae3a8 |
+ q35_host_get_mmcfg_size,
|
|
|
9ae3a8 |
+ NULL, NULL, NULL, NULL);
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
/* Leave enough space for the biggest MCFG BAR */
|
|
|
9ae3a8 |
/* TODO: this matches current bios behaviour, but
|
|
|
9ae3a8 |
* it's not a power of two, which means an MTRR
|
|
|
9ae3a8 |
diff --git a/include/hw/pci/pcie_host.h b/include/hw/pci/pcie_host.h
|
|
|
9ae3a8 |
index 33d75bd..acca45e 100644
|
|
|
9ae3a8 |
--- a/include/hw/pci/pcie_host.h
|
|
|
9ae3a8 |
+++ b/include/hw/pci/pcie_host.h
|
|
|
9ae3a8 |
@@ -29,6 +29,7 @@
|
|
|
9ae3a8 |
OBJECT_CHECK(PCIExpressHost, (obj), TYPE_PCIE_HOST_BRIDGE)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
#define PCIE_HOST_MCFG_BASE "MCFG"
|
|
|
9ae3a8 |
+#define PCIE_HOST_MCFG_SIZE "mcfg_size"
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
/* pcie_host::base_addr == PCIE_BASE_ADDR_UNMAPPED when it isn't mapped. */
|
|
|
9ae3a8 |
#define PCIE_BASE_ADDR_UNMAPPED ((hwaddr)-1ULL)
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.11.7
|
|
|
9ae3a8 |
|