Commit 6cae9a39 authored by Martin K. Petersen's avatar Martin K. Petersen
Browse files

Merge patch series "Multiple cleanup patches for the UFS driver" 

Bart Van Assche <bvanassche@acm.org> says:

Hi Martin,

This patch includes the following changes, none of which should change the
functionality of the UFS host controller driver:
- Improve the kernel-doc headers further.
- Fix multiple W=2 compiler warnings.
- Simplify ufshcd_abort_all().
- Simplify the code for creating and parsing UFS Transport Protocol (UTP)
  headers.

Please consider this patch series for the next merge window.

Thanks,

Bart.

Link: https://lore.kernel.org/r/20230727194457.3152309-1-bvanassche@acm.org


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parents 03ce80a1 617bfaa8

drivers/ufs/core/ufs-hwmon.c

+2 −1
Original line number Diff line number Diff line
@@ -127,7 +127,8 @@ static int ufs_hwmon_write(struct device *dev, enum hwmon_sensor_types type, u32 
	return err;

}



static umode_t ufs_hwmon_is_visible(const void *_data, enum hwmon_sensor_types type, u32 attr,

static umode_t ufs_hwmon_is_visible(const void *data,

				    enum hwmon_sensor_types type, u32 attr,

				    int channel)

{

	if (type != hwmon_temp)

drivers/ufs/core/ufs-mcq.c

+6 −11
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ EXPORT_SYMBOL_GPL(ufshcd_mcq_config_mac); 
 * @hba: per adapter instance

 * @req: pointer to the request to be issued

 *

 * Returns the hardware queue instance on which the request would

 * Return: the hardware queue instance on which the request would

 * be queued.

 */

struct ufs_hw_queue *ufshcd_mcq_req_to_hwq(struct ufs_hba *hba,
@@ -121,7 +121,7 @@ struct ufs_hw_queue *ufshcd_mcq_req_to_hwq(struct ufs_hba *hba, 
 * ufshcd_mcq_decide_queue_depth - decide the queue depth

 * @hba: per adapter instance

 *

 * Returns queue-depth on success, non-zero on error

 * Return: queue-depth on success, non-zero on error

 *

 * MAC - Max. Active Command of the Host Controller (HC)

 * HC wouldn't send more than this commands to the device.
@@ -493,7 +493,7 @@ static int ufshcd_mcq_sq_start(struct ufs_hba *hba, struct ufs_hw_queue *hwq) 
 * @hba: per adapter instance.

 * @task_tag: The command's task tag.

 *

 * Returns 0 for success; error code otherwise.

 * Return: 0 for success; error code otherwise.

 */

int ufshcd_mcq_sq_cleanup(struct ufs_hba *hba, int task_tag)

{
@@ -558,12 +558,7 @@ int ufshcd_mcq_sq_cleanup(struct ufs_hba *hba, int task_tag) 
 */

static void ufshcd_mcq_nullify_sqe(struct utp_transfer_req_desc *utrd)

{

	u32 dword_0;



	dword_0 = le32_to_cpu(utrd->header.dword_0);

	dword_0 &= ~UPIU_COMMAND_TYPE_MASK;

	dword_0 |= FIELD_PREP(UPIU_COMMAND_TYPE_MASK, 0xF);

	utrd->header.dword_0 = cpu_to_le32(dword_0);

	utrd->header.command_type = 0xf;

}



/**
@@ -575,7 +570,7 @@ static void ufshcd_mcq_nullify_sqe(struct utp_transfer_req_desc *utrd) 
 * @hwq: Hardware Queue to be searched.

 * @task_tag: The command's task tag.

 *

 * Returns true if the SQE containing the command is present in the SQ

 * Return: true if the SQE containing the command is present in the SQ

 * (not fetched by the controller); returns false if the SQE is not in the SQ.

 */

static bool ufshcd_mcq_sqe_search(struct ufs_hba *hba,
@@ -624,7 +619,7 @@ static bool ufshcd_mcq_sqe_search(struct ufs_hba *hba, 
 * ufshcd_mcq_abort - Abort the command in MCQ.

 * @cmd: The command to be aborted.

 *

 * Returns SUCCESS or FAILED error codes

 * Return: SUCCESS or FAILED error codes

 */

int ufshcd_mcq_abort(struct scsi_cmnd *cmd)

{

drivers/ufs/core/ufs_bsg.c

+2 −0
Original line number Diff line number Diff line
@@ -232,6 +232,8 @@ static inline void ufs_bsg_node_release(struct device *dev) 
 * @hba: per adapter object

 *

 * Called during initial loading of the driver, and before scsi_scan_host.

 *

 * Returns: 0 (success).

 */

int ufs_bsg_probe(struct ufs_hba *hba)

{

drivers/ufs/core/ufshcd-crypto.h

+10 −10
Original line number Diff line number Diff line
@@ -26,15 +26,15 @@ static inline void ufshcd_prepare_lrbp_crypto(struct request *rq, 
}



static inline void

ufshcd_prepare_req_desc_hdr_crypto(struct ufshcd_lrb *lrbp, u32 *dword_0,

				   u32 *dword_1, u32 *dword_3)

ufshcd_prepare_req_desc_hdr_crypto(struct ufshcd_lrb *lrbp,

				   struct request_desc_header *h)

{

	if (lrbp->crypto_key_slot >= 0) {

		*dword_0 |= UTP_REQ_DESC_CRYPTO_ENABLE_CMD;

		*dword_0 |= lrbp->crypto_key_slot;

		*dword_1 = lower_32_bits(lrbp->data_unit_num);

		*dword_3 = upper_32_bits(lrbp->data_unit_num);

	}

	if (lrbp->crypto_key_slot < 0)

		return;

	h->enable_crypto = 1;

	h->cci = lrbp->crypto_key_slot;

	h->dunl = cpu_to_le32(lower_32_bits(lrbp->data_unit_num));

	h->dunu = cpu_to_le32(upper_32_bits(lrbp->data_unit_num));

}



bool ufshcd_crypto_enable(struct ufs_hba *hba);
@@ -51,8 +51,8 @@ static inline void ufshcd_prepare_lrbp_crypto(struct request *rq, 
					      struct ufshcd_lrb *lrbp) { }



static inline void

ufshcd_prepare_req_desc_hdr_crypto(struct ufshcd_lrb *lrbp, u32 *dword_0,

				   u32 *dword_1, u32 *dword_3) { }

ufshcd_prepare_req_desc_hdr_crypto(struct ufshcd_lrb *lrbp,

				   struct request_desc_header *h) { }



static inline bool ufshcd_crypto_enable(struct ufs_hba *hba)

{

drivers/ufs/core/ufshcd-priv.h

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ int ufshcd_send_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd); 
int ufshcd_exec_raw_upiu_cmd(struct ufs_hba *hba,

			     struct utp_upiu_req *req_upiu,

			     struct utp_upiu_req *rsp_upiu,

			     int msgcode,

			     enum upiu_request_transaction msgcode,

			     u8 *desc_buff, int *buff_len,

			     enum query_opcode desc_op);
@@ -294,7 +294,7 @@ extern const struct ufs_pm_lvl_states ufs_pm_lvl_states[]; 
 * ufshcd_scsi_to_upiu_lun - maps scsi LUN to UPIU LUN

 * @scsi_lun: scsi LUN id

 *

 * Returns UPIU LUN id

 * Return: UPIU LUN id

 */

static inline u8 ufshcd_scsi_to_upiu_lun(unsigned int scsi_lun)

{