i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sdhci: silently handle empty interrupts

Browse Source 
On my system the interrupt line is shared with the PS/2 controller, so
there are a lot of unhandled interrupts. Just silently ignore them.

Change-Id: Ia6812a5a1d78907622ddebbd03165ed016e26e26
Reviewed-on: https://review.haiku-os.org/c/1031
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Adrien Destugues
2019-02-11 21:36:25 +00:00
committed by waddlesplash
parent 3aef22f7c8
commit 601c0fcae2
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/mmc/sdhci_pci.cpp
+10 -10
View File
@@ -327,22 +327,18 @@ sdhci_error_interrupt_recovery(struct registers* _regs)
int32
sdhci_generic_interrupt(void* data)
{
TRACE("interrupt function called\n");
sdhci_pci_mmc_bus_info* bus = (sdhci_pci_mmc_bus_info*)data;
uint32_t intmask, card_present;
intmask = bus->fRegisters->slot_interrupt_status;
uint32_t intmask = bus->fRegisters->slot_interrupt_status;
if ((intmask == 0) || (intmask == 0xffffffff)) {
TRACE("invalid command interrupt\n");
return B_UNHANDLED_INTERRUPT;
}
TRACE("interrupt function called\n");
// handling card presence interrupt
if (intmask & (SDHCI_INT_CARD_INS | SDHCI_INT_CARD_REM)) {
card_present = ((intmask & SDHCI_INT_CARD_INS) != 0);
uint32_t card_present = ((intmask & SDHCI_INT_CARD_INS) != 0);
bus->fRegisters->interrupt_status_enable &= ~(SDHCI_INT_CARD_INS
| SDHCI_INT_CARD_REM);
bus->fRegisters->interrupt_signal_enable &= ~(SDHCI_INT_CARD_INS
@@ -377,8 +373,12 @@ sdhci_generic_interrupt(void* data)
return B_HANDLED_INTERRUPT;
}
intmask &= ~(SDHCI_INT_BUS_POWER | SDHCI_INT_CARD_INS
| SDHCI_INT_CARD_REM | SDHCI_INT_CMD_MASK);
intmask = bus->fRegisters->slot_interrupt_status;
if (intmask != 0) {
ERROR("Remaining interrupts at end of handler: %x\n", intmask);
intmask &= ~(SDHCI_INT_BUS_POWER | SDHCI_INT_CARD_INS
| SDHCI_INT_CARD_REM | SDHCI_INT_CMD_MASK);
}
return B_UNHANDLED_INTERRUPT;
}