Commit 181faf30 authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk Committed by Luis Henriques

xen/pciback: Save the number of MSI-X entries to be copied later.

commit d159457b upstream.

Commit 8135cf8b (xen/pciback: Save
xen_pci_op commands before processing it) broke enabling MSI-X because
it would never copy the resulting vectors into the response.  The
number of vectors requested was being overwritten by the return value
(typically zero for success).

Save the number of vectors before processing the op, so the correct
number of vectors are copied afterwards.
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: default avatarJan Beulich <jbeulich@suse.com>
Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 52543395
...@@ -333,6 +333,9 @@ void xen_pcibk_do_op(struct work_struct *data) ...@@ -333,6 +333,9 @@ void xen_pcibk_do_op(struct work_struct *data)
struct xen_pcibk_dev_data *dev_data = NULL; struct xen_pcibk_dev_data *dev_data = NULL;
struct xen_pci_op *op = &pdev->op; struct xen_pci_op *op = &pdev->op;
int test_intx = 0; int test_intx = 0;
#ifdef CONFIG_PCI_MSI
unsigned int nr = 0;
#endif
*op = pdev->sh_info->op; *op = pdev->sh_info->op;
barrier(); barrier();
...@@ -361,6 +364,7 @@ void xen_pcibk_do_op(struct work_struct *data) ...@@ -361,6 +364,7 @@ void xen_pcibk_do_op(struct work_struct *data)
op->err = xen_pcibk_disable_msi(pdev, dev, op); op->err = xen_pcibk_disable_msi(pdev, dev, op);
break; break;
case XEN_PCI_OP_enable_msix: case XEN_PCI_OP_enable_msix:
nr = op->value;
op->err = xen_pcibk_enable_msix(pdev, dev, op); op->err = xen_pcibk_enable_msix(pdev, dev, op);
break; break;
case XEN_PCI_OP_disable_msix: case XEN_PCI_OP_disable_msix:
...@@ -383,7 +387,7 @@ void xen_pcibk_do_op(struct work_struct *data) ...@@ -383,7 +387,7 @@ void xen_pcibk_do_op(struct work_struct *data)
if (op->cmd == XEN_PCI_OP_enable_msix && op->err == 0) { if (op->cmd == XEN_PCI_OP_enable_msix && op->err == 0) {
unsigned int i; unsigned int i;
for (i = 0; i < op->value; i++) for (i = 0; i < nr; i++)
pdev->sh_info->op.msix_entries[i].vector = pdev->sh_info->op.msix_entries[i].vector =
op->msix_entries[i].vector; op->msix_entries[i].vector;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment