ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pci: fix pci_device_reset 

Clear interrupt disable bit on reset, according to PCI spec.
Fix pci_device_reset() with 64bit BAR.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Isaku Yamahata 2010-06-17 15:15:45 +09:00 committed by Michael S. Tsirkin
parent 1ddda5cd36
commit 71ebd6dcf9
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/pci.c
View File

@ -155,15 +155,24 @@ static void pci_device_reset(PCIDevice *dev)
dev->irq_state = 0; dev->irq_state = 0;
pci_update_irq_status(dev); pci_update_irq_status(dev);
dev->config[PCI_COMMAND] &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY | /* Clear all writeable bits */
PCI_COMMAND_MASTER); pci_set_word(dev->config + PCI_COMMAND,
pci_get_word(dev->config + PCI_COMMAND) &
~pci_get_word(dev->wmask + PCI_COMMAND));
dev->config[PCI_CACHE_LINE_SIZE] = 0x0; dev->config[PCI_CACHE_LINE_SIZE] = 0x0;
dev->config[PCI_INTERRUPT_LINE] = 0x0; dev->config[PCI_INTERRUPT_LINE] = 0x0;
for (r = 0; r < PCI_NUM_REGIONS; ++r) { for (r = 0; r < PCI_NUM_REGIONS; ++r) {
if (!dev->io_regions[r].size) { PCIIORegion *region = &dev->io_regions[r];
if (!region->size) {
continue; continue;
} }
pci_set_long(dev->config + pci_bar(dev, r), dev->io_regions[r].type);
if (!(region->type & PCI_BASE_ADDRESS_SPACE_IO) &&
region->type & PCI_BASE_ADDRESS_MEM_TYPE_64) {
pci_set_quad(dev->config + pci_bar(dev, r), region->type);
} else {
pci_set_long(dev->config + pci_bar(dev, r), region->type);
}
} }
pci_update_mappings(dev); pci_update_mappings(dev);
} }