diff options
| author | jimharris <jimharris@FreeBSD.org> | 2014-05-07 17:20:15 +0000 |
|---|---|---|
| committer | jimharris <jimharris@FreeBSD.org> | 2014-05-07 17:20:15 +0000 |
| commit | e6ff98d4361d5f9057e3b87fa8bc17b67589cb2a (patch) | |
| tree | f283870366c0a7896a44d0528f55739ad03a5059 /sys/dev/nvme/nvme_qpair.c | |
| parent | a9f66916988fc93f3b468135d6fbe27401de0b6f (diff) | |
| download | FreeBSD-src-e6ff98d4361d5f9057e3b87fa8bc17b67589cb2a.zip FreeBSD-src-e6ff98d4361d5f9057e3b87fa8bc17b67589cb2a.tar.gz | |
MFC r263311:
nvme: Allocate all MSI resources up front so that we can fall back to
INTx if necessary.
Diffstat (limited to 'sys/dev/nvme/nvme_qpair.c')
| -rw-r--r-- | sys/dev/nvme/nvme_qpair.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index 1ca78cf..e54adf7 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -1,5 +1,5 @@ /*- - * Copyright (C) 2012-2013 Intel Corporation + * Copyright (C) 2012-2014 Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -487,9 +487,7 @@ nvme_qpair_construct(struct nvme_qpair *qpair, uint32_t id, * the queue's vector to get the corresponding rid to use. */ qpair->rid = vector + 1; - - qpair->res = bus_alloc_resource_any(ctrlr->dev, SYS_RES_IRQ, - &qpair->rid, RF_ACTIVE); + qpair->res = ctrlr->msi_res[vector]; bus_setup_intr(ctrlr->dev, qpair->res, INTR_TYPE_MISC | INTR_MPSAFE, NULL, |
