[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v5 3/7] vfio: add aer support for vfio device
From: |
Alex Williamson |
Subject: |
Re: [Qemu-devel] [PATCH v5 3/7] vfio: add aer support for vfio device |
Date: |
Fri, 13 Mar 2015 16:28:44 -0600 |
On Thu, 2015-03-12 at 18:23 +0800, Chen Fan wrote:
> 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 <address@hidden>
> ---
> hw/vfio/pci.c | 45 ++++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 44 insertions(+), 1 deletion(-)
>
> diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
> index 2190102..0a515b6 100644
> --- a/hw/vfio/pci.c
> +++ b/hw/vfio/pci.c
> @@ -2724,12 +2724,43 @@ static int vfio_add_std_cap(VFIOPCIDevice *vdev,
> uint8_t pos)
> return 0;
> }
>
> +static int vfio_setup_aer(VFIOPCIDevice *vdev, int pos, uint16_t size)
> +{
> + PCIDevice *pdev = &vdev->pdev;
> + uint8_t *exp_cap = pdev->config + pdev->exp.exp_cap;
> + uint32_t severity, errcap;
> + int ret;
> +
> + 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 */
Please follow the existing comment style in this file
> + 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;
> + }
> + 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;
> +}
> +
> static int vfio_add_ext_cap(VFIOPCIDevice *vdev, const uint8_t *config)
> {
> PCIDevice *pdev = &vdev->pdev;
> uint32_t header;
> uint16_t cap_id, next, size;
> uint8_t cap_ver;
> + int ret = 0;
>
> for (next = PCI_CONFIG_SPACE_SIZE; next;
> next = PCI_EXT_CAP_NEXT(pci_get_long(config + next))) {
> @@ -2745,7 +2776,19 @@ static int vfio_add_ext_cap(VFIOPCIDevice *vdev, const
> uint8_t *config)
> */
> 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, next, size);
> + break;
> + default:
> + pcie_add_capability(pdev, cap_id, cap_ver, next, size);
> + break;
> + }
> +
> + if (ret) {
> + return ret;
> + }
> +
> 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));
- Re: [Qemu-devel] [PATCH v5 5/7] vfio-pci: pass the aer error to guest, (continued)
[Qemu-devel] [PATCH v5 1/7] vfio: add pcie extanded capability support, Chen Fan, 2015/03/12
[Qemu-devel] [PATCH v5 4/7] pcie_aer: expose pcie_aer_msg() interface, Chen Fan, 2015/03/12
[Qemu-devel] [PATCH v5 2/7] aer: impove pcie_aer_init to support vfio device, Chen Fan, 2015/03/12
[Qemu-devel] [PATCH v5 3/7] vfio: add aer support for vfio device, Chen Fan, 2015/03/12
- Re: [Qemu-devel] [PATCH v5 3/7] vfio: add aer support for vfio device,
Alex Williamson <=
[Qemu-devel] [PATCH v5 6/7] vfio: add 'x-aer' property to expose aercap, Chen Fan, 2015/03/12
[Qemu-devel] [PATCH v5 7/7] pc: add PC_I440FX_COMPAT to disable aercap for vifo device, Chen Fan, 2015/03/12