mirror of https://github.com/xemu-project/xemu.git
handle the case where several PCI irqs share the same PIC irq
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1433 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
bc380d1719
commit
72cc6cfeef
45
hw/pci.c
45
hw/pci.c
|
@ -498,6 +498,27 @@ static inline int pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num)
|
||||||
return (irq_num + slot_addend) & 3;
|
return (irq_num + slot_addend) & 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline int get_pci_irq_level(int irq_num)
|
||||||
|
{
|
||||||
|
int pic_level;
|
||||||
|
#if (PCI_IRQ_WORDS == 2)
|
||||||
|
pic_level = ((pci_irq_levels[irq_num][0] |
|
||||||
|
pci_irq_levels[irq_num][1]) != 0);
|
||||||
|
#else
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
pic_level = 0;
|
||||||
|
for(i = 0; i < PCI_IRQ_WORDS; i++) {
|
||||||
|
if (pci_irq_levels[irq_num][i]) {
|
||||||
|
pic_level = 1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
return pic_level;
|
||||||
|
}
|
||||||
|
|
||||||
static void piix3_set_irq(PCIDevice *pci_dev, int irq_num, int level)
|
static void piix3_set_irq(PCIDevice *pci_dev, int irq_num, int level)
|
||||||
{
|
{
|
||||||
int irq_index, shift, pic_irq, pic_level;
|
int irq_index, shift, pic_irq, pic_level;
|
||||||
|
@ -510,26 +531,20 @@ static void piix3_set_irq(PCIDevice *pci_dev, int irq_num, int level)
|
||||||
*p = (*p & ~(1 << shift)) | (level << shift);
|
*p = (*p & ~(1 << shift)) | (level << shift);
|
||||||
|
|
||||||
/* now we change the pic irq level according to the piix irq mappings */
|
/* now we change the pic irq level according to the piix irq mappings */
|
||||||
|
/* XXX: optimize */
|
||||||
pic_irq = piix3_state->dev.config[0x60 + irq_num];
|
pic_irq = piix3_state->dev.config[0x60 + irq_num];
|
||||||
if (pic_irq < 16) {
|
if (pic_irq < 16) {
|
||||||
/* the pic level is the logical OR of all the PCI irqs mapped
|
/* the pic level is the logical OR of all the PCI irqs mapped
|
||||||
to it */
|
to it */
|
||||||
pic_level = 0;
|
pic_level = 0;
|
||||||
#if (PCI_IRQ_WORDS == 2)
|
if (pic_irq == piix3_state->dev.config[0x60])
|
||||||
pic_level = ((pci_irq_levels[irq_num][0] |
|
pic_level |= get_pci_irq_level(0);
|
||||||
pci_irq_levels[irq_num][1]) != 0);
|
if (pic_irq == piix3_state->dev.config[0x61])
|
||||||
#else
|
pic_level |= get_pci_irq_level(1);
|
||||||
{
|
if (pic_irq == piix3_state->dev.config[0x62])
|
||||||
int i;
|
pic_level |= get_pci_irq_level(2);
|
||||||
pic_level = 0;
|
if (pic_irq == piix3_state->dev.config[0x63])
|
||||||
for(i = 0; i < PCI_IRQ_WORDS; i++) {
|
pic_level |= get_pci_irq_level(3);
|
||||||
if (pci_irq_levels[irq_num][i]) {
|
|
||||||
pic_level = 1;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
pic_set_irq(pic_irq, pic_level);
|
pic_set_irq(pic_irq, pic_level);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue