From: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
To: qemu-devel@nongnu.org
Cc: izumi.taku@jp.fujitsu.com, alex.williamson@redhat.com
Subject: [Qemu-devel] [RFC v9 06/18] aer: impove pcie_aer_init to support vfio device
Date: Tue, 9 Jun 2015 11:37:34 +0800 [thread overview]
Message-ID: <ed1391f85bd5e7033320246c79d543ac1648947c.1433812962.git.chen.fan.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <cover.1433812962.git.chen.fan.fnst@cn.fujitsu.com>
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 <chen.fan.fnst@cn.fujitsu.com>
---
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 cce2fdd..4d9cd3f 100644
--- a/hw/pci-bridge/ioh3420.c
+++ b/hw/pci-bridge/ioh3420.c
@@ -129,7 +129,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 b3a6479..9737041 100644
--- a/hw/pci-bridge/xio3130_downstream.c
+++ b/hw/pci-bridge/xio3130_downstream.c
@@ -92,7 +92,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 eada582..4d7f894 100644
--- a/hw/pci-bridge/xio3130_upstream.c
+++ b/hw/pci-bridge/xio3130_upstream.c
@@ -81,7 +81,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 c8dea8e..6171a29 100644
--- a/hw/pci/pcie_aer.c
+++ b/hw/pci/pcie_aer.c
@@ -94,12 +94,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);
--
1.9.3
next prev parent reply other threads:[~2015-06-09 3:41 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-09 3:37 [Qemu-devel] [RFC v9 00/18] vfio-pci: pass the aer error to guest Chen Fan
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 01/18] vfio: extract vfio_get_hot_reset_info as a single function Chen Fan
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 02/18] vfio: squeeze out vfio_pci_do_hot_reset for support bus reset Chen Fan
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 03/18] pcie: modify the capability size assert Chen Fan
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 04/18] vfio: make the 4 bytes aligned for capability size Chen Fan
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 05/18] vfio: add pcie extanded capability support Chen Fan
2015-06-09 21:22 ` Alex Williamson
2015-06-09 3:37 ` Chen Fan [this message]
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 07/18] vfio: add aer support for vfio device Chen Fan
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 08/18] vfio: improve vfio_get_group to support adding group without devices Chen Fan
2015-06-09 21:23 ` Alex Williamson
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 09/18] vfio: add ref for group to support own affected groups Chen Fan
2015-06-09 21:23 ` Alex Williamson
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 10/18] get all affected groups for each device support aer Chen Fan
2015-06-09 21:22 ` Alex Williamson
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 11/18] vfio: add check host bus reset is support or not Chen Fan
2015-06-09 21:23 ` Alex Williamson
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 12/18] pci: add bus reset_notifiers callbacks for host bus reset Chen Fan
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 13/18] vfio: add sec_bus_reset notifier to notify physical bus reset is needed Chen Fan
2015-06-09 21:23 ` Alex Williamson
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 14/18] vfio: improve vfio_pci_hot_reset to support more case Chen Fan
2015-06-09 21:24 ` Alex Williamson
2015-06-16 8:10 ` Chen Fan
2015-06-16 14:08 ` Alex Williamson
2015-06-17 6:28 ` Chen Fan
2015-06-17 15:23 ` Alex Williamson
2015-06-18 10:27 ` Chen Fan
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 15/18] vfio: do hot bus reset when do virtual secondary bus reset Chen Fan
2015-06-09 21:23 ` Alex Williamson
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 16/18] pcie_aer: expose pcie_aer_msg() interface Chen Fan
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 17/18] vfio-pci: pass the aer error to guest Chen Fan
2015-06-09 3:37 ` [Qemu-devel] [RFC v9 18/18] vfio: add 'aer' property to expose aercap Chen Fan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ed1391f85bd5e7033320246c79d543ac1648947c.1433812962.git.chen.fan.fnst@cn.fujitsu.com \
--to=chen.fan.fnst@cn.fujitsu.com \
--cc=alex.williamson@redhat.com \
--cc=izumi.taku@jp.fujitsu.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.