ioctl: rework nvme_lm_set_features_data_queue command

Replace the struct args approach by providing init function for
initializing the passthru commands. This reduces the dependency between
callside and library.

Signed-off-by: Daniel Wagner <[email protected]>

Author: igaw

libnvme/src/libnvme.map

@@ -138,7 +138,6 @@ LIBNVME_2_0 {
 		nvme_io_passthru;
 		nvme_ipaddrs_eq;
 		nvme_lm_get_features_ctrl_data_queue;
-		nvme_lm_set_features_ctrl_data_queue;
 		nvme_lookup_ctrl;
 		nvme_lookup_host;
 		nvme_lookup_key;

libnvme/src/nvme/ioctl.c

@@ -772,19 +772,6 @@ int nvme_copy(struct nvme_transport_handle *hdl, struct nvme_copy_args *args)
 	return nvme_submit_io_passthru(hdl, &cmd, args->result);
 }
 
-int nvme_lm_set_features_ctrl_data_queue(struct nvme_transport_handle *hdl, __u16 cdqid, __u32 hp, __u32 tpt, bool etpt,
-					 __u32 *result)
-{
-	struct nvme_passthru_cmd cmd;
-
-	nvme_init_set_features(&cmd, NVME_FEAT_FID_CTRL_DATA_QUEUE, false);
-	cmd.cdw11 = cdqid | NVME_SET(etpt, LM_CTRL_DATA_QUEUE_ETPT);
-	cmd.cdw12 = hp;
-	cmd.cdw13 = tpt;
-
-	return nvme_submit_admin_passthru(hdl, &cmd, result);
-}
-
 int nvme_lm_get_features_ctrl_data_queue(struct nvme_transport_handle *hdl, __u16 cdqid,
 					 struct nvme_lm_ctrl_data_queue_fid_data *data,
 					 __u32 *result)

libnvme/src/nvme/ioctl.h

@@ -5307,19 +5307,29 @@ nvme_init_lm_migration_recv(struct nvme_passthru_cmd *cmd,
 }
 
 /**
- * nvme_lm_set_features_ctrl_data_queue - Set Controller Datea Queue feature
- * @hdl:	Transport handle
+ * nvme_init_lm_set_features_ctrl_data_queue() - Initialize passthru command for
+ * Set Controller Data Queue feature
+ * @cmd:	Passthru command to use
  * @cdqid:	Controller Data Queue ID (CDQID)
- * @hp:		Head Pointer
- * @tpt:	Tail Pointer Trigger
+ * @hp:		Head Pointer (passed in cdw12)
+ * @tpt:	Tail Pointer Trigger (passed in cdw13)
  * @etpt:	Enable Tail Pointer Trigger
- * @result:	The command completions result from CQE dword0
  *
- * Return: 0 on success, the nvme command status if a response was
- * received (see &enum nvme_status_field) or a negative error otherwise.
+ * Initializes the passthru command buffer for the Set Features command with
+ * FID value %NVME_FEAT_FID_CTRL_DATA_QUEUE.
  */
-int nvme_lm_set_features_ctrl_data_queue(struct nvme_transport_handle *hdl, __u16 cdqid, __u32 hp, __u32 tpt, bool etpt,
-					 __u32 *result);
+static inline void
+nvme_init_lm_set_features_ctrl_data_queue(struct nvme_passthru_cmd *cmd,
+	__u16 cdqid, __u32 hp, __u32 tpt, bool etpt)
+{
+	nvme_init_set_features(cmd, NVME_FEAT_FID_CTRL_DATA_QUEUE, false);
+	cmd->cdw11 = cdqid |
+		     NVME_FIELD_ENCODE(etpt,
+			NVME_LM_CTRL_DATA_QUEUE_ETPT_SHIFT,
+			NVME_LM_CTRL_DATA_QUEUE_ETPT_MASK);
+	cmd->cdw12 = hp;
+	cmd->cdw13 = tpt;
+}
 
 /**
  * nvme_lm_get_features_ctrl_data_queue - Get Controller Data Queue feature

libnvme/test/ioctl/features.c

@@ -1574,12 +1574,14 @@ static void test_lm_set_features_ctrl_data_queue(void)
 		.cdw13 = tpt,
 		.result = TEST_RESULT,
 	};
+	struct nvme_passthru_cmd cmd;
 	uint32_t result = 0;
 	int err;
 
 	set_mock_admin_cmds(&mock_admin_cmd, 1);
-	err = nvme_lm_set_features_ctrl_data_queue(test_hdl,
-		TEST_CDQID, hp, tpt, etpt, &result);
+	nvme_init_lm_set_features_ctrl_data_queue(&cmd, TEST_CDQID,
+		hp, tpt, etpt);
+	err = nvme_submit_admin_passthru(test_hdl, &cmd, &result);
 	end_mock_cmds();
 	check(err == 0, "set features returned error %d, errno %m", err);
 	check(result == TEST_RESULT,