types: add temperature threshold feature TMPTHH field

The field supported by NVMe revision 2.1.

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

Author: ikegami-t

src/nvme/ioctl.c

@@ -711,12 +711,13 @@ int nvme_set_features_lba_range(int fd, __u32 nsid, __u8 nr_ranges, bool save,
 }
 
 int nvme_set_features_temp_thresh(int fd, __u16 tmpth, __u8 tmpsel,
-				  enum nvme_feat_tmpthresh_thsel thsel,
+				  enum nvme_feat_tmpthresh_thsel thsel, __u8 tmpthh,
 				  bool save, __u32 *result)
 {
 	__u32 value = NVME_SET(tmpth, FEAT_TT_TMPTH) |
 			NVME_SET(tmpsel, FEAT_TT_TMPSEL) |
-			NVME_SET(thsel, FEAT_TT_THSEL);
+			NVME_SET(thsel, FEAT_TT_THSEL) |
+			NVME_SET(tmpthh, FEAT_TT_TMPTHH);
 
 	return __nvme_set_features(fd, NVME_FEAT_FID_TEMP_THRESH, value, save,
 				   result);

src/nvme/ioctl.h

@@ -2711,14 +2711,15 @@ int nvme_set_features_lba_range(int fd, __u32 nsid, __u8 nr_ranges, bool save,
  * @tmpth:	Temperature Threshold
  * @tmpsel:	Threshold Temperature Select
  * @thsel:	Threshold Type Select
+ * @tmpthh:	Temperature Threshold Hysteresis
  * @save:	Save value across power states
  * @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_set_features_temp_thresh(int fd, __u16 tmpth, __u8 tmpsel,
-				  enum nvme_feat_tmpthresh_thsel thsel,
+				  enum nvme_feat_tmpthresh_thsel thsel, __u8 tmpthh,
 				  bool save, __u32 *result);
 
 /**

src/nvme/types.h

@@ -8796,6 +8796,8 @@ enum nvme_features_id {
  * @NVME_FEAT_TT_TMPSEL_MASK:
  * @NVME_FEAT_TT_THSEL_SHIFT:
  * @NVME_FEAT_TT_THSEL_MASK:
+ * @NVME_FEAT_TT_TMPTHH_SHIFT:
+ * @NVME_FEAT_TT_TMPTHH_MASK:
  * @NVME_FEAT_ERROR_RECOVERY_TLER_SHIFT:
  * @NVME_FEAT_ERROR_RECOVERY_TLER_MASK:
  * @NVME_FEAT_ERROR_RECOVERY_DULBE_SHIFT:
@@ -8936,6 +8938,8 @@ enum nvme_feat {
 	NVME_FEAT_TT_TMPSEL_MASK		= 0xf,
 	NVME_FEAT_TT_THSEL_SHIFT		= 20,
 	NVME_FEAT_TT_THSEL_MASK			= 0x3,
+	NVME_FEAT_TT_TMPTHH_SHIFT		= 22,
+	NVME_FEAT_TT_TMPTHH_MASK		= 0x7,
 	NVME_FEAT_ERROR_RECOVERY_TLER_SHIFT	= 0,
 	NVME_FEAT_ERROR_RECOVERY_TLER_MASK	= 0xffff,
 	NVME_FEAT_ERROR_RECOVERY_DULBE_SHIFT	= 16,

src/nvme/util.h

@@ -263,13 +263,15 @@ static inline void nvme_feature_decode_lba_range(__u32 value, __u8 *num)
 #define NVME_FEAT_TT_TMPTH(v)		NVME_GET(v, FEAT_TT_TMPTH)
 #define NVME_FEAT_TT_TMPSEL(v)		NVME_GET(v, FEAT_TT_TMPSEL)
 #define NVME_FEAT_TT_THSEL(v)		NVME_GET(v, FEAT_TT_THSEL)
+#define NVME_FEAT_TT_TMPTHH(v)		NVME_GET(v, FEAT_TT_TMPTHH)
 
 static inline void nvme_feature_decode_temp_threshold(__u32 value, __u16 *tmpth,
-						      __u8 *tmpsel, __u8 *thsel)
+						      __u8 *tmpsel, __u8 *thsel, __u8 *tmpthh)
 {
 	*tmpth	= NVME_FEAT_TT_TMPTH(value);
 	*tmpsel	= NVME_FEAT_TT_TMPSEL(value);
 	*thsel	= NVME_FEAT_TT_THSEL(value);
+	*tmpthh	= NVME_FEAT_TT_TMPTHH(value);
 }
 
 #define NVME_FEAT_ER_TLER(v)		NVME_GET(v, FEAT_ERROR_RECOVERY_TLER)

test/ioctl/features.c

@@ -335,19 +335,20 @@ static void test_set_temp_thresh(void)
 	uint8_t TMPSEL = 0x8;
 	enum nvme_feat_tmpthresh_thsel THSEL =
 		NVME_FEATURE_TEMPTHRESH_THSEL_UNDER;
+	uint8_t TMPTHH = 0x4;
 	struct mock_cmd mock_admin_cmd = {
 		.opcode = nvme_admin_set_features,
 		.cdw10 = (uint32_t)1 << 31 /* SAVE */
 		       | NVME_FEAT_FID_TEMP_THRESH,
-		.cdw11 = THSEL << 20 | TMPSEL << 16 | TMPTH,
+		.cdw11 = TMPTHH << 22 | THSEL << 20 | TMPSEL << 16 | TMPTH,
 		.result = TEST_RESULT,
 	};
 	uint32_t result = 0;
 	int err;
 
 	set_mock_admin_cmds(&mock_admin_cmd, 1);
 	err = nvme_set_features_temp_thresh(
-		TEST_FD, TMPTH, TMPSEL, THSEL, true, &result);
+		TEST_FD, TMPTH, TMPSEL, THSEL, TMPTHH, true, &result);
 	end_mock_cmds();
 	check(err == 0, "set features returned error %d, errno %m", err);
 	check(result == TEST_RESULT,