From: Michael S. Tsirkin Date: Tue, 21 Feb 2012 13:49:01 +0000 (+0200) Subject: pci: set memory type for memory behind the bridge X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=15ab7a75335108c76700bea67602017fe305350d;p=qemu.git pci: set memory type for memory behind the bridge As we make upper bits in IO and prefetcheable memory registers writeable, we should declare support for 64 bit prefetcheable memory and 32 bit io in the bridge. This changes the default for apb, dec, but I'm guessing they got the defaults wrong by accident. Alternatively, we could let bridges declare lack of 64 bit support and make the upper bits read-only zero. Reported-by: Gerd Hoffmann Signed-off-by: Michael S. Tsirkin --- diff --git a/hw/pci.c b/hw/pci.c index 3ca5f4c820..fee27fcf87 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -663,8 +663,11 @@ static void pci_init_mask_bridge(PCIDevice *d) pci_set_word(d->w1cmask + PCI_BRIDGE_CONTROL, PCI_BRIDGE_CTL_DISCARD_STATUS); d->cmask[PCI_IO_BASE] |= PCI_IO_RANGE_TYPE_MASK; + d->cmask[PCI_IO_LIMIT] |= PCI_IO_RANGE_TYPE_MASK; pci_word_test_and_set_mask(d->cmask + PCI_PREF_MEMORY_BASE, PCI_PREF_RANGE_TYPE_MASK); + pci_word_test_and_set_mask(d->cmask + PCI_PREF_MEMORY_LIMIT, + PCI_PREF_RANGE_TYPE_MASK); } static int pci_init_multifunction(PCIBus *bus, PCIDevice *dev)