[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/14] aer: impove pcie_aer_init to support vfio devi
From: |
Alex Williamson |
Subject: |
[Qemu-devel] [PULL 03/14] aer: impove pcie_aer_init to support vfio device |
Date: |
Fri, 19 Feb 2016 10:39:49 -0700 |
User-agent: |
StGit/0.17.1-dirty |
From: Chen Fan <address@hidden>
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: Chen Fan <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>
---
hw/pci-bridge/ioh3420.c | 2 +-
hw/pci-bridge/xio3130_downstream.c | 2 +-
hw/pci-bridge/xio3130_upstream.c | 2 +-
hw/pci/pcie_aer.c | 4 ++--
include/hw/pci/pcie_aer.h | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c
index 9e048eb..0937fa3 100644
--- a/hw/pci-bridge/ioh3420.c
+++ b/hw/pci-bridge/ioh3420.c
@@ -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;
}
diff --git a/hw/pci-bridge/xio3130_downstream.c
b/hw/pci-bridge/xio3130_downstream.c
index c32f271..cf1ee63 100644
--- a/hw/pci-bridge/xio3130_downstream.c
+++ b/hw/pci-bridge/xio3130_downstream.c
@@ -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;
}
diff --git a/hw/pci-bridge/xio3130_upstream.c b/hw/pci-bridge/xio3130_upstream.c
index 19798c0..164ef58 100644
--- a/hw/pci-bridge/xio3130_upstream.c
+++ b/hw/pci-bridge/xio3130_upstream.c
@@ -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;
}
diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
index a9d9d06..8043020 100644
--- a/hw/pci/pcie_aer.c
+++ b/hw/pci/pcie_aer.c
@@ -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;
diff --git a/include/hw/pci/pcie_aer.h b/include/hw/pci/pcie_aer.h
index 2fb8388..156acb0 100644
--- a/include/hw/pci/pcie_aer.h
+++ b/include/hw/pci/pcie_aer.h
@@ -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);
- [Qemu-devel] [PULL 00/14] VFIO updates 2016-02-19, Alex Williamson, 2016/02/19
- [Qemu-devel] [PULL 01/14] pcie: modify the capability size assert, Alex Williamson, 2016/02/19
- [Qemu-devel] [PULL 02/14] vfio: make the 4 bytes aligned for capability size, Alex Williamson, 2016/02/19
- [Qemu-devel] [PULL 03/14] aer: impove pcie_aer_init to support vfio device,
Alex Williamson <=
- [Qemu-devel] [PULL 04/14] pcie_aer: expose pcie_aer_msg() interface, Alex Williamson, 2016/02/19
- [Qemu-devel] [PULL 05/14] vfio/pci: replace 1 with PCI_CAP_LIST_NEXT to make code self-explain, Alex Williamson, 2016/02/19
- [Qemu-devel] [PULL 06/14] hw/vfio/platform: amd-xgbe device, Alex Williamson, 2016/02/19
- [Qemu-devel] [PULL 07/14] device_tree: introduce load_device_tree_from_sysfs, Alex Williamson, 2016/02/19
- [Qemu-devel] [PULL 08/14] device_tree: introduce qemu_fdt_node_path, Alex Williamson, 2016/02/19
- [Qemu-devel] [PULL 09/14] device_tree: qemu_fdt_getprop converted to use the error API, Alex Williamson, 2016/02/19
- [Qemu-devel] [PULL 10/14] device_tree: qemu_fdt_getprop_cell converted to use the error API, Alex Williamson, 2016/02/19
- [Qemu-devel] [PULL 13/14] hw/arm/sysbus-fdt: remove qemu_fdt_setprop returned value check, Alex Williamson, 2016/02/19
- [Qemu-devel] [PULL 14/14] vfio/pci: use PCI_MSIX_FLAGS on retrieving the MSIX entries, Alex Williamson, 2016/02/19
- Re: [Qemu-devel] [PULL 00/14] VFIO updates 2016-02-19, Alex Williamson, 2016/02/19