Commit b8676728 authored by Alexander Graf's avatar Alexander Graf Committed by Kevin Wolf
Browse files

AHCI: Masking of IRQs actually masks them 



When masking IRQ lines, we should actually mask them out and not declare
them active anymore. Once we mask them in again, they are allowed to trigger
again.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 6d1acda8

hw/ide/ahci.c

+2 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ static void ahci_check_irq(AHCIState *s) 


    DPRINTF(-1, "check irq %#x\n", s->control_regs.irqstatus);



    s->control_regs.irqstatus = 0;

    for (i = 0; i < s->ports; i++) {

        AHCIPortRegs *pr = &s->dev[i].port_regs;

        if (pr->irq_stat & pr->irq_mask) {
@@ -216,6 +217,7 @@ static void ahci_port_write(AHCIState *s, int port, int offset, uint32_t val) 
            break;

        case PORT_IRQ_STAT:

            pr->irq_stat &= ~val;

            ahci_check_irq(s);

            break;

        case PORT_IRQ_MASK:

            pr->irq_mask = val & 0xfdc000ff;