nvme: generalize the nvme_multi_css check in nvme_scan_ns

Check for multiple command set support early on an error out if is
not supported when a !NVM command set namespace is found. This
prepares for adding command set independent passthrough support.

Signed-off-by: Christoph Hellwig <[e-mail]>
Reviewed-by: Javier González <[e-mail]>
Reviewed-by: Joel Granados <[e-mail]>
Reviewed-by: Sagi Grimberg <[e-mail]>
Reviewed-by: Kanchan Joshi <[e-mail]>
Reviewed-by: Chaitanya Kulkarni <[e-mail]>
Signed-off-by: Jens Axboe <[e-mail]>

drivers/nvme/host/core.c

···
 	if (nvme_identify_ns_descs(ctrl, nsid, &ids))
 		return;
 
+	if (ids.csi != NVME_CSI_NVM && !nvme_multi_css(ctrl)) {
+		dev_warn(ctrl->device,
+			"command set not reported for nsid: %d\n", nsid);
+		return;
+	}
+
 	/*
 	 * Check if the namespace is ready.  If not ignore it, we will get an
 	 * AEN once it becomes ready and restart the scan.
···
 		if (!IS_ENABLED(CONFIG_BLK_DEV_ZONED)) {
 			dev_warn(ctrl->device,
 				"nsid %u not supported without CONFIG_BLK_DEV_ZONED\n",
-				nsid);
-			break;
-		}
-		if (!nvme_multi_css(ctrl)) {
-			dev_warn(ctrl->device,
-				"command set not reported for nsid: %d\n",
 				nsid);
 			break;
 		}