View | Details | Raw Unified | Return to bug 217863 | Differences between
and this patch

Collapse All | Expand All

(-)a/drivers/nvme/host/core.c (-5 / +10 lines)
Lines 2255-2265 int nvme_enable_ctrl(struct nvme_ctrl *ctrl) Link Here
2255
			return ret;
2255
			return ret;
2256
		}
2256
		}
2257
2257
2258
		if (ctrl->cap & NVME_CAP_CRMS_CRIMS) {
2258
		if (crto == 0) {
2259
			ctrl->ctrl_config |= NVME_CC_CRIME;
2259
			timeout = NVME_CAP_TIMEOUT(ctrl->cap);
2260
			timeout = NVME_CRTO_CRIMT(crto);
2260
			dev_warn(ctrl->device, "Ignoring bogus CRTO (0), falling back to NVME_CAP_TIMEOUT (%u)\n",
2261
				timeout);
2261
		} else {
2262
		} else {
2262
			timeout = NVME_CRTO_CRWMT(crto);
2263
			if (ctrl->cap & NVME_CAP_CRMS_CRIMS) {
2264
				ctrl->ctrl_config |= NVME_CC_CRIME;
2265
				timeout = NVME_CRTO_CRIMT(crto);
2266
			} else {
2267
				timeout = NVME_CRTO_CRWMT(crto);
2268
			}
2263
		}
2269
		}
2264
	} else {
2270
	} else {
2265
		timeout = NVME_CAP_TIMEOUT(ctrl->cap);
2271
		timeout = NVME_CAP_TIMEOUT(ctrl->cap);
2266
- 

Return to bug 217863