提交 4c92325b 编写于 作者: I Isaku Yamahata 提交者: Michael S. Tsirkin

pci: deassert intx on reset.

deassert intx on device reset.
So far pci_device_reset() is used for system reset.
In that case, interrupt controller is reset at the same time so that
all irq is are deasserted.
But now pci bus reset/flr is supported, and in that case irq needs to be
disabled explicitly.
Signed-off-by: NIsaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
上级 2991181a
...@@ -137,6 +137,14 @@ static void pci_update_irq_status(PCIDevice *dev) ...@@ -137,6 +137,14 @@ static void pci_update_irq_status(PCIDevice *dev)
} }
} }
void pci_device_deassert_intx(PCIDevice *dev)
{
int i;
for (i = 0; i < PCI_NUM_PINS; ++i) {
qemu_set_irq(dev->irq[i], 0);
}
}
/* /*
* This function is called on #RST and FLR. * This function is called on #RST and FLR.
* FLR if PCI_EXP_DEVCTL_BCR_FLR is set * FLR if PCI_EXP_DEVCTL_BCR_FLR is set
...@@ -152,6 +160,7 @@ void pci_device_reset(PCIDevice *dev) ...@@ -152,6 +160,7 @@ void pci_device_reset(PCIDevice *dev)
dev->irq_state = 0; dev->irq_state = 0;
pci_update_irq_status(dev); pci_update_irq_status(dev);
pci_device_deassert_intx(dev);
/* Clear all writeable bits */ /* Clear all writeable bits */
pci_word_test_and_clear_mask(dev->config + PCI_COMMAND, pci_word_test_and_clear_mask(dev->config + PCI_COMMAND,
pci_get_word(dev->wmask + PCI_COMMAND) | pci_get_word(dev->wmask + PCI_COMMAND) |
......
...@@ -264,6 +264,8 @@ void do_pci_info_print(Monitor *mon, const QObject *data); ...@@ -264,6 +264,8 @@ void do_pci_info_print(Monitor *mon, const QObject *data);
void do_pci_info(Monitor *mon, QObject **ret_data); void do_pci_info(Monitor *mon, QObject **ret_data);
void pci_bridge_update_mappings(PCIBus *b); void pci_bridge_update_mappings(PCIBus *b);
void pci_device_deassert_intx(PCIDevice *dev);
static inline void static inline void
pci_set_byte(uint8_t *config, uint8_t val) pci_set_byte(uint8_t *config, uint8_t val)
{ {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册