david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ich9: clean up ich9_lpc_update_pic/ich9_lpc_update_apic and callers

Browse Source 
Make ich9_lpc_update_pic take care only of GSIs 0-15, and
ich9_lpc_update_apic take care only of GSIs 16-23.  Assert
that they are called with the correct GSI indices.

Reviewed-by: Efimov Vasily <real@ispras.ru>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2016-06-17 17:07:31 +02:00
parent f62efcacfa
commit a94dd6a9d6
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hw/isa/lpc_ich9.c
View File

@ -204,38 +204,28 @@ static void ich9_lpc_pic_irq(ICH9LPCState *lpc, int pirq_num,
abort(); abort();
} }
/* pic_irq: i8254 irq 0-15 */ /* gsi: i8259+ioapic irq 0-15, otherwise assert */
static void ich9_lpc_update_pic(ICH9LPCState *lpc, int pic_irq) static void ich9_lpc_update_pic(ICH9LPCState *lpc, int gsi)
{ {
int i, pic_level; int i, pic_level;
assert(gsi < ICH9_LPC_PIC_NUM_PINS);
/* The pic level is the logical OR of all the PCI irqs mapped to it */ /* The pic level is the logical OR of all the PCI irqs mapped to it */
pic_level = 0; pic_level = 0;
for (i = 0; i < ICH9_LPC_NB_PIRQS; i++) { for (i = 0; i < ICH9_LPC_NB_PIRQS; i++) {
int tmp_irq; int tmp_irq;
int tmp_dis; int tmp_dis;
ich9_lpc_pic_irq(lpc, i, &tmp_irq, &tmp_dis); ich9_lpc_pic_irq(lpc, i, &tmp_irq, &tmp_dis);
if (!tmp_dis && pic_irq == tmp_irq) { if (!tmp_dis && tmp_irq == gsi) {
pic_level |= pci_bus_get_irq_level(lpc->d.bus, i); pic_level |= pci_bus_get_irq_level(lpc->d.bus, i);
} }
} }
if (pic_irq == ich9_lpc_sci_irq(lpc)) { if (gsi == ich9_lpc_sci_irq(lpc)) {
pic_level |= lpc->sci_level; pic_level |= lpc->sci_level;
} }
qemu_set_irq(lpc->pic[pic_irq], pic_level); qemu_set_irq(lpc->pic[gsi], pic_level);
}
/* pirq: pirq[A-H] 0-7*/
static void ich9_lpc_update_by_pirq(ICH9LPCState *lpc, int pirq)
{
int pic_irq;
int pic_dis;
ich9_lpc_pic_irq(lpc, pirq, &pic_irq, &pic_dis);
assert(pic_irq < ICH9_LPC_PIC_NUM_PINS);
ich9_lpc_update_pic(lpc, pic_irq);
} }
/* APIC mode: GSIx: PIRQ[A-H] -> GSI 16, ... no pirq shares same APIC pins. */ /* APIC mode: GSIx: PIRQ[A-H] -> GSI 16, ... no pirq shares same APIC pins. */
@ -249,13 +239,14 @@ static int ich9_gsi_to_pirq(int gsi)
return gsi - ICH9_LPC_PIC_NUM_PINS; return gsi - ICH9_LPC_PIC_NUM_PINS;
} }
/* gsi: ioapic irq 16-23, otherwise assert */
static void ich9_lpc_update_apic(ICH9LPCState *lpc, int gsi) static void ich9_lpc_update_apic(ICH9LPCState *lpc, int gsi)
{ {
int level = 0; int level = 0;
if (gsi >= ICH9_LPC_PIC_NUM_PINS) { assert(gsi >= ICH9_LPC_PIC_NUM_PINS);
level |= pci_bus_get_irq_level(lpc->d.bus, ich9_gsi_to_pirq(gsi));
} level |= pci_bus_get_irq_level(lpc->d.bus, ich9_gsi_to_pirq(gsi));
if (gsi == ich9_lpc_sci_irq(lpc)) { if (gsi == ich9_lpc_sci_irq(lpc)) {
level |= lpc->sci_level; level |= lpc->sci_level;
} }
@ -266,12 +257,14 @@ static void ich9_lpc_update_apic(ICH9LPCState *lpc, int gsi)
void ich9_lpc_set_irq(void *opaque, int pirq, int level) void ich9_lpc_set_irq(void *opaque, int pirq, int level)
{ {
ICH9LPCState *lpc = opaque; ICH9LPCState *lpc = opaque;
int pic_irq, pic_dis;
assert(0 <= pirq); assert(0 <= pirq);
assert(pirq < ICH9_LPC_NB_PIRQS); assert(pirq < ICH9_LPC_NB_PIRQS);
ich9_lpc_update_apic(lpc, ich9_pirq_to_gsi(pirq)); ich9_lpc_update_apic(lpc, ich9_pirq_to_gsi(pirq));
ich9_lpc_update_by_pirq(lpc, pirq); ich9_lpc_pic_irq(lpc, pirq, &pic_irq, &pic_dis);
ich9_lpc_update_pic(lpc, pic_irq);
} }
/* return the pirq number (PIRQ[A-H]:0-7) corresponding to /* return the pirq number (PIRQ[A-H]:0-7) corresponding to
@ -362,8 +355,9 @@ static void ich9_set_sci(void *opaque, int irq_num, int level)
return; return;
} }
ich9_lpc_update_apic(lpc, irq); if (irq >= ICH9_LPC_PIC_NUM_PINS) {
if (irq < ICH9_LPC_PIC_NUM_PINS) { ich9_lpc_update_apic(lpc, irq);
} else {
ich9_lpc_update_pic(lpc, irq); ich9_lpc_update_pic(lpc, irq);
} }
} }