qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] pci: do not pci_update_mappings when guest gets bar size
@ 2014-10-14 11:04 arei.gonglei
  2014-10-14 11:20 ` Michael S. Tsirkin
  0 siblings, 1 reply; 16+ messages in thread
From: arei.gonglei @ 2014-10-14 11:04 UTC (permalink / raw)
  To: qemu-devel; +Cc: ChenLiang, Gonglei, weidong.huang, qemu-stable, mst

From: ChenLiang <chenliang88@huawei.com>

Power-up software can determine how much address space the device
requires by writing a value of all 1's to the register and then
reading the value back(PCI specification). Qemu should not do
pci_update_mappings. Qemu may exit, because the wrong address of
this bar is overlap with other memslots.

Signed-off-by: ChenLiang <chenliang88@huawei.com>
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
---
 hw/pci/pci.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 6ce75aa..4d44b44 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -1158,12 +1158,12 @@ void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val_in, int
         d->config[addr + i] = (d->config[addr + i] & ~wmask) | (val & wmask);
         d->config[addr + i] &= ~(val & w1cmask); /* W1C: Write 1 to Clear */
     }
-    if (ranges_overlap(addr, l, PCI_BASE_ADDRESS_0, 24) ||
+    if (((ranges_overlap(addr, l, PCI_BASE_ADDRESS_0, 24) ||
         ranges_overlap(addr, l, PCI_ROM_ADDRESS, 4) ||
-        ranges_overlap(addr, l, PCI_ROM_ADDRESS1, 4) ||
-        range_covers_byte(addr, l, PCI_COMMAND))
+        ranges_overlap(addr, l, PCI_ROM_ADDRESS1, 4)) &&
+        val_in != 0xffffffff) || range_covers_byte(addr, l, PCI_COMMAND)) {
         pci_update_mappings(d);
-
+    }
     if (range_covers_byte(addr, l, PCI_COMMAND)) {
         pci_update_irq_disabled(d, was_irq_disabled);
         memory_region_set_enabled(&d->bus_master_enable_region,
-- 
1.7.12.4

^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2014-10-14 14:28 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-14 11:04 [Qemu-devel] [PATCH] pci: do not pci_update_mappings when guest gets bar size arei.gonglei
2014-10-14 11:20 ` Michael S. Tsirkin
2014-10-14 11:41   ` ChenLiang
2014-10-14 11:48     ` Michael S. Tsirkin
2014-10-14 12:15       ` ChenLiang
2014-10-14 12:23         ` Gonglei
2014-10-14 12:31           ` Michael S. Tsirkin
2014-10-14 12:27         ` Michael S. Tsirkin
2014-10-14 12:59           ` ChenLiang
2014-10-14 14:31             ` Michael S. Tsirkin
2014-10-14 11:58     ` Michael S. Tsirkin
2014-10-14 12:19       ` ChenLiang
2014-10-14 12:19       ` ChenLiang
2014-10-14 12:28         ` Michael S. Tsirkin
2014-10-14 12:27           ` ChenLiang
2014-10-14 14:21             ` Michael S. Tsirkin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).