Commit 8d86ada2 authored by Chen Fan's avatar Chen Fan Committed by Alex Williamson
Browse files

aer: impove pcie_aer_init to support vfio device 



pcie_aer_init was used to emulate an aer capability for pcie device,
but for vfio device, the aer config space size is mutable and is not
always equal to PCI_ERR_SIZEOF(0x48). it depends on where the TLP Prefix
register required, so here we add a size argument.

Signed-off-by: default avatarChen Fan <chen.fan.fnst@cn.fujitsu.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent 88caf177

hw/pci-bridge/ioh3420.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static int ioh3420_initfn(PCIDevice *d) 
        goto err_pcie_cap;

    }

    pcie_cap_root_init(d);

    rc = pcie_aer_init(d, IOH_EP_AER_OFFSET);

    rc = pcie_aer_init(d, IOH_EP_AER_OFFSET, PCI_ERR_SIZEOF);

    if (rc < 0) {

        goto err;

    }

hw/pci-bridge/xio3130_downstream.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static int xio3130_downstream_initfn(PCIDevice *d) 
        goto err_pcie_cap;

    }

    pcie_cap_arifwd_init(d);

    rc = pcie_aer_init(d, XIO3130_AER_OFFSET);

    rc = pcie_aer_init(d, XIO3130_AER_OFFSET, PCI_ERR_SIZEOF);

    if (rc < 0) {

        goto err;

    }

hw/pci-bridge/xio3130_upstream.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static int xio3130_upstream_initfn(PCIDevice *d) 
    }

    pcie_cap_flr_init(d);

    pcie_cap_deverr_init(d);

    rc = pcie_aer_init(d, XIO3130_AER_OFFSET);

    rc = pcie_aer_init(d, XIO3130_AER_OFFSET, PCI_ERR_SIZEOF);

    if (rc < 0) {

        goto err;

    }

hw/pci/pcie_aer.c

+2 −2
Original line number Diff line number Diff line
@@ -95,12 +95,12 @@ static void aer_log_clear_all_err(PCIEAERLog *aer_log) 
    aer_log->log_num = 0;

}



int pcie_aer_init(PCIDevice *dev, uint16_t offset)

int pcie_aer_init(PCIDevice *dev, uint16_t offset, uint16_t size)

{

    PCIExpressDevice *exp;



    pcie_add_capability(dev, PCI_EXT_CAP_ID_ERR, PCI_ERR_VER,

                        offset, PCI_ERR_SIZEOF);

                        offset, size);

    exp = &dev->exp;

    exp->aer_cap = offset;

include/hw/pci/pcie_aer.h

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ struct PCIEAERErr { 


extern const VMStateDescription vmstate_pcie_aer_log;



int pcie_aer_init(PCIDevice *dev, uint16_t offset);

int pcie_aer_init(PCIDevice *dev, uint16_t offset, uint16_t size);

void pcie_aer_exit(PCIDevice *dev);

void pcie_aer_write_config(PCIDevice *dev,

                           uint32_t addr, uint32_t val, int len);