ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hw_x86_64: Let _edge_triggered() operate on IRQ 

Use the base IRQ in the _edge_triggered() utility function, not the
remapped vector.
This commit is contained in:
Reto Buerki 2015-05-12 22:20:19 +02:00 committed by Christian Helmuth
parent 6af893123e
commit 5eed6de910
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
repos/base-hw/src/core/include/spec/x86/pic.h
View File

@ -83,8 +83,7 @@ class Genode::Ioapic : public Mmio
*/
bool _edge_triggered(unsigned const irq)
{
return irq <= REMAP_BASE + Board::ISA_IRQ_END ||
irq > REMAP_BASE + IRTE_COUNT;
return irq <= Board::ISA_IRQ_END || irq > IRTE_COUNT;
}
public:
@ -104,6 +103,8 @@ class Genode::Ioapic : public Mmio
/* Set/unset mask bit of IRTE for given vector */
void toggle_mask(unsigned const vector, bool const set)
{
const unsigned irq = vector - REMAP_BASE;
/*
* Only mask existing RTEs and do *not* mask edge-triggered
* interrupts to avoid losing them while masked, see Intel
@ -112,9 +113,9 @@ class Genode::Ioapic : public Mmio
* flag and edge-triggered interrupts or:
* http://yarchive.net/comp/linux/edge_triggered_interrupts.html
*/
if (_edge_triggered(vector) && set) { return; }
if (_edge_triggered(irq) && set) { return; }
write<Ioregsel>(IOREDTBL + (2 * (vector - REMAP_BASE)));
write<Ioregsel>(IOREDTBL + (2 * irq));
Irte::access_t irte = read<Iowin>();
Irte::Mask::set(irte, set);
write<Iowin>(irte);