From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YG5yW-0004qP-TP for qemu-devel@nongnu.org; Tue, 27 Jan 2015 08:14:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YG5yS-0008Oi-98 for qemu-devel@nongnu.org; Tue, 27 Jan 2015 08:14:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40865) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YG5yS-0008OI-1A for qemu-devel@nongnu.org; Tue, 27 Jan 2015 08:14:32 -0500 Date: Tue, 27 Jan 2015 15:13:56 +0200 From: "Michael S. Tsirkin" Message-ID: <1422364369-8667-4-git-send-email-mst@redhat.com> References: <1422364369-8667-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1422364369-8667-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 03/16] pci: Split pcie_host_mmcfg_map() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Alexander Graf , Claudio Fontana , dgilbert@redhat.com, Juan Quintela From: Alexander Graf The mmcfg space is a memory region that allows access to PCI config space in the PCIe world. To maintain abstraction layers, I would like to expose the mmcfg space as a sysbus mmio region rather than have it mapped straight into the system's memory address space though. So this patch splits the initialization of the mmcfg space from the actual mapping, allowing us to only have an mmfg memory region without the map. Signed-off-by: Alexander Graf Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Claudio Fontana --- include/hw/pci/pcie_host.h | 1 + hw/pci/pcie_host.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/hw/pci/pcie_host.h b/include/hw/pci/pcie_host.h index ff44ef6..4d23c80 100644 --- a/include/hw/pci/pcie_host.h +++ b/include/hw/pci/pcie_host.h @@ -50,6 +50,7 @@ struct PCIExpressHost { }; void pcie_host_mmcfg_unmap(PCIExpressHost *e); +void pcie_host_mmcfg_init(PCIExpressHost *e, uint32_t size); void pcie_host_mmcfg_map(PCIExpressHost *e, hwaddr addr, uint32_t size); void pcie_host_mmcfg_update(PCIExpressHost *e, int enable, diff --git a/hw/pci/pcie_host.c b/hw/pci/pcie_host.c index 3db038f..dfb4a2b 100644 --- a/hw/pci/pcie_host.c +++ b/hw/pci/pcie_host.c @@ -98,8 +98,7 @@ void pcie_host_mmcfg_unmap(PCIExpressHost *e) } } -void pcie_host_mmcfg_map(PCIExpressHost *e, hwaddr addr, - uint32_t size) +void pcie_host_mmcfg_init(PCIExpressHost *e, uint32_t size) { assert(!(size & (size - 1))); /* power of 2 */ assert(size >= PCIE_MMCFG_SIZE_MIN); @@ -107,6 +106,12 @@ void pcie_host_mmcfg_map(PCIExpressHost *e, hwaddr addr, e->size = size; memory_region_init_io(&e->mmio, OBJECT(e), &pcie_mmcfg_ops, e, "pcie-mmcfg", e->size); +} + +void pcie_host_mmcfg_map(PCIExpressHost *e, hwaddr addr, + uint32_t size) +{ + pcie_host_mmcfg_init(e, size); e->base_addr = addr; memory_region_add_subregion(get_system_memory(), e->base_addr, &e->mmio); } -- MST