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 EF8BA188CA9; Fri, 15 Nov 2024 06:52:47 +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=1731653568; cv=none; b=DZsbxsTzRm3UuJRY5RKTsjhC074HkCchRRAunXwmtAtaONZcLMvmjAnyK87QayiEAfKG+gb1fk9I/a4uf+cCfFkaUrARX3dzwT+mI4lqf+330x9vipOKYxdaXXGYg4V0J7ZxLcuSDCK/VFLb3jQr3nAtAvtHjtmnTSCEts9BXU0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731653568; c=relaxed/simple; bh=3zj1LLCBPovrlB+1f2Jb6Z3rPJjyDvA0zh9XMkiNvFY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sXWm0TelyEObGSJ4TIKQD9beiHmKZM+CXEMAjpX3A3P87WB6YN1bWBk8ptBpPyknBAUNhqp+8PG2+6cCspzdo/sUDG9vSzn5AQMAtmoJ7RfoPUBDwOX9LCZj2YygmhCkBxBg/4zJ3wAg4QkY2VDLjlFA0iiVOAIyPY0sXYvl+eY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=mReDU0vc; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="mReDU0vc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 77CD6C4CECF; Fri, 15 Nov 2024 06:52:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1731653567; bh=3zj1LLCBPovrlB+1f2Jb6Z3rPJjyDvA0zh9XMkiNvFY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mReDU0vcM2/sHIJ2Ip41YpxXeK9tFjGZP+8ZJ9ZAQ8hE6k+roJ5Q88OxL0leq4mMk 09fn/ohM8koetxbc/HaW1+m9wUybM4ibHLsAJB7puZKxII0TCq31BjGtKMZ0HwKJMF fSR4eu43HyrnVA1OYhwnklGDw9SJKVW32BRBpxig= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Greg Joyce , Nilay Shroff , Keith Busch , Sasha Levin Subject: [PATCH 6.1 12/39] nvme: disable CC.CRIME (NVME_CC_CRIME) Date: Fri, 15 Nov 2024 07:38:22 +0100 Message-ID: <20241115063723.053634448@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241115063722.599985562@linuxfoundation.org> References: <20241115063722.599985562@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ 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