jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-27 17:52:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

nvme: Use the NVMEF macro to construct fields

Browse Source 
Reviewed by:	chuck, imp
Sponsored by:	Chelsio Communications
Differential Revision:	https://reviews.freebsd.org/D43605
This commit is contained in:
John Baldwin 2024-01-29 11:01:13 -08:00
parent 3a477a9b70
commit 5650bd3fe8
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/dev/nvme/nvme_ctrlr.c
View File

@ -344,25 +344,25 @@ nvme_ctrlr_enable(struct nvme_controller *ctrlr)
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 @@ nvme_ctrlr_shutdown(struct nvme_controller *ctrlr)
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 :

3
sys/dev/nvme/nvme_ns.c
View File

@ -286,7 +286,8 @@ nvme_bio_child_inbed(struct bio *parent, int bio_error)
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);
}

10
sys/dev/nvme/nvme_qpair.c
View File

@ -493,9 +493,9 @@ nvme_qpair_manual_complete_tracker(
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 @@ nvme_qpair_manual_complete_request(struct nvme_qpair *qpair,
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);