Commit 58a0c875 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Keith Busch
Browse files

nvme: don't apply NVME_QUIRK_DEALLOCATE_ZEROES when DSM is not supported 



Commit 63dfa100 ("nvme: move NVME_QUIRK_DEALLOCATE_ZEROES out of
nvme_config_discard") started applying the NVME_QUIRK_DEALLOCATE_ZEROES
quirk even then the Dataset Management is not supported.  It turns out
that there versions of these old Intel SSDs that have DSM support
disabled in the firmware, which will now lead to errors everytime
a Write Zeroes command is issued.  Fix this by checking for DSM support
before applying the quirk.

Reported-by: default avatarSaeed Mirzamohammadi <saeed.mirzamohammadi@oracle.com>
Fixes: 63dfa100 ("nvme: move NVME_QUIRK_DEALLOCATE_ZEROES out of nvme_config_discard")
Tested-by: default avatarSaeed Mirzamohammadi <saeed.mirzamohammadi@oracle.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarNitesh Shetty <nj.shetty@samsung.com>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 84909f7d

drivers/nvme/host/core.c

+2 −1
Original line number Diff line number Diff line
@@ -2043,7 +2043,8 @@ static bool nvme_update_disk_info(struct nvme_ns *ns, struct nvme_id_ns *id, 
	lim->physical_block_size = min(phys_bs, atomic_bs);

	lim->io_min = phys_bs;

	lim->io_opt = io_opt;

	if (ns->ctrl->quirks & NVME_QUIRK_DEALLOCATE_ZEROES)

	if ((ns->ctrl->quirks & NVME_QUIRK_DEALLOCATE_ZEROES) &&

	    (ns->ctrl->oncs & NVME_CTRL_ONCS_DSM))

		lim->max_write_zeroes_sectors = UINT_MAX;

	else

		lim->max_write_zeroes_sectors = ns->ctrl->max_zeroes_sectors;