Commit 27fb9688 authored by Alexander Graf's avatar Alexander Graf Committed by Michael S. Tsirkin
Browse files

pci: Split pcie_host_mmcfg_map() 



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: default avatarAlexander Graf <agraf@suse.de>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarClaudio Fontana <claudio.fontana@huawei.com>
parent 7828d750

hw/pci/pcie_host.c

+7 −2
Original line number Diff line number Diff line
@@ -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);

}

include/hw/pci/pcie_host.h

+1 −0
Original line number Diff line number Diff line
@@ -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,