Page MenuHomeFreeBSD
Files F142252402

D43605.diff
No OneTemporary
Actions

D43605.diff
View Options

diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c
--- a/sys/dev/nvme/nvme_ctrlr.c
+++ b/sys/dev/nvme/nvme_ctrlr.c
@@ -344,25 +344,25 @@
qsize = ctrlr->adminq.num_entries - 1;
aqa = 0;
- aqa = (qsize & NVME_AQA_REG_ACQS_MASK) << NVME_AQA_REG_ACQS_SHIFT;
- aqa |= (qsize & NVME_AQA_REG_ASQS_MASK) << NVME_AQA_REG_ASQS_SHIFT;
+ aqa |= NVMEF(NVME_AQA_REG_ACQS, qsize);
+ aqa |= NVMEF(NVME_AQA_REG_ASQS, qsize);
nvme_mmio_write_4(ctrlr, aqa, aqa);
/* Initialization values for CC */
cc = 0;
- cc |= 1 << NVME_CC_REG_EN_SHIFT;
- cc |= 0 << NVME_CC_REG_CSS_SHIFT;
- cc |= 0 << NVME_CC_REG_AMS_SHIFT;
- cc |= 0 << NVME_CC_REG_SHN_SHIFT;
- cc |= 6 << NVME_CC_REG_IOSQES_SHIFT; /* SQ entry size == 64 == 2^6 */
- cc |= 4 << NVME_CC_REG_IOCQES_SHIFT; /* CQ entry size == 16 == 2^4 */
+ cc |= NVMEF(NVME_CC_REG_EN, 1);
+ cc |= NVMEF(NVME_CC_REG_CSS, 0);
+ cc |= NVMEF(NVME_CC_REG_AMS, 0);
+ cc |= NVMEF(NVME_CC_REG_SHN, 0);
+ cc |= NVMEF(NVME_CC_REG_IOSQES, 6); /* SQ entry size == 64 == 2^6 */
+ cc |= NVMEF(NVME_CC_REG_IOCQES, 4); /* CQ entry size == 16 == 2^4 */
/*
* Use the Memory Page Size selected during device initialization. Note
* that value stored in mps is suitable to use here without adjusting by
* NVME_MPS_SHIFT.
*/
- cc |= ctrlr->mps << NVME_CC_REG_MPS_SHIFT;
+ cc |= NVMEF(NVME_CC_REG_MPS, ctrlr->mps);
nvme_ctrlr_barrier(ctrlr, BUS_SPACE_BARRIER_WRITE);
nvme_mmio_write_4(ctrlr, cc, cc);
@@ -1557,7 +1557,7 @@
cc = nvme_mmio_read_4(ctrlr, cc);
cc &= ~NVMEM(NVME_CC_REG_SHN);
- cc |= NVME_SHN_NORMAL << NVME_CC_REG_SHN_SHIFT;
+ cc |= NVMEF(NVME_CC_REG_SHN, NVME_SHN_NORMAL);
nvme_mmio_write_4(ctrlr, cc, cc);
timeout = ticks + (ctrlr->cdata.rtd3e == 0 ? 5 * hz :
diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c
--- a/sys/dev/nvme/nvme_ns.c
+++ b/sys/dev/nvme/nvme_ns.c
@@ -286,7 +286,8 @@
bzero(&parent_cpl, sizeof(parent_cpl));
if (parent->bio_flags & BIO_ERROR) {
parent_cpl.status &= ~NVMEM(NVME_STATUS_SC);
- parent_cpl.status |= (NVME_SC_DATA_TRANSFER_ERROR) << NVME_STATUS_SC_SHIFT;
+ parent_cpl.status |= NVMEF(NVME_STATUS_SC,
+ NVME_SC_DATA_TRANSFER_ERROR);
}
nvme_ns_bio_done(parent, &parent_cpl);
}
diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c
--- a/sys/dev/nvme/nvme_qpair.c
+++ b/sys/dev/nvme/nvme_qpair.c
@@ -493,9 +493,9 @@
cpl.sqid = qpair->id;
cpl.cid = tr->cid;
- cpl.status |= (sct & NVME_STATUS_SCT_MASK) << NVME_STATUS_SCT_SHIFT;
- cpl.status |= (sc & NVME_STATUS_SC_MASK) << NVME_STATUS_SC_SHIFT;
- cpl.status |= (dnr & NVME_STATUS_DNR_MASK) << NVME_STATUS_DNR_SHIFT;
+ cpl.status |= NVMEF(NVME_STATUS_SCT, sct);
+ cpl.status |= NVMEF(NVME_STATUS_SC, sc);
+ cpl.status |= NVMEF(NVME_STATUS_DNR, dnr);
/* M=0 : this is artificial so no data in error log page */
/* CRD=0 : this is artificial and no delayed retry support anyway */
/* P=0 : phase not checked */
@@ -511,8 +511,8 @@
memset(&cpl, 0, sizeof(cpl));
cpl.sqid = qpair->id;
- cpl.status |= (sct & NVME_STATUS_SCT_MASK) << NVME_STATUS_SCT_SHIFT;
- cpl.status |= (sc & NVME_STATUS_SC_MASK) << NVME_STATUS_SC_SHIFT;
+ cpl.status |= NVMEF(NVME_STATUS_SCT, sct);
+ cpl.status |= NVMEF(NVME_STATUS_SC, sc);
error = nvme_completion_is_error(&cpl);

File Metadata

Mime Type
text/plain
Expires
Sun, Jan 18, 8:07 PM (14 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27706579
Default Alt Text
D43605.diff (3 KB)

Event Timeline