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 v10 07/19] vfio: add aer support for vfio device
Date: Tue, 16 Jun 2015 16:10:51 +0800 [thread overview]
Message-ID: <c7cd37b1f2881a7a8e9bf6e114f2b7588d365fd3.1434356309.git.chen.fan.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <cover.1434356309.git.chen.fan.fnst@cn.fujitsu.com>
Calling pcie_aer_init to initilize aer related registers for
vfio device, then reload physical related registers to expose
device capability.
Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
---
hw/vfio/pci.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 87 insertions(+), 2 deletions(-)
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index e2f6442..e1bbd03 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -32,6 +32,7 @@
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
#include "hw/pci/pci.h"
+#include "hw/pci/pci_bridge.h"
#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu/event_notifier.h"
@@ -160,6 +161,8 @@ typedef struct VFIOPCIDevice {
#define VFIO_FEATURE_ENABLE_VGA (1 << VFIO_FEATURE_ENABLE_VGA_BIT)
#define VFIO_FEATURE_ENABLE_REQ_BIT 1
#define VFIO_FEATURE_ENABLE_REQ (1 << VFIO_FEATURE_ENABLE_REQ_BIT)
+#define VFIO_FEATURE_ENABLE_AER_BIT 2
+#define VFIO_FEATURE_ENABLE_AER (1 << VFIO_FEATURE_ENABLE_AER_BIT)
int32_t bootindex;
uint8_t pm_cap;
bool has_vga;
@@ -2819,6 +2822,74 @@ static int vfio_add_std_cap(VFIOPCIDevice *vdev, uint8_t pos)
return 0;
}
+static int vfio_setup_aer(VFIOPCIDevice *vdev, uint8_t cap_ver,
+ int pos, uint16_t size)
+{
+ PCIDevice *pdev = &vdev->pdev;
+ uint8_t *exp_cap = pdev->config + pdev->exp.exp_cap;
+ PCIDevice *dev_iter;
+ uint8_t type;
+ uint32_t severity, errcap;
+ int ret;
+
+ if (!(vdev->features & VFIO_FEATURE_ENABLE_AER)) {
+ pcie_add_capability(pdev, PCI_EXT_CAP_ID_ERR,
+ cap_ver, pos, size);
+ return 0;
+ }
+
+ dev_iter = pci_bridge_get_device(pdev->bus);
+ if (!dev_iter) {
+ goto error;
+ }
+
+ while (dev_iter) {
+ type = pcie_cap_get_type(dev_iter);
+ if ((type != PCI_EXP_TYPE_ROOT_PORT &&
+ type != PCI_EXP_TYPE_UPSTREAM &&
+ type != PCI_EXP_TYPE_DOWNSTREAM)) {
+ goto error;
+ }
+
+ if (!dev_iter->exp.aer_cap) {
+ goto error;
+ }
+
+ dev_iter = pci_bridge_get_device(dev_iter->bus);
+ }
+
+ errcap = vfio_pci_read_config(pdev, pdev->exp.aer_cap + PCI_ERR_CAP, 4);
+ /*
+ * The ability to record multiple headers is depending on
+ * the state of the Multiple Header Recording Capable bit and
+ * enabled by the Multiple Header Recording Enable bit.
+ */
+ if ((errcap & PCI_ERR_CAP_MHRC) &&
+ (errcap & PCI_ERR_CAP_MHRE)) {
+ pdev->exp.aer_log.log_max = PCIE_AER_LOG_MAX_DEFAULT;
+ } else {
+ pdev->exp.aer_log.log_max = 0;
+ }
+
+ pcie_cap_deverr_init(pdev);
+ ret = pcie_aer_init(pdev, pos, size);
+ if (ret) {
+ return ret;
+ }
+
+ /* load physical registers */
+ severity = vfio_pci_read_config(pdev,
+ pdev->exp.aer_cap + PCI_ERR_UNCOR_SEVER, 4);
+ pci_long_test_and_clear_mask(exp_cap + PCI_ERR_UNCOR_SEVER, ~severity);
+
+ return 0;
+
+error:
+ error_report("vfio: Unable to enable AER for device %s, parent bus "
+ "does not support AER signaling", vdev->vbasedev.name);
+ return -1;
+}
+
static int vfio_add_ext_cap(VFIOPCIDevice *vdev)
{
PCIDevice *pdev = &vdev->pdev;
@@ -2826,6 +2897,7 @@ static int vfio_add_ext_cap(VFIOPCIDevice *vdev)
uint16_t cap_id, next, size;
uint8_t cap_ver;
uint8_t *config;
+ int ret = 0;
/*
* In order to avoid breaking config space, create a copy to
@@ -2847,7 +2919,19 @@ static int vfio_add_ext_cap(VFIOPCIDevice *vdev)
*/
size = vfio_ext_cap_max_size(config, next);
- pcie_add_capability(pdev, cap_id, cap_ver, next, size);
+ switch (cap_id) {
+ case PCI_EXT_CAP_ID_ERR:
+ ret = vfio_setup_aer(vdev, cap_ver, next, size);
+ break;
+ default:
+ pcie_add_capability(pdev, cap_id, cap_ver, next, size);
+ break;
+ }
+
+ if (ret) {
+ goto out;
+ }
+
if (next == PCI_CONFIG_SPACE_SIZE) {
/* Begin the rebuild, we should set the next offset zero. */
pci_set_long(pdev->config + next, PCI_EXT_CAP(cap_id, cap_ver, 0));
@@ -2857,8 +2941,9 @@ static int vfio_add_ext_cap(VFIOPCIDevice *vdev)
pci_set_long(vdev->emulated_config_bits + next, 0xffffffff);
}
+out:
g_free(config);
- return 0;
+ return ret;
}
static int vfio_add_capabilities(VFIOPCIDevice *vdev)
--
1.9.3
next prev parent reply other threads:[~2015-06-16 8:13 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-16 8:10 [Qemu-devel] [RFC v10 00/19] vfio-pci: pass the aer error to guest Chen Fan
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 01/19] vfio: extract vfio_get_hot_reset_info as a single function Chen Fan
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 02/19] vfio: squeeze out vfio_pci_do_hot_reset for support bus reset Chen Fan
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 03/19] pcie: modify the capability size assert Chen Fan
2015-06-17 9:43 ` Marcel Apfelbaum
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 04/19] vfio: make the 4 bytes aligned for capability size Chen Fan
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 05/19] vfio: add pcie extanded capability support Chen Fan
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 06/19] aer: impove pcie_aer_init to support vfio device Chen Fan
2015-06-16 8:10 ` Chen Fan [this message]
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 08/19] vfio: add ref for group to support own affected groups Chen Fan
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 09/19] vfio: extract vfio_register_container_listener from vfio_connect_container Chen Fan
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 10/19] vfio: improve vfio_get_group to support adding as is NULL Chen Fan
2015-06-18 16:41 ` Alex Williamson
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 11/19] get all affected groups for each device support aer Chen Fan
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 12/19] vfio: add check host bus reset is support or not Chen Fan
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 13/19] pci: add bus reset_notifiers callbacks for host bus reset Chen Fan
2015-06-16 10:20 ` Michael S. Tsirkin
2015-06-17 1:41 ` Chen Fan
2015-06-17 6:47 ` Michael S. Tsirkin
2015-06-17 15:19 ` Alex Williamson
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 14/19] vfio: add sec_bus_reset notifier to notify physical bus reset is needed Chen Fan
2015-06-16 8:10 ` [Qemu-devel] [RFC v10 15/19] vfio: improve vfio_pci_hot_reset to support more case Chen Fan
2015-06-16 8:11 ` [Qemu-devel] [RFC v10 16/19] vfio: do hot bus reset when do virtual secondary bus reset Chen Fan
2015-06-16 8:11 ` [Qemu-devel] [RFC v10 17/19] pcie_aer: expose pcie_aer_msg() interface Chen Fan
2015-06-17 9:46 ` Marcel Apfelbaum
2015-06-16 8:11 ` [Qemu-devel] [RFC v10 18/19] vfio-pci: pass the aer error to guest Chen Fan
2015-06-16 8:11 ` [Qemu-devel] [RFC v10 19/19] 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=c7cd37b1f2881a7a8e9bf6e114f2b7588d365fd3.1434356309.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.