diff options
| author | Hans Rosenfeld <hans.rosenfeld@nexenta.com> | 2016-12-20 15:48:51 +0100 |
|---|---|---|
| committer | Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org> | 2017-01-10 10:48:14 +0100 |
| commit | 9d08e1f8c231016dcfeb854acff457e0e54f179d (patch) | |
| tree | 543e386ba256749a6f33c43c2fdf267a794180c3 | |
| parent | 81293f932bdae6cf8a937185914925a57ec4ad7b (diff) | |
| download | illumos-joyent-9d08e1f8c231016dcfeb854acff457e0e54f179d.tar.gz | |
7723 disable MSI-X in nvme on VMware
Reviewed by: Rick McNeal <rick.mcneal@nexenta.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Dan McDonald <danmcd@omniti.com>
| -rw-r--r-- | usr/src/uts/common/io/nvme/nvme.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/usr/src/uts/common/io/nvme/nvme.c b/usr/src/uts/common/io/nvme/nvme.c index 3fad056534..8258d7964b 100644 --- a/usr/src/uts/common/io/nvme/nvme.c +++ b/usr/src/uts/common/io/nvme/nvme.c @@ -197,6 +197,10 @@ #include <sys/archsystm.h> #include <sys/sata/sata_hba.h> +#ifdef __x86 +#include <sys/x86_archext.h> +#endif + #include "nvme_reg.h" #include "nvme_var.h" @@ -2409,6 +2413,10 @@ nvme_setup_interrupts(nvme_t *nvme, int intr_type, int nqpairs) __func__); return (ret); } +#ifdef __x86 + if (get_hwenv() == HW_VMWARE) + nvme->n_intr_types &= ~DDI_INTR_TYPE_MSIX; +#endif } if ((nvme->n_intr_types & intr_type) == 0) |