Commit d7efb7e0 authored by Knut Omang's avatar Knut Omang Committed by Michael S. Tsirkin
Browse files

pci: avoid losing config updates to MSI/MSIX cap regs 



Since
commit 95d65800
    msi: Invoke msi/msix_write_config from PCI core
msix config writes are lost, the value written is always 0.

Fix pci_default_write_config to avoid this.

Cc: qemu-stable@nongnu.org
Signed-off-by: default avatarKnut Omang <knut.omang@oracle.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 0187c798

hw/pci/pci.c

+4 −3
Original line number Diff line number Diff line
@@ -1146,9 +1146,10 @@ uint32_t pci_default_read_config(PCIDevice *d, 
    return le32_to_cpu(val);

}



void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l)

void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val_in, int l)

{

    int i, was_irq_disabled = pci_irq_disabled(d);

    uint32_t val = val_in;



    for (i = 0; i < l; val >>= 8, ++i) {

        uint8_t wmask = d->wmask[addr + i];
@@ -1170,8 +1171,8 @@ void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l) 
                                    & PCI_COMMAND_MASTER);

    }



    msi_write_config(d, addr, val, l);

    msix_write_config(d, addr, val, l);

    msi_write_config(d, addr, val_in, l);

    msix_write_config(d, addr, val_in, l);

}



/***********************************************************/