[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 10/26] pcie: pass pcie window size to pcie_ho
From: |
Michael S. Tsirkin |
Subject: |
Re: [Qemu-devel] [PATCH v3 10/26] pcie: pass pcie window size to pcie_host_mmcfg_update() |
Date: |
Mon, 22 Oct 2012 12:54:20 +0200 |
On Fri, Oct 19, 2012 at 04:43:32PM -0400, Jason Baron wrote:
> From: Jason Baron <address@hidden>
>
> This allows q35 to pass/set the size of the pcie window in its update routine.
>
> Reviewed-by: Paolo Bonzini <address@hidden>
> Signed-off-by: Jason Baron <address@hidden>
Applied, thanks.
> ---
> hw/pcie_host.c | 21 ++++++++++++---------
> hw/pcie_host.h | 8 +++++---
> 2 files changed, 17 insertions(+), 12 deletions(-)
>
> diff --git a/hw/pcie_host.c b/hw/pcie_host.c
> index 28bbe72..e2fd276 100644
> --- a/hw/pcie_host.c
> +++ b/hw/pcie_host.c
> @@ -107,14 +107,9 @@ static const MemoryRegionOps pcie_mmcfg_ops = {
> /* pcie_host::base_addr == PCIE_BASE_ADDR_UNMAPPED when it isn't mapped. */
> #define PCIE_BASE_ADDR_UNMAPPED ((target_phys_addr_t)-1ULL)
>
> -int pcie_host_init(PCIExpressHost *e, uint32_t size)
> +int pcie_host_init(PCIExpressHost *e)
> {
> - assert(!(size & (size - 1))); /* power of 2 */
> - assert(size >= PCIE_MMCFG_SIZE_MIN);
> - assert(size <= PCIE_MMCFG_SIZE_MAX);
> e->base_addr = PCIE_BASE_ADDR_UNMAPPED;
> - e->size = size;
> - memory_region_init_io(&e->mmio, &pcie_mmcfg_ops, e, "pcie-mmcfg",
> e->size);
>
> return 0;
> }
> @@ -123,22 +118,30 @@ void pcie_host_mmcfg_unmap(PCIExpressHost *e)
> {
> if (e->base_addr != PCIE_BASE_ADDR_UNMAPPED) {
> memory_region_del_subregion(get_system_memory(), &e->mmio);
> + memory_region_destroy(&e->mmio);
> e->base_addr = PCIE_BASE_ADDR_UNMAPPED;
> }
> }
>
> -void pcie_host_mmcfg_map(PCIExpressHost *e, target_phys_addr_t addr)
> +void pcie_host_mmcfg_map(PCIExpressHost *e, target_phys_addr_t addr,
> + uint32_t size)
> {
> + assert(!(size & (size - 1))); /* power of 2 */
> + assert(size >= PCIE_MMCFG_SIZE_MIN);
> + assert(size <= PCIE_MMCFG_SIZE_MAX);
> + e->size = size;
> + memory_region_init_io(&e->mmio, &pcie_mmcfg_ops, e, "pcie-mmcfg",
> e->size);
> e->base_addr = addr;
> memory_region_add_subregion(get_system_memory(), e->base_addr, &e->mmio);
> }
>
> void pcie_host_mmcfg_update(PCIExpressHost *e,
> int enable,
> - target_phys_addr_t addr)
> + target_phys_addr_t addr,
> + uint32_t size)
> {
> pcie_host_mmcfg_unmap(e);
> if (enable) {
> - pcie_host_mmcfg_map(e, addr);
> + pcie_host_mmcfg_map(e, addr, size);
> }
> }
> diff --git a/hw/pcie_host.h b/hw/pcie_host.h
> index 0074508..2faa54e 100644
> --- a/hw/pcie_host.h
> +++ b/hw/pcie_host.h
> @@ -39,11 +39,13 @@ struct PCIExpressHost {
> MemoryRegion mmio;
> };
>
> -int pcie_host_init(PCIExpressHost *e, uint32_t size);
> +int pcie_host_init(PCIExpressHost *e);
> void pcie_host_mmcfg_unmap(PCIExpressHost *e);
> -void pcie_host_mmcfg_map(PCIExpressHost *e, target_phys_addr_t addr);
> +void pcie_host_mmcfg_map(PCIExpressHost *e, target_phys_addr_t addr,
> + uint32_t size);
> void pcie_host_mmcfg_update(PCIExpressHost *e,
> int enable,
> - target_phys_addr_t addr);
> + target_phys_addr_t addr,
> + uint32_t size);
>
> #endif /* PCIE_HOST_H */
> --
> 1.7.1
[Qemu-devel] [PATCH v3 09/26] pci: Add class 0xc05 as 'SMBus', Jason Baron, 2012/10/19
[Qemu-devel] [PATCH v3 07/26] pc/piix_pci: factor out smram/pam logic, Jason Baron, 2012/10/19
[Qemu-devel] [PATCH v3 10/26] pcie: pass pcie window size to pcie_host_mmcfg_update(), Jason Baron, 2012/10/19
- Re: [Qemu-devel] [PATCH v3 10/26] pcie: pass pcie window size to pcie_host_mmcfg_update(),
Michael S. Tsirkin <=
[Qemu-devel] [PATCH v3 11/26] pcie: Convert PCIExpressHost to use the QOM., Jason Baron, 2012/10/19
[Qemu-devel] [PATCH v3 12/26] ich9: Add acpi support and definitions, Jason Baron, 2012/10/19
[Qemu-devel] [PATCH v3 13/26] ich9: Add the lpc chip, Jason Baron, 2012/10/19