Re-use device management code fragments
Subsystems (2)
Avri Altman
reviewerv3 cover Re-use device management code fragments
v2->v3:
- 2/4 - Clarify commit log (Bean)
- 4/4 - pass cmd_type to ufshcd_prepare_req_desc_hdr (Bean)
v1->v2:
- Attend Bart's comments
Device management commands are constructed for query commands that are being issued by the driver, but also for raw device management commands originated by the bsg module, and recently, by the advanced rpmb handler. Thus, the same code fragments, e.g. locking, composing the command, composing the upiu etc., appear over and over. Remove those duplications. Theoretically, there should be no functional change.
Avri Altman (4):
scsi: ufs: Re-use device management locking code
scsi: ufs: Re-use exec_dev_cmd
scsi: ufs: Re-use compose_dev_cmd
scsi: ufs: Re-use compose_devman_upiu
drivers/ufs/core/ufshcd.c | 204 ++++++++++++++++---------------------- include/ufs/ufshci.h | 2 +- 2 files changed, 87 insertions(+), 119 deletions(-)
Signature · 1 line
2.42.0
Avri Altman
reviewerPATCH v3 1/4 scsi: ufs: Re-use device management locking code
Group those 3 calls that repeat for every device management command into a lock and unlock handlers.
--- drivers/ufs/core/ufshcd.c | 69 ++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 37 deletions(-)
drivers/ufs/core/ufshcd.c +32 -37
@@ -3272,6 +3272,20 @@ static int ufshcd_wait_for_dev_cmd(struct ufs_hba *hba,return err; } +static void ufshcd_dev_man_lock (struct ufs_hba *hba) +{ +ufshcd_hold (hba); +mutex_lock (&hba->dev_cmd.lock); +down_read (&hba->clk_scaling_lock); +} + +static void ufshcd_dev_man_unlock (struct ufs_hba *hba) +{ +up_read (&hba->clk_scaling_lock); +mutex_unlock (&hba->dev_cmd.lock); +ufshcd_release (hba); +} +/** * ufshcd_exec_dev_cmd - API for sending device management requests * @hba: UFS hba
@@ -3294,8 +3308,6 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba *hba,/* Protects use of hba->reserved_slot. */ lockdep_assert_held (&hba->dev_cmd.lock); -down_read (&hba->clk_scaling_lock); - lrbp = &hba->lrb[tag]; lrbp->cmd =NULL ; err =ufshcd_compose_dev_cmd (hba, lrbp, cmd_type, tag);
@@ -3312,7 +3324,6 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba *hba, (struct utp_upiu_req *)lrbp->ucd_rsp_ptr); out: -up_read (&hba->clk_scaling_lock);return err; }
@@ -3383,8 +3394,8 @@ int ufshcd_query_flag(struct ufs_hba *hba, enum query_opcode opcode,BUG_ON (!hba); -ufshcd_hold (hba); -mutex_lock (&hba->dev_cmd.lock); +ufshcd_dev_man_lock (hba); +ufshcd_init_query (hba, &request, &response, opcode, idn, index, selector);
@@ -3426,8 +3437,7 @@ int ufshcd_query_flag(struct ufs_hba *hba, enum query_opcode opcode, MASK_QUERY_UPIU_FLAG_LOC) & 0x1; out_unlock: -mutex_unlock (&hba->dev_cmd.lock); -ufshcd_release (hba); +ufshcd_dev_man_unlock (hba);return err; }
@@ -3457,9 +3467,8 @@ int ufshcd_query_attr(struct ufs_hba *hba, enum query_opcode opcode,return -EINVAL ; } -ufshcd_hold (hba); +ufshcd_dev_man_lock (hba); -mutex_lock (&hba->dev_cmd.lock);ufshcd_init_query (hba, &request, &response, opcode, idn, index, selector);
@@ -3489,8 +3498,7 @@ int ufshcd_query_attr(struct ufs_hba *hba, enum query_opcode opcode, *attr_val =be32_to_cpu (response->upiu_res.value); out_unlock: -mutex_unlock (&hba->dev_cmd.lock); -ufshcd_release (hba); +ufshcd_dev_man_unlock (hba);return err; }
@@ -3553,9 +3561,8 @@ static int __ufshcd_query_descriptor(struct ufs_hba *hba,return -EINVAL ; } -ufshcd_hold (hba); +ufshcd_dev_man_lock (hba); -mutex_lock (&hba->dev_cmd.lock);ufshcd_init_query (hba, &request, &response, opcode, idn, index, selector); hba->dev_cmd.query.descriptor = desc_buf;
@@ -3588,8 +3595,7 @@ static int __ufshcd_query_descriptor(struct ufs_hba *hba, out_unlock: hba->dev_cmd.query.descriptor =NULL ; -mutex_unlock (&hba->dev_cmd.lock); -ufshcd_release (hba); +ufshcd_dev_man_unlock (hba);return err; }
@@ -5070,8 +5076,8 @@ static int ufshcd_verify_dev_init(struct ufs_hba *hba)int err =0 ;int retries; -ufshcd_hold (hba); -mutex_lock (&hba->dev_cmd.lock); +ufshcd_dev_man_lock (hba); +for (retries =NOP_OUT_RETRIES ; retries >0 ; retries--) { err =ufshcd_exec_dev_cmd (hba,DEV_CMD_TYPE_NOP , hba->nop_out_timeout);
@@ -5081,8 +5087,8 @@ static int ufshcd_verify_dev_init(struct ufs_hba *hba)dev_dbg (hba->dev,"%s: error %d retrying\n" , __func__, err); } -mutex_unlock (&hba->dev_cmd.lock); -ufshcd_release (hba); + +ufshcd_dev_man_unlock (hba);if (err)dev_err (hba->dev,"%s: NOP OUT failed %d\n" , __func__, err);
@@ -7209,8 +7215,6 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba,/* Protects use of hba->reserved_slot. */ lockdep_assert_held (&hba->dev_cmd.lock); -down_read (&hba->clk_scaling_lock); - lrbp = &hba->lrb[tag]; lrbp->cmd =NULL ; lrbp->task_tag = tag;
@@ -7275,7 +7279,6 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba,ufshcd_add_query_upiu_trace (hba, err ?UFS_QUERY_ERR :UFS_QUERY_COMP , (struct utp_upiu_req *)lrbp->ucd_rsp_ptr); -up_read (&hba->clk_scaling_lock);return err; }
@@ -7314,13 +7317,11 @@ int ufshcd_exec_raw_upiu_cmd(struct ufs_hba *hba, cmd_type =DEV_CMD_TYPE_NOP ; fallthrough;case UPIU_TRANSACTION_QUERY_REQ : -ufshcd_hold (hba); -mutex_lock (&hba->dev_cmd.lock); +ufshcd_dev_man_lock (hba); err =ufshcd_issue_devman_upiu_cmd (hba, req_upiu, rsp_upiu, desc_buff, buff_len, cmd_type, desc_op); -mutex_unlock (&hba->dev_cmd.lock); -ufshcd_release (hba); +ufshcd_dev_man_unlock (hba);break ;case UPIU_TRANSACTION_TASK_REQ :
@@ -7380,9 +7381,7 @@ int ufshcd_advanced_rpmb_req_handler(struct ufs_hba *hba, struct utp_upiu_req *ru16 ehs_len;/* Protects use of hba->reserved_slot. */ -ufshcd_hold (hba); -mutex_lock (&hba->dev_cmd.lock); -down_read (&hba->clk_scaling_lock); +ufshcd_dev_man_lock (hba); lrbp = &hba->lrb[tag]; lrbp->cmd =NULL ;
@@ -7448,9 +7447,8 @@ int ufshcd_advanced_rpmb_req_handler(struct ufs_hba *hba, struct utp_upiu_req *r } } -up_read (&hba->clk_scaling_lock); -mutex_unlock (&hba->dev_cmd.lock); -ufshcd_release (hba); +ufshcd_dev_man_unlock (hba); +return err ? : result; }
@@ -8713,9 +8711,7 @@ static void ufshcd_set_timestamp_attr(struct ufs_hba *hba)if (dev_info->wspecversion <0x400 )return ; -ufshcd_hold (hba); - -mutex_lock (&hba->dev_cmd.lock); +ufshcd_dev_man_lock (hba); ufshcd_init_query(hba, &request, &response, UPIU_QUERY_OPCODE_WRITE_ATTR,
@@ -8733,8 +8729,7 @@ static void ufshcd_set_timestamp_attr(struct ufs_hba *hba)dev_err (hba->dev,"%s: failed to set timestamp %d\n" , __func__, err); -mutex_unlock (&hba->dev_cmd.lock); -ufshcd_release (hba); +ufshcd_dev_man_unlock (hba); }/**
Signature · 1 line
2.42.0
Avri Altman
reviewerPATCH v3 2/4 scsi: ufs: Re-use exec_dev_cmd
In reply to Avri AltmanMove out the actual command issue from exec_dev_cmd so it can be used elsewhere. While at it, remove a redundant "lrbp->cmd = NULL" assignment.
Also, the device management commands that are originated from the ufs-bsg code path, are being traced now, which wasn't the case before.
--- drivers/ufs/core/ufshcd.c | 53 ++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 29 deletions(-)
drivers/ufs/core/ufshcd.c +24 -29
@@ -3286,6 +3286,25 @@ static void ufshcd_dev_man_unlock(struct ufs_hba *hba)ufshcd_release (hba); } +static int ufshcd_issue_dev_cmd (struct ufs_hba *hba,struct ufshcd_lrb *lrbp, +const u32 tag,int timeout) +{ +DECLARE_COMPLETION_ONSTACK (wait); +int err; + + hba->dev_cmd.complete = &wait; + +ufshcd_add_query_upiu_trace (hba,UFS_QUERY_SEND , lrbp->ucd_req_ptr); + +ufshcd_send_command (hba, tag, hba->dev_cmd_queue); + err =ufshcd_wait_for_dev_cmd (hba, lrbp, timeout); + +ufshcd_add_query_upiu_trace (hba, err ?UFS_QUERY_ERR :UFS_QUERY_COMP , + (struct utp_upiu_req *)lrbp->ucd_rsp_ptr); + +return err; +} +/** * ufshcd_exec_dev_cmd - API for sending device management requests * @hba: UFS hba
@@ -3300,31 +3319,18 @@ static void ufshcd_dev_man_unlock(struct ufs_hba *hba)static int ufshcd_exec_dev_cmd (struct ufs_hba *hba,enum dev_cmd_type cmd_type,int timeout) { -DECLARE_COMPLETION_ONSTACK (wait);const u32 tag = hba->reserved_slot; -struct ufshcd_lrb *lrbp; +struct ufshcd_lrb *lrbp = &hba->lrb[tag];int err;/* Protects use of hba->reserved_slot. */ lockdep_assert_held (&hba->dev_cmd.lock); - lrbp = &hba->lrb[tag]; - lrbp->cmd =NULL ; err =ufshcd_compose_dev_cmd (hba, lrbp, cmd_type, tag);if (unlikely (err)) - goto out; - - hba->dev_cmd.complete = &wait; - -ufshcd_add_query_upiu_trace (hba,UFS_QUERY_SEND , lrbp->ucd_req_ptr); - -ufshcd_send_command (hba, tag, hba->dev_cmd_queue); - err =ufshcd_wait_for_dev_cmd (hba, lrbp, timeout); -ufshcd_add_query_upiu_trace (hba, err ?UFS_QUERY_ERR :UFS_QUERY_COMP , - (struct utp_upiu_req *)lrbp->ucd_rsp_ptr); +return err; -out: -return err; +return ufshcd_issue_dev_cmd (hba, lrbp, tag, timeout); }/**
@@ -7206,7 +7212,6 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba,enum dev_cmd_type cmd_type, enum query_opcode desc_op) { -DECLARE_COMPLETION_ONSTACK (wait ); const u32 tag = hba->reserved_slot;struct ufshcd_lrb *lrbp;int err =0 ;
@@ -7246,17 +7251,12 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba,memset (lrbp->ucd_rsp_ptr,0 ,sizeof (struct utp_upiu_rsp )); - hba->dev_cmd.complete = &wait; - -ufshcd_add_query_upiu_trace (hba,UFS_QUERY_SEND , lrbp->ucd_req_ptr); - -ufshcd_send_command (hba, tag, hba->dev_cmd_queue);/* * ignore the returning value here - ufshcd_check_query_response is * bound to fail since dev_cmd.query and dev_cmd.type were left empty. * read the response directly ignoring all errors. */ -ufshcd_wait_for_dev_cmd (hba, lrbp,QUERY_REQ_TIMEOUT ); +ufshcd_issue_dev_cmd (hba, lrbp, tag,QUERY_REQ_TIMEOUT );/* just copy the upiu response as it is */ memcpy (rsp_upiu, lrbp->ucd_rsp_ptr,sizeof (*rsp_upiu));
@@ -7371,7 +7371,6 @@ int ufshcd_advanced_rpmb_req_handler(struct ufs_hba *hba, struct utp_upiu_req *r struct ufs_ehs *rsp_ehs, int sg_cnt, struct scatterlist *sg_list, enum dma_data_direction dir) { -DECLARE_COMPLETION_ONSTACK (wait ); const u32 tag = hba->reserved_slot;struct ufshcd_lrb *lrbp;int err =0 ;
@@ -7418,11 +7417,7 @@ int ufshcd_advanced_rpmb_req_handler(struct ufs_hba *hba, struct utp_upiu_req *rmemset (lrbp->ucd_rsp_ptr,0 ,sizeof (struct utp_upiu_rsp )); - hba->dev_cmd.complete = &wait; - -ufshcd_send_command (hba, tag, hba->dev_cmd_queue); - - err =ufshcd_wait_for_dev_cmd (hba, lrbp,ADVANCED_RPMB_REQ_TIMEOUT ); + err =ufshcd_issue_dev_cmd (hba, lrbp, tag,ADVANCED_RPMB_REQ_TIMEOUT );if (!err) {/* Just copy the upiu response as it is */
Signature · 1 line
2.42.0
Re: [PATCH v3 2/4] scsi: ufs: Re-use exec_dev_cmd
Quoted 6 lines · Avri Altman
Move out the actual command issue from
exec_dev_cmdso it can be used elsewhere. While at it, remove a redundant "lrbp->cmd= NULL" assignment.Also, the device management commands that are originated from the ufs-bsg code path, are being traced now, which wasn't the case before.
Re: [PATCH v3 2/4] scsi: ufs: Re-use exec_dev_cmd
In reply to Avri AltmanQuoted 9 lines · Avri Altman
Move out the actual command issue from
exec_dev_cmdso it can be used elsewhere. While at it, remove a redundant "lrbp->cmd= NULL" assignment.Also, the device management commands that are originated from the ufs-bsg code path, are being traced now, which wasn't the case before.
Signed-off-by Avri Altman <[email protected]>
Avri Altman
reviewerPATCH v3 3/4 scsi: ufs: Re-use compose_dev_cmd
In reply to Avri AltmanMove out some of the dev_cmd initializations so it can be used elsewhere.
--- drivers/ufs/core/ufshcd.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-)
drivers/ufs/core/ufshcd.c +13 -20
@@ -3061,15 +3061,21 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)return err; } -static int ufshcd_compose_dev_cmd (struct ufs_hba *hba, -struct ufshcd_lrb *lrbp,enum dev_cmd_type cmd_type,int tag) +static void ufshcd_setup_dev_cmd (struct ufs_hba *hba,struct ufshcd_lrb *lrbp, +enum dev_cmd_type cmd_type,u8 lun,int tag) { lrbp->cmd =NULL ; lrbp->task_tag = tag; - lrbp->lun =0 ;/* device management cmd is not specific to any LUN */ + lrbp->lun = lun; lrbp->intr_cmd = true;/* No interrupt aggregation */ ufshcd_prepare_lrbp_crypto (NULL , lrbp); hba->dev_cmd.type = cmd_type; +} + +static int ufshcd_compose_dev_cmd (struct ufs_hba *hba, +struct ufshcd_lrb *lrbp,enum dev_cmd_type cmd_type,int tag) +{ +ufshcd_setup_dev_cmd (hba, lrbp, cmd_type,0 , tag);return ufshcd_compose_devman_upiu (hba, lrbp); }
@@ -7213,20 +7219,14 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba, enum query_opcode desc_op) {const u32 tag = hba->reserved_slot; -struct ufshcd_lrb *lrbp; +struct ufshcd_lrb *lrbp = &hba->lrb[tag];int err =0 ;u8 upiu_flags;/* Protects use of hba->reserved_slot. */ lockdep_assert_held (&hba->dev_cmd.lock); - lrbp = &hba->lrb[tag]; - lrbp->cmd =NULL ; - lrbp->task_tag = tag; - lrbp->lun =0 ; - lrbp->intr_cmd = true; -ufshcd_prepare_lrbp_crypto (NULL , lrbp); - hba->dev_cmd.type = cmd_type; +ufshcd_setup_dev_cmd (hba, lrbp, cmd_type,0 , tag);if (hba->ufs_version <=ufshci_version (1 ,1 )) lrbp->command_type =UTP_CMD_TYPE_DEV_MANAGE ;
@@ -7372,7 +7372,7 @@ int ufshcd_advanced_rpmb_req_handler(struct ufs_hba *hba, struct utp_upiu_req *r enum dma_data_direction dir) {const u32 tag = hba->reserved_slot; -struct ufshcd_lrb *lrbp; +struct ufshcd_lrb *lrbp = &hba->lrb[tag];int err =0 ;int result;u8 upiu_flags;
@@ -7382,14 +7382,7 @@ int ufshcd_advanced_rpmb_req_handler(struct ufs_hba *hba, struct utp_upiu_req *r/* Protects use of hba->reserved_slot. */ ufshcd_dev_man_lock (hba); - lrbp = &hba->lrb[tag]; - lrbp->cmd =NULL ; - lrbp->task_tag = tag; - lrbp->lun =UFS_UPIU_RPMB_WLUN ; - - lrbp->intr_cmd = true; -ufshcd_prepare_lrbp_crypto (NULL , lrbp); - hba->dev_cmd.type =DEV_CMD_TYPE_RPMB ; +ufshcd_setup_dev_cmd (hba, lrbp,DEV_CMD_TYPE_RPMB ,UFS_UPIU_RPMB_WLUN , tag);/* Advanced RPMB starts from UFS 4.0, so its command type is UTP_CMD_TYPE_UFS_STORAGE */ lrbp->command_type =UTP_CMD_TYPE_UFS_STORAGE ;
Signature · 1 line
2.42.0
Avri Altman
reviewerPATCH v3 4/4 scsi: ufs: Re-use compose_devman_upiu
In reply to Avri AltmanMove some code fragments into ufshcd_prepare_req_desc_hdr so it can be used throughout.
--- drivers/ufs/core/ufshcd.c | 49 ++++++++++++++------------------------- include/ufs/ufshci.h | 2 +- 2 files changed, 18 insertions(+), 33 deletions(-)
drivers/ufs/core/ufshcd.c +17 -32
@@ -2710,18 +2710,27 @@ static void ufshcd_disable_intr(struct ufs_hba *hba, u32 intrs)/** * ufshcd_prepare_req_desc_hdr - Fill UTP Transfer request descriptor header according to request * descriptor according to request +* @hba: per adapter instance * @lrbp: pointer to local reference block * @upiu_flags: flags required in the header * @cmd_dir: requests data direction * @ehs_length: Total EHS Length (in 32‐bytes units of all Extra Header Segments) +* @legacy_type: UTP_CMD_TYPE_SCSI or UTP_CMD_TYPE_DEV_MANAGE */ -static void ufshcd_prepare_req_desc_hdr (struct ufshcd_lrb *lrbp,u8 *upiu_flags, -enum dma_data_direction cmd_dir,int ehs_length) +static void +ufshcd_prepare_req_desc_hdr (struct ufs_hba *hba,struct ufshcd_lrb *lrbp, +u8 *upiu_flags,enum dma_data_direction cmd_dir, +int ehs_length,enum utp_cmd_type legacy_type) {struct utp_transfer_req_desc *req_desc = lrbp->utr_descriptor_ptr;struct request_desc_header *h = &req_desc->header;enum utp_data_direction data_direction; +if (hba->ufs_version <=ufshci_version (1 ,1 )) + lrbp->command_type = legacy_type; +else + lrbp->command_type =UTP_CMD_TYPE_UFS_STORAGE ; + *h = (typeof(*h)){ };if (cmd_dir ==DMA_FROM_DEVICE ) {
@@ -2854,12 +2863,8 @@ static int ufshcd_compose_devman_upiu(struct ufs_hba *hba,u8 upiu_flags;int ret =0 ; -if (hba->ufs_version <=ufshci_version (1 ,1 )) - lrbp->command_type =UTP_CMD_TYPE_DEV_MANAGE ; -else - lrbp->command_type =UTP_CMD_TYPE_UFS_STORAGE ; +ufshcd_prepare_req_desc_hdr (hba, lrbp, &upiu_flags,DMA_NONE ,0 ,UTP_CMD_TYPE_DEV_MANAGE ); -ufshcd_prepare_req_desc_hdr (lrbp, &upiu_flags,DMA_NONE ,0 );if (hba->dev_cmd.type ==DEV_CMD_TYPE_QUERY )ufshcd_prepare_utp_query_req_upiu (hba, lrbp, upiu_flags);else if (hba->dev_cmd.type ==DEV_CMD_TYPE_NOP )
@@ -2882,13 +2887,8 @@ static void ufshcd_comp_scsi_upiu(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)unsigned int ioprio_class =IOPRIO_PRIO_CLASS (req_get_ioprio (rq));u8 upiu_flags; -if (hba->ufs_version <=ufshci_version (1 ,1 )) - lrbp->command_type =UTP_CMD_TYPE_SCSI ; -else - lrbp->command_type =UTP_CMD_TYPE_UFS_STORAGE ; - -ufshcd_prepare_req_desc_hdr (lrbp, &upiu_flags, - lrbp->cmd->sc_data_direction,0 ); +ufshcd_prepare_req_desc_hdr (hba, lrbp, &upiu_flags, + lrbp->cmd->sc_data_direction,0 ,UTP_CMD_TYPE_SCSI );if (ioprio_class ==IOPRIO_CLASS_RT ) upiu_flags |=UPIU_CMD_FLAGS_CP ;ufshcd_prepare_utp_scsi_cmd_upiu (lrbp, upiu_flags);
@@ -7228,16 +7228,11 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba,ufshcd_setup_dev_cmd (hba, lrbp, cmd_type,0 , tag); -if (hba->ufs_version <=ufshci_version (1 ,1 )) - lrbp->command_type =UTP_CMD_TYPE_DEV_MANAGE ; -else - lrbp->command_type =UTP_CMD_TYPE_UFS_STORAGE ; +ufshcd_prepare_req_desc_hdr (hba, lrbp, &upiu_flags,DMA_NONE ,0 ,UTP_CMD_TYPE_DEV_MANAGE );/* update the task tag in the request upiu */ req_upiu->header.task_tag = tag; -ufshcd_prepare_req_desc_hdr (lrbp, &upiu_flags,DMA_NONE ,0 ); -/* just copy the upiu request as it is */ memcpy (lrbp->ucd_req_ptr, req_upiu,sizeof (*lrbp->ucd_req_ptr));if (desc_buff && desc_op ==UPIU_QUERY_OPCODE_WRITE_DESC ) {
@@ -7378,24 +7373,14 @@ int ufshcd_advanced_rpmb_req_handler(struct ufs_hba *hba, struct utp_upiu_req *ru8 upiu_flags;u8 *ehs_data;u16 ehs_len; +int ehs = (hba->capabilities &MASK_EHSLUTRD_SUPPORTED ) ?2 :0 ;/* Protects use of hba->reserved_slot. */ ufshcd_dev_man_lock (hba);ufshcd_setup_dev_cmd (hba, lrbp,DEV_CMD_TYPE_RPMB ,UFS_UPIU_RPMB_WLUN , tag); -/* Advanced RPMB starts from UFS 4.0, so its command type is UTP_CMD_TYPE_UFS_STORAGE */ - lrbp->command_type =UTP_CMD_TYPE_UFS_STORAGE ; - -/* -* According to UFSHCI 4.0 specification page 24, if EHSLUTRDS is 0, host controller takes -* EHS length from CMD UPIU, and SW driver use EHS Length field in CMD UPIU. if it is 1, -* HW controller takes EHS length from UTRD. -*/ -if (hba->capabilities &MASK_EHSLUTRD_SUPPORTED ) -ufshcd_prepare_req_desc_hdr (lrbp, &upiu_flags, dir,2 ); -else -ufshcd_prepare_req_desc_hdr (lrbp, &upiu_flags, dir,0 ); +ufshcd_prepare_req_desc_hdr (hba, lrbp, &upiu_flags,DMA_NONE , ehs,UTP_CMD_TYPE_DEV_MANAGE );/* update the task tag */ req_upiu->header.task_tag = tag;
include/ufs/ufshci.h +1 -1
@@ -426,7 +426,7 @@ union ufs_crypto_cfg_entry {*/ /* Transfer request command type */ -enum { +enum utp_cmd_type {UTP_CMD_TYPE_SCSI =0x0 ,UTP_CMD_TYPE_UFS =0x1 ,UTP_CMD_TYPE_DEV_MANAGE =0x2 ,
Signature · 1 line
2.42.0
Re: [PATCH v3 4/4] scsi: ufs: Re-use compose_devman_upiu
Quoted 2 lines · Avri Altman
Move some code fragments into
ufshcd_prepare_req_desc_hdrso it can be used throughout.
Re: [PATCH v3 4/4] scsi: ufs: Re-use compose_devman_upiu
In reply to Avri AltmanQuoted 4 lines · Avri Altman
Move some code fragments into
ufshcd_prepare_req_desc_hdrso it can be used throughout.Signed-off-by Avri Altman <[email protected]>
Avri Altman
reviewerMartin,
Can you take a look at this?
I have a follow-up series waiting.
Thanks,
Avri
Quoted 27 lines
v2->v3:
- 2/4 - Clarify commit log (Bean)
- 4/4 - passcmd_typetoufshcd_prepare_req_desc_hdr(Bean)
v1->v2:
- Attend Bart's commentsDevice management commands are constructed for query commands that are being issued by the driver, but also for raw device management commands originated by the bsg module, and recently, by the advanced rpmb handler. Thus, the same code fragments, e.g. locking, composing the command, composing the upiu etc., appear over and over. Remove those duplications. Theoretically, there should be no functional change.
Avri Altman (4):
scsi: ufs: Re-use device management locking code
scsi: ufs: Re-useexec_dev_cmd
scsi: ufs: Re-usecompose_dev_cmd
scsi: ufs: Re-usecompose_devman_upiudrivers/ufs/core/ufshcd.c | 204 ++++++++++++++++---------------------- include/ufs/ufshci.h | 2 +- 2 files changed, 87 insertions(+), 119 deletions(-)--
2.42.0
Martin K. Petersen
AppliedAvri,
Quoted 7 lines
Device management commands are constructed for query commands that are being issued by the driver, but also for raw device management commands originated by the bsg module, and recently, by the advanced rpmb handler. Thus, the same code fragments, e.g. locking, composing the command, composing the upiu etc., appear over and over. Remove those duplications. Theoretically, there should be no functional change.
Applied to 6.10/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering