D43602.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D43602.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
	@@ -295,7 +295,7 @@
	return (err);
	}

	- cc &= ~NVME_CC_REG_EN_MASK;
	+ cc &= ~NVMEM(NVME_CC_REG_EN);
	nvme_mmio_write_4(ctrlr, cc, cc);

	/*
	@@ -1215,7 +1215,7 @@
	pt->cpl.cdw0 = cpl->cdw0;

	status = cpl->status;
	- status &= ~NVME_STATUS_P_MASK;
	+ status &= ~NVMEM(NVME_STATUS_P);
	pt->cpl.status = status;

	mtx_lock(mtx);
	@@ -1556,7 +1556,7 @@
	int timeout;

	cc = nvme_mmio_read_4(ctrlr, cc);
	- cc &= ~(NVME_CC_REG_SHN_MASK << NVME_CC_REG_SHN_SHIFT);
	+ cc &= ~NVMEM(NVME_CC_REG_SHN);
	cc \|= NVME_SHN_NORMAL << NVME_CC_REG_SHN_SHIFT;
	nvme_mmio_write_4(ctrlr, cc, cc);

	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
	@@ -285,7 +285,7 @@
	if (inbed == children) {
	bzero(&parent_cpl, sizeof(parent_cpl));
	if (parent->bio_flags & BIO_ERROR) {
	- parent_cpl.status &= ~(NVME_STATUS_SC_MASK << NVME_STATUS_SC_SHIFT);
	+ parent_cpl.status &= ~NVMEM(NVME_STATUS_SC);
	parent_cpl.status \|= (NVME_SC_DATA_TRANSFER_ERROR) << NVME_STATUS_SC_SHIFT;
	}
	nvme_ns_bio_done(parent, &parent_cpl);