mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 08:17:35 +00:00
Kernel/Interrupts: Return boolean on whether we handled the interrupt
If we are in a shared interrupt handler, the called handlers might indicate it was not their interrupt, so we should not increment the call counter of these handlers.
This commit is contained in:
parent
7a6d5a7b8b
commit
b91df26d4a
43 changed files with 125 additions and 71 deletions
|
@ -230,12 +230,15 @@ UNMAP_AFTER_INIT E1000NetworkAdapter::~E1000NetworkAdapter()
|
|||
{
|
||||
}
|
||||
|
||||
void E1000NetworkAdapter::handle_irq(const RegisterState&)
|
||||
bool E1000NetworkAdapter::handle_irq(const RegisterState&)
|
||||
{
|
||||
u32 status = in32(REG_INTERRUPT_CAUSE_READ);
|
||||
|
||||
m_entropy_source.add_random_event(status);
|
||||
|
||||
if (status == 0)
|
||||
return false;
|
||||
|
||||
if (status & INTERRUPT_LSC) {
|
||||
u32 flags = in32(REG_CTRL);
|
||||
out32(REG_CTRL, flags | ECTRL_SLU);
|
||||
|
@ -253,6 +256,7 @@ void E1000NetworkAdapter::handle_irq(const RegisterState&)
|
|||
m_wait_queue.wake_all();
|
||||
|
||||
out32(REG_INTERRUPT_CAUSE_READ, 0xffffffff);
|
||||
return true;
|
||||
}
|
||||
|
||||
UNMAP_AFTER_INIT void E1000NetworkAdapter::detect_eeprom()
|
||||
|
|
|
@ -36,7 +36,7 @@ protected:
|
|||
void setup_link();
|
||||
|
||||
E1000NetworkAdapter(PCI::Address, u8 irq);
|
||||
virtual void handle_irq(const RegisterState&) override;
|
||||
virtual bool handle_irq(const RegisterState&) override;
|
||||
virtual const char* class_name() const override { return "E1000NetworkAdapter"; }
|
||||
|
||||
struct [[gnu::packed]] e1000_rx_desc {
|
||||
|
|
|
@ -184,10 +184,13 @@ UNMAP_AFTER_INIT NE2000NetworkAdapter::~NE2000NetworkAdapter()
|
|||
{
|
||||
}
|
||||
|
||||
void NE2000NetworkAdapter::handle_irq(const RegisterState&)
|
||||
bool NE2000NetworkAdapter::handle_irq(const RegisterState&)
|
||||
{
|
||||
u8 status = in8(REG_RW_INTERRUPTSTATUS);
|
||||
dbgln_if(NE2000_DEBUG, "NE2000NetworkAdapter: Got interrupt, status={:#02x}", status);
|
||||
if (status == 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (status & BIT_INTERRUPTMASK_PRX) {
|
||||
dbgln_if(NE2000_DEBUG, "NE2000NetworkAdapter: Interrupt for packet received");
|
||||
|
@ -223,6 +226,7 @@ void NE2000NetworkAdapter::handle_irq(const RegisterState&)
|
|||
m_wait_queue.wake_all();
|
||||
|
||||
out8(REG_RW_INTERRUPTSTATUS, status);
|
||||
return true;
|
||||
}
|
||||
|
||||
UNMAP_AFTER_INIT int NE2000NetworkAdapter::ram_test()
|
||||
|
|
|
@ -29,7 +29,7 @@ public:
|
|||
|
||||
private:
|
||||
NE2000NetworkAdapter(PCI::Address, u8 irq);
|
||||
virtual void handle_irq(const RegisterState&) override;
|
||||
virtual bool handle_irq(const RegisterState&) override;
|
||||
virtual const char* class_name() const override { return "NE2000NetworkAdapter"; }
|
||||
|
||||
int ram_test();
|
||||
|
|
|
@ -155,8 +155,9 @@ UNMAP_AFTER_INIT RTL8139NetworkAdapter::~RTL8139NetworkAdapter()
|
|||
{
|
||||
}
|
||||
|
||||
void RTL8139NetworkAdapter::handle_irq(const RegisterState&)
|
||||
bool RTL8139NetworkAdapter::handle_irq(const RegisterState&)
|
||||
{
|
||||
bool was_handled = false;
|
||||
for (;;) {
|
||||
int status = in16(REG_ISR);
|
||||
out16(REG_ISR, status);
|
||||
|
@ -168,6 +169,7 @@ void RTL8139NetworkAdapter::handle_irq(const RegisterState&)
|
|||
if ((status & (INT_RXOK | INT_RXERR | INT_TXOK | INT_TXERR | INT_RX_BUFFER_OVERFLOW | INT_LINK_CHANGE | INT_RX_FIFO_OVERFLOW | INT_LENGTH_CHANGE | INT_SYSTEM_ERROR)) == 0)
|
||||
break;
|
||||
|
||||
was_handled = true;
|
||||
if (status & INT_RXOK) {
|
||||
dbgln_if(RTL8139_DEBUG, "RTL8139: RX ready");
|
||||
receive();
|
||||
|
@ -201,6 +203,7 @@ void RTL8139NetworkAdapter::handle_irq(const RegisterState&)
|
|||
reset();
|
||||
}
|
||||
}
|
||||
return was_handled;
|
||||
}
|
||||
|
||||
void RTL8139NetworkAdapter::reset()
|
||||
|
|
|
@ -31,7 +31,7 @@ public:
|
|||
|
||||
private:
|
||||
RTL8139NetworkAdapter(PCI::Address, u8 irq);
|
||||
virtual void handle_irq(const RegisterState&) override;
|
||||
virtual bool handle_irq(const RegisterState&) override;
|
||||
virtual const char* class_name() const override { return "RTL8139NetworkAdapter"; }
|
||||
|
||||
void reset();
|
||||
|
|
|
@ -1073,8 +1073,9 @@ UNMAP_AFTER_INIT RTL8168NetworkAdapter::~RTL8168NetworkAdapter()
|
|||
{
|
||||
}
|
||||
|
||||
void RTL8168NetworkAdapter::handle_irq(const RegisterState&)
|
||||
bool RTL8168NetworkAdapter::handle_irq(const RegisterState&)
|
||||
{
|
||||
bool was_handled = false;
|
||||
for (;;) {
|
||||
int status = in16(REG_ISR);
|
||||
out16(REG_ISR, status);
|
||||
|
@ -1086,6 +1087,7 @@ void RTL8168NetworkAdapter::handle_irq(const RegisterState&)
|
|||
if ((status & (INT_RXOK | INT_RXERR | INT_TXOK | INT_TXERR | INT_RX_OVERFLOW | INT_LINK_CHANGE | INT_RX_FIFO_OVERFLOW | INT_SYS_ERR)) == 0)
|
||||
break;
|
||||
|
||||
was_handled = true;
|
||||
if (status & INT_RXOK) {
|
||||
dbgln_if(RTL8168_DEBUG, "RTL8168: RX ready");
|
||||
receive();
|
||||
|
@ -1116,6 +1118,7 @@ void RTL8168NetworkAdapter::handle_irq(const RegisterState&)
|
|||
dmesgln("RTL8168: Fatal system error");
|
||||
}
|
||||
}
|
||||
return was_handled;
|
||||
}
|
||||
|
||||
void RTL8168NetworkAdapter::reset()
|
||||
|
|
|
@ -36,7 +36,7 @@ private:
|
|||
|
||||
RTL8168NetworkAdapter(PCI::Address, u8 irq);
|
||||
|
||||
virtual void handle_irq(const RegisterState&) override;
|
||||
virtual bool handle_irq(const RegisterState&) override;
|
||||
virtual const char* class_name() const override { return "RTL8168NetworkAdapter"; }
|
||||
|
||||
struct [[gnu::packed]] TXDescriptor {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue