[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/14] pci: remove explicit check to 64K ioport size
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 08/14] pci: remove explicit check to 64K ioport size |
Date: |
Sun, 29 Sep 2013 10:00:08 +0300 |
From: Hervé Poussineau <address@hidden>
This check is useless, as bigger addresses will be ignored when
added to 'io' MemoryRegion, which has a size of 64K.
However, some architectures don't use the 'io' MemoryRegion, like
the alpha and versatile platforms. They create a PCI I/O region
bigger than 64K, so let them handle PCI I/O BARs in the higher range.
MST: reinstated work-around for BAR sizing.
Signed-off-by: Hervé Poussineau <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/pci/pci.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 52cbab7..00554a0 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -1028,8 +1028,10 @@ static pcibus_t pci_bar_address(PCIDevice *d,
}
new_addr = pci_get_long(d->config + bar) & ~(size - 1);
last_addr = new_addr + size - 1;
- /* NOTE: we have only 64K ioports on PC */
- if (last_addr <= new_addr || new_addr == 0 || last_addr > UINT16_MAX) {
+ /* Check if 32 bit BAR wraps around explicitly.
+ * TODO: make priorities correct and remove this work around.
+ */
+ if (last_addr <= new_addr || new_addr == 0 || last_addr >= UINT32_MAX)
{
return PCI_BAR_UNMAPPED;
}
return new_addr;
--
MST
- [Qemu-devel] [PULL 00/14] pc,pci,virtio fixes and cleanups, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 01/14] q35: make pci window address/size match guest cfg, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 02/14] range: add Range to typedefs, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 03/14] range: add min/max operations on ranges, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 04/14] pci: add helper to retrieve the 64-bit range, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 05/14] q35: use 64 bit window programmed by guest, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 07/14] piix4: disable io on reset, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 06/14] piix: use 64 bit window programmed by guest, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 08/14] pci: remove explicit check to 64K ioport size,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 09/14] virtio-net: fix up HMP NIC info string on reset, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 10/14] smbios: Normalize smbios_entry_add()'s error handling to exit(1), Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 11/14] smbios: Convert to QemuOpts, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 12/14] smbios: Improve diagnostics for conflicting entries, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 13/14] smbios: Make multiple -smbios type= accumulate sanely, Michael S. Tsirkin, 2013/09/29
- [Qemu-devel] [PULL 14/14] smbios: Factor out smbios_maybe_add_str(), Michael S. Tsirkin, 2013/09/29