ioctl: add temperature threshold TMPSEL and THSEL parameters to get

Those required to get the feature temperature values.

Signed-off-by: Tokunori Ikegami <[email protected]>

Author: ikegami-t

src/nvme/ioctl.c

@@ -1073,10 +1073,24 @@ int nvme_get_features_lba_range2(int fd, enum nvme_get_features_sel sel,
 	return nvme_get_features(&args);
 }
 
-int nvme_get_features_temp_thresh(int fd, enum nvme_get_features_sel sel,
-				  __u32 *result)
+int nvme_get_features_temp_thresh(int fd, enum nvme_get_features_sel sel, __u8 tmpsel,
+				  enum nvme_feat_tmpthresh_thsel thsel, __u32 *result)
 {
-	return __nvme_get_features(fd, NVME_FEAT_FID_TEMP_THRESH, sel, result);
+	struct nvme_get_features_args args = {
+		.args_size = sizeof(args),
+		.fd = fd,
+		.fid = NVME_FEAT_FID_TEMP_THRESH,
+		.nsid = NVME_NSID_NONE,
+		.sel = sel,
+		.cdw11 = NVME_SET(tmpsel, FEAT_TT_TMPSEL) | NVME_SET(thsel, FEAT_TT_THSEL),
+		.uuidx = NVME_UUID_NONE,
+		.data_len = 0,
+		.data = NULL,
+		.timeout = NVME_DEFAULT_IOCTL_TIMEOUT,
+		.result = result,
+	};
+
+	return nvme_get_features(&args);
 }
 
 int nvme_get_features_err_recovery(int fd, enum nvme_get_features_sel sel,

src/nvme/ioctl.h

@@ -3201,13 +3201,15 @@ int nvme_get_features_lba_range2(int fd, enum nvme_get_features_sel sel,
  * nvme_get_features_temp_thresh() - Get temperature threshold feature
  * @fd:		File descriptor of nvme device
  * @sel:	Select which type of attribute to return, see &enum nvme_get_features_sel
+ * @tmpsel:	Threshold Temperature Select
+ * @thsel:	Threshold Type Select
  * @result:	The command completion result from CQE dword0
  *
  * Return: The nvme command status if a response was received (see
  * &enum nvme_status_field) or -1 with errno set otherwise.
  */
-int nvme_get_features_temp_thresh(int fd, enum nvme_get_features_sel sel,
-				  __u32 *result);
+int nvme_get_features_temp_thresh(int fd, enum nvme_get_features_sel sel, __u8 tmpsel,
+				  enum nvme_feat_tmpthresh_thsel thsel, __u32 *result);
 
 /**
  * nvme_get_features_err_recovery() - Get error recovery feature

test/ioctl/features.c

@@ -371,7 +371,8 @@ static void test_get_temp_thresh(void)
 	int err;
 
 	set_mock_admin_cmds(&mock_admin_cmd, 1);
-	err = nvme_get_features_temp_thresh(TEST_FD, TEST_SEL, &result);
+	err = nvme_get_features_temp_thresh(TEST_FD, TEST_SEL, 0,
+					    NVME_FEATURE_TEMPTHRESH_THSEL_OVER, &result);
 	end_mock_cmds();
 	check(err == 0, "get features returned error %d, errno %m", err);
 	check(result == TEST_RESULT,

test/test.c

@@ -193,7 +193,8 @@ static int test_ctrl(nvme_ctrl_t c)
 		printf("  Power Management:%x\n", result);
 	else if (ret > 0)
 		printf("  ERROR: Power Management:%x\n", ret);
-	ret = nvme_get_features_temp_thresh(fd, sel, &result);
+	ret = nvme_get_features_temp_thresh(fd, sel, 0, NVME_FEATURE_TEMPTHRESH_THSEL_OVER,
+					    &result);
 	if (!ret)
 		printf("  Temperature Threshold:%x\n", result);
 	else if (ret > 0)