ioctl: nvme_set_features use nvme_passthru_cmd directly

Drop struct nvme_set_features_args.

Signed-off-by: Dennis Maisenbacher <[email protected]>

Author: MaisenbacherD

src/nvme/api-types.h

@@ -86,38 +86,6 @@ struct nvme_get_log_args {
 	bool ot;
 };
 
-/**
- * struct nvme_set_features_args - Arguments for the NVMe Admin Set Feature command
- * @result:	The command completion result from CQE dword0
- * @data:	User address of feature data, if applicable
- * @args_size:	Size of &struct nvme_set_features_args
- * @timeout:	Timeout in ms
- * @nsid:	Namespace ID, if applicable
- * @cdw11:	Value to set the feature to
- * @cdw12:	Feature specific command dword12 field
- * @cdw13:	Feature specific command dword13 field
- * @cdw15:	Feature specific command dword15 field
- * @data_len:	Length of feature data, if applicable, in bytes
- * @save:	Save value across power states
- * @uuidx:	UUID Index for differentiating vendor specific encoding
- * @fid:	Feature identifier
- */
-struct nvme_set_features_args {
-	__u32 *result;
-	void *data;
-	int args_size;
-	__u32 timeout;
-	__u32 nsid;
-	__u32 cdw11;
-	__u32 cdw12;
-	__u32 cdw13;
-	__u32 cdw15;
-	__u32 data_len;
-	bool save;
-	__u8 uuidx;
-	__u8 fid;
-};
-
 /**
  * struct nvme_get_features_args - Arguments for the NVMe Admin Get Feature command
  * @args_size:	Size of &struct nvme_get_features_args

src/nvme/ioctl.c

@@ -635,325 +635,6 @@ int nvme_get_ana_log_atomic(nvme_link_t l, bool rae, bool rgo,
 	return -EAGAIN;
 }
 
-int nvme_set_features(nvme_link_t l, struct nvme_set_features_args *args)
-{
-	__u32 cdw10 = NVME_SET(args->fid, FEATURES_CDW10_FID) |
-			NVME_SET(!!args->save, SET_FEATURES_CDW10_SAVE);
-	__u32 cdw14 = NVME_SET(args->uuidx, FEATURES_CDW14_UUID);
-
-	struct nvme_passthru_cmd cmd = {
-		.opcode		= nvme_admin_set_features,
-		.nsid		= args->nsid,
-		.addr		= (__u64)(uintptr_t)args->data,
-		.data_len	= args->data_len,
-		.cdw10		= cdw10,
-		.cdw11		= args->cdw11,
-		.cdw12		= args->cdw12,
-		.cdw13		= args->cdw13,
-		.cdw14		= cdw14,
-		.cdw15		= args->cdw15,
-		.timeout_ms	= args->timeout,
-	};
-	if (args->args_size < sizeof(*args))
-		return -EINVAL;
-
-	return nvme_submit_admin_passthru(l, &cmd, args->result);
-}
-
-static int __nvme_set_features(nvme_link_t l, __u8 fid, __u32 cdw11, bool save,
-			       __u32 *result)
-{
-	struct nvme_set_features_args args = {
-		.args_size = sizeof(args),
-		.fid = fid,
-		.nsid = NVME_NSID_NONE,
-		.cdw11 = cdw11,
-		.cdw12 = 0,
-		.save = save,
-		.uuidx = NVME_UUID_NONE,
-		.cdw15 = 0,
-		.data_len = 0,
-		.data = NULL,
-		.timeout = NVME_DEFAULT_IOCTL_TIMEOUT,
-		.result = result,
-	};
-	return nvme_set_features(l, &args);
-}
-
-int nvme_set_features_arbitration(nvme_link_t l, __u8 ab, __u8 lpw, __u8 mpw,
-				  __u8 hpw, bool save, __u32 *result)
-{
-	__u32 value = NVME_SET(ab, FEAT_ARBITRATION_BURST) |
-			NVME_SET(lpw, FEAT_ARBITRATION_LPW) |
-			NVME_SET(mpw, FEAT_ARBITRATION_MPW) |
-			NVME_SET(hpw, FEAT_ARBITRATION_HPW);
-
-	return __nvme_set_features(l, NVME_FEAT_FID_ARBITRATION, value, save,
-				   result);
-}
-
-int nvme_set_features_power_mgmt(nvme_link_t l, __u8 ps, __u8 wh, bool save,
-				 __u32 *result)
-{
-	__u32 value = NVME_SET(ps, FEAT_PWRMGMT_PS) |
-			NVME_SET(wh, FEAT_PWRMGMT_WH);
-
-	return __nvme_set_features(l, NVME_FEAT_FID_POWER_MGMT, value, save,
-				   result);
-}
-
-int nvme_set_features_lba_range(nvme_link_t l, __u32 nsid, __u8 nr_ranges, bool save,
-				struct nvme_lba_range_type *data, __u32 *result)
-{
-	return nvme_set_features_data(
-		l, NVME_FEAT_FID_LBA_RANGE, nsid, nr_ranges - 1, save,
-		sizeof(*data), data, result);
-}
-
-int nvme_set_features_temp_thresh(nvme_link_t l, __u16 tmpth, __u8 tmpsel,
-				  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(tmpthh, FEAT_TT_TMPTHH);
-
-	return __nvme_set_features(l, NVME_FEAT_FID_TEMP_THRESH, value, save,
-				   result);
-}
-
-int nvme_set_features_err_recovery(nvme_link_t l, __u32 nsid, __u16 tler, bool dulbe,
-				   bool save, __u32 *result)
-{
-	__u32 value = NVME_SET(tler, FEAT_ERROR_RECOVERY_TLER) |
-			NVME_SET(!!dulbe, FEAT_ERROR_RECOVERY_DULBE);
-
-	return nvme_set_features_simple(
-		l, NVME_FEAT_FID_ERR_RECOVERY, nsid, value, save, result);
-}
-
-int nvme_set_features_volatile_wc(nvme_link_t l, bool wce, bool save, __u32 *result)
-{
-	__u32 value = NVME_SET(!!wce, FEAT_VWC_WCE);
-
-	return __nvme_set_features(l, NVME_FEAT_FID_VOLATILE_WC, value, save,
-				   result);
-}
-
-int nvme_set_features_irq_coalesce(nvme_link_t l, __u8 thr, __u8 time, bool save,
-				   __u32 *result)
-{
-	__u32 value = NVME_SET(thr, FEAT_IRQC_THR) |
-			NVME_SET(time, FEAT_IRQC_TIME);
-
-	return __nvme_set_features(l, NVME_FEAT_FID_IRQ_COALESCE, value, save,
-				   result);
-}
-
-int nvme_set_features_irq_config(nvme_link_t l, __u16 iv, bool cd, bool save,
-				 __u32 *result)
-{
-	__u32 value = NVME_SET(iv, FEAT_ICFG_IV) |
-			NVME_SET(!!cd, FEAT_ICFG_CD);
-
-	return __nvme_set_features(l, NVME_FEAT_FID_IRQ_CONFIG, value, save,
-				   result);
-}
-
-int nvme_set_features_write_atomic(nvme_link_t l, bool dn, bool save, __u32 *result)
-{
-	__u32 value = NVME_SET(!!dn, FEAT_WA_DN);
-
-	return __nvme_set_features(l, NVME_FEAT_FID_WRITE_ATOMIC, value, save,
-				   result);
-}
-
-int nvme_set_features_async_event(nvme_link_t l, __u32 events,
-				  bool save, __u32 *result)
-{
-	return __nvme_set_features(l, NVME_FEAT_FID_ASYNC_EVENT, events, save,
-				   result);
-}
-
-int nvme_set_features_auto_pst(nvme_link_t l, bool apste, bool save,
-			       struct nvme_feat_auto_pst *apst, __u32 *result)
-{
-	return nvme_set_features_data(l, NVME_FEAT_FID_AUTO_PST,
-		NVME_NSID_NONE, NVME_SET(!!apste, FEAT_APST_APSTE), save,
-		sizeof(*apst), apst, result);
-}
-
-int nvme_set_features_timestamp(nvme_link_t l, bool save, __u64 timestamp)
-{
-	__le64 t = cpu_to_le64(timestamp);
-	struct nvme_timestamp ts = {};
-	memcpy(ts.timestamp, &t, sizeof(ts.timestamp));
-
-	return nvme_set_features_data(l, NVME_FEAT_FID_TIMESTAMP,
-		NVME_NSID_NONE, 0, save, sizeof(ts), &ts, NULL);
-}
-
-int nvme_set_features_hctm(nvme_link_t l, __u16 tmt2, __u16 tmt1,
-			   bool save, __u32 *result)
-{
-	__u32 value = NVME_SET(tmt2, FEAT_HCTM_TMT2) |
-			NVME_SET(tmt1, FEAT_HCTM_TMT1);
-
-	return __nvme_set_features(l, NVME_FEAT_FID_HCTM, value, save,
-				   result);
-}
-
-int nvme_set_features_nopsc(nvme_link_t l, bool noppme, bool save, __u32 *result)
-{
-	__u32 value = NVME_SET(noppme, FEAT_NOPS_NOPPME);
-
-	return __nvme_set_features(l, NVME_FEAT_FID_NOPSC, value, save,
-				   result);
-}
-
-int nvme_set_features_rrl(nvme_link_t l, __u8 rrl, __u16 nvmsetid,
-			  bool save, __u32 *result)
-{
-	struct nvme_set_features_args args = {
-		.args_size = sizeof(args),
-		.fid = NVME_FEAT_FID_RRL,
-		.nsid = NVME_NSID_NONE,
-		.cdw11 = nvmsetid,
-		.cdw12 = rrl,
-		.save = save,
-		.uuidx = NVME_UUID_NONE,
-		.cdw15 = 0,
-		.data_len = 0,
-		.data = NULL,
-		.timeout = NVME_DEFAULT_IOCTL_TIMEOUT,
-		.result = result,
-	};
-
-	return nvme_set_features(l, &args);
-}
-
-int nvme_set_features_plm_config(nvme_link_t l, bool plm, __u16 nvmsetid, bool save,
-				 struct nvme_plm_config *data, __u32 *result)
-{
-	struct nvme_set_features_args args = {
-		.args_size = sizeof(args),
-		.fid = NVME_FEAT_FID_PLM_CONFIG,
-		.nsid = NVME_NSID_NONE,
-		.cdw11 = nvmsetid,
-		.cdw12 = !!plm,
-		.save = save,
-		.uuidx = NVME_UUID_NONE,
-		.cdw15 = 0,
-		.data_len = sizeof(*data),
-		.data = data,
-		.timeout = NVME_DEFAULT_IOCTL_TIMEOUT,
-		.result = result,
-	};
-
-	return nvme_set_features(l, &args);
-}
-
-int nvme_set_features_plm_window(nvme_link_t l, enum nvme_feat_plm_window_select sel,
-				 __u16 nvmsetid, bool save, __u32 *result)
-{
-	__u32 cdw12 = NVME_SET(sel, FEAT_PLMW_WS);
-	struct nvme_set_features_args args = {
-		.args_size = sizeof(args),
-		.fid = NVME_FEAT_FID_PLM_WINDOW,
-		.nsid = NVME_NSID_NONE,
-		.cdw11 = nvmsetid,
-		.cdw12 = cdw12,
-		.save = save,
-		.uuidx = NVME_UUID_NONE,
-		.cdw15 = 0,
-		.data_len = 0,
-		.data = NULL,
-		.timeout = NVME_DEFAULT_IOCTL_TIMEOUT,
-		.result = result,
-	};
-
-	return nvme_set_features(l, &args);
-}
-
-int nvme_set_features_lba_sts_interval(nvme_link_t l, __u16 lsiri, __u16 lsipi,
-				       bool save, __u32 *result)
-{
-	__u32 value = NVME_SET(lsiri, FEAT_LBAS_LSIRI) |
-			NVME_SET(lsipi, FEAT_LBAS_LSIPI);
-
-	return __nvme_set_features(l, NVME_FEAT_FID_LBA_STS_INTERVAL, value,
-				   save, result);
-}
-
-int nvme_set_features_host_behavior(nvme_link_t l, bool save,
-	struct nvme_feat_host_behavior *data)
-{
-	return nvme_set_features_data(l, NVME_FEAT_FID_HOST_BEHAVIOR,
-		NVME_NSID_NONE, 0, false, sizeof(*data), data, NULL);
-}
-
-int nvme_set_features_sanitize(nvme_link_t l, bool nodrm, bool save, __u32 *result)
-{
-	return __nvme_set_features(l, NVME_FEAT_FID_SANITIZE, !!nodrm, save,
-				   result);
-}
-
-int nvme_set_features_endurance_evt_cfg(nvme_link_t l, __u16 endgid, __u8 egwarn,
-					bool save, __u32 *result)
-{
-	__u32 value = endgid | egwarn << 16;
-
-	return __nvme_set_features(l, NVME_FEAT_FID_ENDURANCE_EVT_CFG, value,
-				   save, result);
-}
-
-int nvme_set_features_sw_progress(nvme_link_t l, __u8 pbslc, bool save,
-				  __u32 *result)
-{
-	return __nvme_set_features(l, NVME_FEAT_FID_SW_PROGRESS, pbslc, save,
-				   result);
-}
-
-int nvme_set_features_host_id(nvme_link_t l, bool exhid, bool save, __u8 *hostid)
-{
-	__u32 len = exhid ? 16 : 8;
-	__u32 value = !!exhid;
-
-	return nvme_set_features_data(l, NVME_FEAT_FID_HOST_ID,
-		NVME_NSID_NONE, value, save, len, hostid, NULL);
-}
-
-int nvme_set_features_resv_mask(nvme_link_t l, __u32 nsid, __u32 mask, bool save,
-				 __u32 *result)
-{
-	return nvme_set_features_simple(
-		l, NVME_FEAT_FID_RESV_MASK, nsid, mask, save, result);
-}
-
-int nvme_set_features_resv_persist(nvme_link_t l, __u32 nsid, bool ptpl, bool save,
-				    __u32 *result)
-{
-	return nvme_set_features_simple(
-		l, NVME_FEAT_FID_RESV_PERSIST, nsid, !!ptpl, save, result);
-}
-
-int nvme_set_features_write_protect(nvme_link_t l, __u32 nsid,
-				    enum nvme_feat_nswpcfg_state state,
-				    bool save, __u32 *result)
-{
-	return nvme_set_features_simple(
-		l, NVME_FEAT_FID_WRITE_PROTECT, nsid, state, false, result);
-}
-
-int nvme_set_features_iocs_profile(nvme_link_t l, __u16 iocsi, bool save)
-{
-	__u32 value = NVME_SET(iocsi, FEAT_IOCSP_IOCSCI);
-
-	return __nvme_set_features(l, NVME_FEAT_FID_IOCS_PROFILE, value,
-				   save, NULL);
-}
-
 int nvme_get_features(nvme_link_t l, struct nvme_get_features_args *args)
 {
 	__u32 cdw10 = NVME_SET(args->fid, FEATURES_CDW10_FID) |
@@ -2195,24 +1876,6 @@ int nvme_lm_migration_recv(nvme_link_t l, struct nvme_lm_migration_recv_args *ar
 	return nvme_submit_admin_passthru(l, &cmd, args->result);
 }
 
-int nvme_lm_set_features_ctrl_data_queue(nvme_link_t l, __u16 cdqid, __u32 hp, __u32 tpt, bool etpt,
-					 __u32 *result)
-{
-	struct nvme_set_features_args args = {
-		.args_size	= sizeof(args),
-		.fid		= NVME_FEAT_FID_CTRL_DATA_QUEUE,
-		.nsid		= NVME_NSID_NONE,
-		.cdw11		= cdqid | NVME_SET(etpt, LM_CTRL_DATA_QUEUE_ETPT),
-		.cdw12		= hp,
-		.cdw13		= tpt,
-		.save		= false,
-		.timeout	= NVME_DEFAULT_IOCTL_TIMEOUT,
-		.result		= result,
-	};
-
-	return nvme_set_features(l, &args);
-}
-
 int nvme_lm_get_features_ctrl_data_queue(nvme_link_t l, __u16 cdqid,
 					 struct nvme_lm_ctrl_data_queue_fid_data *data,
 					 __u32 *result)