From: "Michael S. Tsirkin" <mst@redhat.com> To: Paul Brook <paul@codesourcery.com>, Avi Kivity <avi@redhat.com>, qemu-devel@nongnu.org, Carsten Otte <cotte@de.ibm.com>, kvm@vger.kernel.org, Rusty Russell <rusty@rustcorp.com.au>, vi Subject: [PATCHv4 08/13] qemu: add support for resizing regions Date: Wed, 10 Jun 2009 15:28:57 +0300 [thread overview] Message-ID: <20090610122857.GI27174@redhat.com> (raw) In-Reply-To: <cover.1244635350.git.mst@redhat.com> Make it possible to resize PCI regions. This will be used by virtio with MSI-X, where the region size depends on whether MSI-X is enabled, and can change across load/save. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- hw/pci.c | 54 ++++++++++++++++++++++++++++++++++++------------------ hw/pci.h | 3 +++ 2 files changed, 39 insertions(+), 18 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index a3f3fd3..326ee0d 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -386,6 +386,41 @@ void pci_register_io_region(PCIDevice *pci_dev, int region_num, *(uint32_t *)(pci_dev->wmask + addr) = cpu_to_le32(wmask); } +static void pci_unmap_region(PCIDevice *d, PCIIORegion *r) +{ + if (r->addr == -1) + return; + if (r->type & PCI_ADDRESS_SPACE_IO) { + int class; + /* NOTE: specific hack for IDE in PC case: + only one byte must be mapped. */ + class = pci_get_word(d->config + PCI_CLASS_DEVICE); + if (class == 0x0101 && r->size == 4) { + isa_unassign_ioport(r->addr + 2, 1); + } else { + isa_unassign_ioport(r->addr, r->size); + } + } else { + cpu_register_physical_memory(pci_to_cpu_addr(r->addr), + r->size, + IO_MEM_UNASSIGNED); + qemu_unregister_coalesced_mmio(r->addr, r->size); + } +} + +void pci_resize_io_region(PCIDevice *pci_dev, int region_num, + uint32_t size) +{ + + PCIIORegion *r = &pci_dev->io_regions[region_num]; + if (r->size == size) + return; + r->size = size; + pci_unmap_region(pci_dev, r); + r->addr = -1; + pci_update_mappings(pci_dev); +} + static void pci_update_mappings(PCIDevice *d) { PCIIORegion *r; @@ -439,24 +474,7 @@ static void pci_update_mappings(PCIDevice *d) } /* now do the real mapping */ if (new_addr != r->addr) { - if (r->addr != -1) { - if (r->type & PCI_ADDRESS_SPACE_IO) { - int class; - /* NOTE: specific hack for IDE in PC case: - only one byte must be mapped. */ - class = d->config[0x0a] | (d->config[0x0b] << 8); - if (class == 0x0101 && r->size == 4) { - isa_unassign_ioport(r->addr + 2, 1); - } else { - isa_unassign_ioport(r->addr, r->size); - } - } else { - cpu_register_physical_memory(pci_to_cpu_addr(r->addr), - r->size, - IO_MEM_UNASSIGNED); - qemu_unregister_coalesced_mmio(r->addr, r->size); - } - } + pci_unmap_region(d, r); r->addr = new_addr; if (r->addr != -1) { r->map_func(d, i, r->addr, r->size, r->type); diff --git a/hw/pci.h b/hw/pci.h index a5e7561..9455e4c 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -217,6 +217,9 @@ void pci_register_io_region(PCIDevice *pci_dev, int region_num, uint32_t size, int type, PCIMapIORegionFunc *map_func); +void pci_resize_io_region(PCIDevice *pci_dev, int region_num, + uint32_t size); + int pci_add_capability(PCIDevice *pci_dev, uint8_t cap_id, uint8_t cap_size); void pci_del_capability(PCIDevice *pci_dev, uint8_t cap_id, uint8_t cap_size); -- 1.6.3.1.56.g79e1.dirty
WARNING: multiple messages have this Message-ID (diff)
From: "Michael S. Tsirkin" <mst@redhat.com> To: Paul Brook <paul@codesourcery.com>, Avi Kivity <avi@redhat.com>, qemu-devel@nongnu.org, Carsten Otte <cotte@de.ibm.com>, kvm@vger.kernel.org, Rusty Russell <rusty@rustcorp.com.au>, virtualization@lists.linux-foundation.org, Christian Borntraeger <borntraeger@de.ibm.com>, Blue Swirl <blauwirbel@gmail.com>, Anthony Liguori <anthony@codemonkey.ws>, Glauber Costa <glommer@redhat.com> Subject: [Qemu-devel] [PATCHv4 08/13] qemu: add support for resizing regions Date: Wed, 10 Jun 2009 15:28:57 +0300 [thread overview] Message-ID: <20090610122857.GI27174@redhat.com> (raw) In-Reply-To: <cover.1244635350.git.mst@redhat.com> Make it possible to resize PCI regions. This will be used by virtio with MSI-X, where the region size depends on whether MSI-X is enabled, and can change across load/save. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- hw/pci.c | 54 ++++++++++++++++++++++++++++++++++++------------------ hw/pci.h | 3 +++ 2 files changed, 39 insertions(+), 18 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index a3f3fd3..326ee0d 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -386,6 +386,41 @@ void pci_register_io_region(PCIDevice *pci_dev, int region_num, *(uint32_t *)(pci_dev->wmask + addr) = cpu_to_le32(wmask); } +static void pci_unmap_region(PCIDevice *d, PCIIORegion *r) +{ + if (r->addr == -1) + return; + if (r->type & PCI_ADDRESS_SPACE_IO) { + int class; + /* NOTE: specific hack for IDE in PC case: + only one byte must be mapped. */ + class = pci_get_word(d->config + PCI_CLASS_DEVICE); + if (class == 0x0101 && r->size == 4) { + isa_unassign_ioport(r->addr + 2, 1); + } else { + isa_unassign_ioport(r->addr, r->size); + } + } else { + cpu_register_physical_memory(pci_to_cpu_addr(r->addr), + r->size, + IO_MEM_UNASSIGNED); + qemu_unregister_coalesced_mmio(r->addr, r->size); + } +} + +void pci_resize_io_region(PCIDevice *pci_dev, int region_num, + uint32_t size) +{ + + PCIIORegion *r = &pci_dev->io_regions[region_num]; + if (r->size == size) + return; + r->size = size; + pci_unmap_region(pci_dev, r); + r->addr = -1; + pci_update_mappings(pci_dev); +} + static void pci_update_mappings(PCIDevice *d) { PCIIORegion *r; @@ -439,24 +474,7 @@ static void pci_update_mappings(PCIDevice *d) } /* now do the real mapping */ if (new_addr != r->addr) { - if (r->addr != -1) { - if (r->type & PCI_ADDRESS_SPACE_IO) { - int class; - /* NOTE: specific hack for IDE in PC case: - only one byte must be mapped. */ - class = d->config[0x0a] | (d->config[0x0b] << 8); - if (class == 0x0101 && r->size == 4) { - isa_unassign_ioport(r->addr + 2, 1); - } else { - isa_unassign_ioport(r->addr, r->size); - } - } else { - cpu_register_physical_memory(pci_to_cpu_addr(r->addr), - r->size, - IO_MEM_UNASSIGNED); - qemu_unregister_coalesced_mmio(r->addr, r->size); - } - } + pci_unmap_region(d, r); r->addr = new_addr; if (r->addr != -1) { r->map_func(d, i, r->addr, r->size, r->type); diff --git a/hw/pci.h b/hw/pci.h index a5e7561..9455e4c 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -217,6 +217,9 @@ void pci_register_io_region(PCIDevice *pci_dev, int region_num, uint32_t size, int type, PCIMapIORegionFunc *map_func); +void pci_resize_io_region(PCIDevice *pci_dev, int region_num, + uint32_t size); + int pci_add_capability(PCIDevice *pci_dev, uint8_t cap_id, uint8_t cap_size); void pci_del_capability(PCIDevice *pci_dev, uint8_t cap_id, uint8_t cap_size); -- 1.6.3.1.56.g79e1.dirty
next prev parent reply other threads:[~2009-06-10 12:32 UTC|newest] Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <cover.1244635350.git.mst@redhat.com> 2009-06-10 12:28 ` [PATCHv4 01/13] qemu: make default_write_config use mask table Michael S. Tsirkin 2009-06-10 12:28 ` Michael S. Tsirkin 2009-06-10 12:28 ` [Qemu-devel] " Michael S. Tsirkin 2009-06-16 20:40 ` Anthony Liguori 2009-06-16 20:40 ` Anthony Liguori 2009-06-16 20:40 ` [Qemu-devel] " Anthony Liguori 2009-06-17 11:49 ` Michael S. Tsirkin 2009-06-17 11:49 ` Michael S. Tsirkin 2009-06-17 11:49 ` [Qemu-devel] " Michael S. Tsirkin 2009-06-10 12:28 ` [PATCHv4 02/13] qemu: capability bits in pci save/restore Michael S. Tsirkin 2009-06-10 12:28 ` [Qemu-devel] " Michael S. Tsirkin 2009-06-10 12:28 ` Michael S. Tsirkin 2009-06-10 12:28 ` [PATCHv4 03/13] qemu: add routines to manage PCI capabilities Michael S. Tsirkin 2009-06-10 12:28 ` [Qemu-devel] " Michael S. Tsirkin 2009-06-10 12:28 ` Michael S. Tsirkin 2009-06-10 12:28 ` [PATCHv4 04/13] qemu: helper routines for pci access Michael S. Tsirkin 2009-06-10 12:28 ` Michael S. Tsirkin 2009-06-10 12:28 ` [Qemu-devel] " Michael S. Tsirkin 2009-06-10 12:28 ` [PATCHv4 05/13] qemu: MSI-X support functions Michael S. Tsirkin 2009-06-10 12:28 ` [Qemu-devel] " Michael S. Tsirkin 2009-06-10 12:28 ` Michael S. Tsirkin 2009-06-10 12:28 ` [PATCHv4 06/13] qemu: add flag to disable MSI-X by default Michael S. Tsirkin 2009-06-10 12:28 ` [Qemu-devel] " Michael S. Tsirkin 2009-06-10 12:28 ` Michael S. Tsirkin 2009-06-10 12:28 ` [PATCHv4 07/13] qemu: minimal MSI/MSI-X implementation for PC Michael S. Tsirkin 2009-06-10 12:28 ` [Qemu-devel] " Michael S. Tsirkin 2009-06-10 12:28 ` Michael S. Tsirkin 2009-06-10 12:28 ` [PATCHv4 08/13] qemu: add support for resizing regions Michael S. Tsirkin 2009-06-10 12:28 ` Michael S. Tsirkin [this message] 2009-06-10 12:28 ` [Qemu-devel] " Michael S. Tsirkin 2009-06-10 12:29 ` [PATCHv4 09/13] qemu: virtio support for many interrupt vectors Michael S. Tsirkin 2009-06-10 12:29 ` [Qemu-devel] " Michael S. Tsirkin 2009-06-10 12:29 ` Michael S. Tsirkin 2009-06-10 12:29 ` [PATCHv4 10/13] qemu: MSI-X support in virtio PCI Michael S. Tsirkin 2009-06-10 12:29 ` [Qemu-devel] " Michael S. Tsirkin 2009-06-10 12:29 ` Michael S. Tsirkin 2009-06-10 12:29 ` [PATCHv4 11/13] qemu: request 3 vectors in virtio-net Michael S. Tsirkin 2009-06-10 12:29 ` Michael S. Tsirkin 2009-06-10 12:29 ` [Qemu-devel] " Michael S. Tsirkin 2009-06-10 12:29 ` [PATCHv4 12/13] qemu: virtio save/load bindings Michael S. Tsirkin 2009-06-10 12:29 ` [Qemu-devel] " Michael S. Tsirkin 2009-06-10 12:29 ` Michael S. Tsirkin 2009-06-10 12:29 ` [PATCHv4 13/13] qemu: add pci_get/set_byte Michael S. Tsirkin 2009-06-10 12:29 ` Michael S. Tsirkin 2009-06-10 12:29 ` [Qemu-devel] " Michael S. Tsirkin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20090610122857.GI27174@redhat.com \ --to=mst@redhat.com \ --cc=avi@redhat.com \ --cc=cotte@de.ibm.com \ --cc=kvm@vger.kernel.org \ --cc=paul@codesourcery.com \ --cc=qemu-devel@nongnu.org \ --cc=rusty@rustcorp.com.au \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.