Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/x86/pci Disable MSI-X before writing the MSI-X table.



details:   https://anonhg.NetBSD.org/src/rev/5ff92fa870c7
branches:  trunk
changeset: 461009:5ff92fa870c7
user:      hikaru <hikaru%NetBSD.org@localhost>
date:      Wed Nov 13 02:54:59 2019 +0000

description:
Disable MSI-X before writing the MSI-X table.

That fixes MSI-X interrupt lost on VMware ESXi 6.7 PCI passthrough devices.

ok knakahara@

diffstat:

 sys/arch/x86/pci/msipic.c |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r c5979ade1829 -r 5ff92fa870c7 sys/arch/x86/pci/msipic.c
--- a/sys/arch/x86/pci/msipic.c Wed Nov 13 02:51:22 2019 +0000
+++ b/sys/arch/x86/pci/msipic.c Wed Nov 13 02:54:59 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msipic.c,v 1.18 2019/10/03 18:53:08 tnn Exp $  */
+/*     $NetBSD: msipic.c,v 1.19 2019/11/13 02:54:59 hikaru Exp $       */
 
 /*
  * Copyright (c) 2015 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msipic.c,v 1.18 2019/10/03 18:53:08 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msipic.c,v 1.19 2019/11/13 02:54:59 hikaru Exp $");
 
 #include "opt_intrdebug.h"
 
@@ -548,6 +548,11 @@
        err = pci_get_capability(pc, tag, PCI_CAP_MSIX, &off, NULL);
        KASSERT(err != 0);
 
+       /* Disable MSI-X before writing MSI-X table */
+       ctl = pci_conf_read(pc, tag, off + PCI_MSIX_CTL);
+       ctl &= ~PCI_MSIX_CTL_ENABLE;
+       pci_conf_write(pc, tag, off + PCI_MSIX_CTL, ctl);
+
        entry_base = PCI_MSIX_TABLE_ENTRY_SIZE * msix_vec;
 
        /*



Home | Main Index | Thread Index | Old Index