From: Christoph Hellwig <hch@lst.de>
Date: Sat, 25 Jan 2025 06:30:14 +0000 (+0100)
Subject: TEMP: nvme: disable discard
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1dee9fa528f6e3161f2217b6f78b2142e9dc2e54;p=users%2Fhch%2Fmisc.git

TEMP: nvme: disable discard

The qemu T10PI support generates incorrect guard tags on discarded
logical blocks.  Hack around this by disabling discard.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 40046770f1bf..9429c250c318 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2197,7 +2197,7 @@ static int nvme_update_ns_info_block(struct nvme_ns *ns,
 	nvme_set_chunk_sectors(ns, id, &lim);
 	if (!nvme_update_disk_info(ns, id, &lim))
 		capacity = 0;
-	nvme_config_discard(ns, &lim);
+//	nvme_config_discard(ns, &lim);
 	if (IS_ENABLED(CONFIG_BLK_DEV_ZONED) &&
 	    ns->head->ids.csi == NVME_CSI_ZNS)
 		nvme_update_zone_info(ns, &lim, &zi);