From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E84520B203; Wed, 23 Oct 2024 14:32:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729693933; cv=none; b=Bi92F3IUgzaZi+s4nSvMTd1PxhvN14jn9M/UYfoGmO62E0bDaGc8SzAePBmzV+fVkI7S1ZMdbVSCyRk4yjx4WSd5ly/1ZolZIVv9RasEdVhTLQTq09LS3cYjnDAijpPCp12uaFs4P5cKVZVSnizd3sB6H0vJrmQK04HIc/rRztE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729693933; c=relaxed/simple; bh=dNvjYXQ1uETg4goYAoDXVhbZdnJoONpUIibtngoe230=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=i467Ujyz9hEvX6wHr3sJie4rQiVNB2aCUQmx1h0msk/2gLo7IYJRfALfFcm8UEurB+6f+2YKKaDPBlDIJDo8oIOTvWYWIMDjALENcZZUuS2HHuGxooJHStDuRK0xgC1DZbIQPk8lvGc4V2GR3KG7MDW/PLf80SNlhL+KndiRiX0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=U3ampTQd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="U3ampTQd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 35FC3C4CEE5; Wed, 23 Oct 2024 14:32:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729693933; bh=dNvjYXQ1uETg4goYAoDXVhbZdnJoONpUIibtngoe230=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U3ampTQddSZkF1zcZeu9CCn9I6RCG6SPYHSBH4n8Ioq8Rzj4HfyGzMYu2VuckXhrK M9FUH2sWsfeKKX0ehtfxvgdiMt2YwEM8OIW06szUwMO57g7NlQxxxCLYIr5MB3mleT 4ds5pb9nfhPWJOr2FYJTy8p+J1GFu74nCR54xMfm19hl6ZjX+jEVVS7S7l/L20aW2e L3t/84gZ9Cc9rlA6xbTG7GD5X4hj3WPzB1gpl8NMn69PtEFUG18LBqlBXR0hhmwX3h 2X8nuN9zI0oClcYI3NViJ6Q3C9mOGAqFcB2DmhGjZVzGmbU/vnhGSjPch609rv/725 cTP3RNBExIFcw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Joyce , Nilay Shroff , Keith Busch , Sasha Levin , sagi@grimberg.me, linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 6.1 07/17] nvme: disable CC.CRIME (NVME_CC_CRIME) Date: Wed, 23 Oct 2024 10:31:46 -0400 Message-ID: <20241023143202.2981992-7-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241023143202.2981992-1-sashal@kernel.org> References: <20241023143202.2981992-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.114 Content-Transfer-Encoding: 8bit From: Greg Joyce [ Upstream commit 0ce96a6708f34280a536263ee5c67e20c433dcce ] Disable NVME_CC_CRIME so that CSTS.RDY indicates that the media is ready and able to handle commands without returning NVME_SC_ADMIN_COMMAND_MEDIA_NOT_READY. Signed-off-by: Greg Joyce Reviewed-by: Nilay Shroff Tested-by: Nilay Shroff Signed-off-by: Keith Busch Signed-off-by: Sasha Levin --- drivers/nvme/host/core.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 0729ab5430725..dc25d91891327 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2394,8 +2394,13 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl) else ctrl->ctrl_config = NVME_CC_CSS_NVM; - if (ctrl->cap & NVME_CAP_CRMS_CRWMS && ctrl->cap & NVME_CAP_CRMS_CRIMS) - ctrl->ctrl_config |= NVME_CC_CRIME; + /* + * Setting CRIME results in CSTS.RDY before the media is ready. This + * makes it possible for media related commands to return the error + * NVME_SC_ADMIN_COMMAND_MEDIA_NOT_READY. Until the driver is + * restructured to handle retries, disable CC.CRIME. + */ + ctrl->ctrl_config &= ~NVME_CC_CRIME; ctrl->ctrl_config |= (NVME_CTRL_PAGE_SHIFT - 12) << NVME_CC_MPS_SHIFT; ctrl->ctrl_config |= NVME_CC_AMS_RR | NVME_CC_SHN_NONE; @@ -2430,10 +2435,7 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl) * devices are known to get this wrong. Use the larger of the * two values. */ - if (ctrl->ctrl_config & NVME_CC_CRIME) - ready_timeout = NVME_CRTO_CRIMT(crto); - else - ready_timeout = NVME_CRTO_CRWMT(crto); + ready_timeout = NVME_CRTO_CRWMT(crto); if (ready_timeout < timeout) dev_warn_once(ctrl->device, "bad crto:%x cap:%llx\n", -- 2.43.0