UFS patches for kernel 6.11
Subsystems (2)
Bart Van Assche
reviewerv2 cover UFS patches for kernel 6.11
Hi Martin,
Please consider this series of UFS driver patches for the next merge window.
Thank you,
Bart.
Changes compared to v1:
- Based upon reviewer feedback, a new patch that renames the MASK_TRANSFER_REQUESTS_SLOTS constant has been added.
- Because there is no agreement about these patches, the following three patches have been left out: "Make ufshcd_poll() complain about unsupported arguments", "Make the polling code report which command has been completed" and also "Check for completion from the timeout handler".
Bart Van Assche (7):
scsi: ufs: Declare ufshcd_mcq_poll_cqe_lock() once
scsi: ufs: Initialize struct uic_command once
scsi: ufs: Remove two constants
scsi: ufs: Rename the MASK_TRANSFER_REQUESTS_SLOTS constant
scsi: ufs: Initialize hba->reserved_slot earlier
scsi: ufs: Inline ufshcd_mcq_vops_get_hba_mac()
scsi: ufs: Make .get_hba_mac() optional
drivers/ufs/core/ufs-mcq.c | 19 ++++++--- drivers/ufs/core/ufshcd-priv.h | 10 ----- drivers/ufs/core/ufshcd.c | 73 ++++++++++++++++------------------ include/ufs/ufshcd.h | 8 ++-- include/ufs/ufshci.h | 3 +- 5 files changed, 55 insertions(+), 58 deletions(-)
Bart Van Assche
reviewerPATCH v2 1/7 scsi: ufs: Declare ufshcd_mcq_poll_cqe_lock() once
ufshcd_mcq_poll_cqe_lock() is declared in include/ufs/ufshcd.h and also in drivers/ufs/core/ufshcd-priv.h. Remove the declaration from the latter file.
--- drivers/ufs/core/ufshcd-priv.h | 2 -- 1 file changed, 2 deletions(-)
drivers/ufs/core/ufshcd-priv.h +0 -2
@@ -72,8 +72,6 @@ u32 ufshcd_mcq_read_cqis(struct ufs_hba *hba, int i);void ufshcd_mcq_write_cqis (struct ufs_hba *hba,u32 val,int i);struct ufs_hw_queue *ufshcd_mcq_req_to_hwq (struct ufs_hba *hba,struct request *req); -unsigned long ufshcd_mcq_poll_cqe_lock (struct ufs_hba *hba, -struct ufs_hw_queue *hwq);void ufshcd_mcq_compl_all_cqes_lock (struct ufs_hba *hba,struct ufs_hw_queue *hwq);bool ufshcd_cmd_inflight (struct scsi_cmnd *cmd);
RE: [PATCH v2 1/7] scsi: ufs: Declare ufshcd_mcq_poll_cqe_lock() once
Quoted 2 lines
ufshcd_mcq_poll_cqe_lock()is declared ininclude/ufs/ufshcd.hand also indrivers/ufs/core/ufshcd-priv.h. Remove the declaration from the latter file.
Hi Bart,
The functions below seem to be the same case.
- ufshcd_mcq_write_cqis()
- ufshcd_mcq_read_cqis()
- ufshcd_mcq_config_mac()
- ufshcd_mcq_make_queues_operational()
How about including these cases in the patch as well?
Best Regards,
Keoseong
Quoted 20 lines
Reviewed-by Avri Altman <[email protected]>Signed-off-by Bart Van Assche <[email protected]>--- drivers/ufs/core/ufshcd-priv.h | 2 -- 1 file changed, 2 deletions(-)drivers/ufs/core/ufshcd-priv.h +0
-2@@ -72,8 +72,6 @@ u32 ufshcd_mcq_read_cqis(struct ufs_hba *hba, int i);void ufshcd_mcq_write_cqis (struct ufs_hba *hba,u32 val,int i);struct ufs_hw_queue *ufshcd_mcq_req_to_hwq (struct ufs_hba *hba,struct request *req); -unsigned long ufshcd_mcq_poll_cqe_lock (struct ufs_hba *hba, -struct ufs_hw_queue *hwq);void ufshcd_mcq_compl_all_cqes_lock (struct ufs_hba *hba,struct ufs_hw_queue *hwq);bool ufshcd_cmd_inflight (struct scsi_cmnd *cmd);
Bart Van Assche
reviewerRe: [PATCH v2 1/7] scsi: ufs: Declare ufshcd_mcq_poll_cqe_lock() once
Quoted 5 lines · Keoseong Park
Quoted 2 lines
ufshcd_mcq_poll_cqe_lock()is declared ininclude/ufs/ufshcd.hand also indrivers/ufs/core/ufshcd-priv.h. Remove the declaration from the latter file.Hi Bart,
Quoted 7 lines
The functions below seem to be the same case.
-ufshcd_mcq_write_cqis()
-ufshcd_mcq_read_cqis()
-ufshcd_mcq_config_mac()
-ufshcd_mcq_make_queues_operational()How about including these cases in the patch as well?
I will do that.
Thanks,
Bart.
Bart Van Assche
reviewerPATCH v2 2/7 scsi: ufs: Initialize struct uic_command once
In reply to Bart Van AsscheInstead of first zero-initializing struct uic_command and next initializing it memberwise, initialize all members at once.
--- drivers/ufs/core/ufshcd.c | 61 ++++++++++++++++++++------------------- include/ufs/ufshcd.h | 4 +-- 2 files changed, 33 insertions(+), 32 deletions(-)
drivers/ufs/core/ufshcd.c +31 -30
@@ -3993,11 +3993,11 @@ static void ufshcd_host_memory_configure(struct ufs_hba *hba)*/ static int ufshcd_dme_link_startup (struct ufs_hba *hba) { -struct uic_command uic_cmd = {0 }; +struct uic_command uic_cmd = { + .command =UIC_CMD_DME_LINK_STARTUP , + };int ret; - uic_cmd.command =UIC_CMD_DME_LINK_STARTUP ; - ret =ufshcd_send_uic_cmd (hba, &uic_cmd);if (ret) dev_dbg(hba->dev,
@@ -4015,11 +4015,11 @@ static int ufshcd_dme_link_startup(struct ufs_hba *hba)*/ static int ufshcd_dme_reset (struct ufs_hba *hba) { -struct uic_command uic_cmd = {0 }; +struct uic_command uic_cmd = { + .command =UIC_CMD_DME_RESET , + };int ret; - uic_cmd.command =UIC_CMD_DME_RESET ; - ret =ufshcd_send_uic_cmd (hba, &uic_cmd);if (ret) dev_err(hba->dev,
@@ -4054,11 +4054,11 @@ EXPORT_SYMBOL_GPL(ufshcd_dme_configure_adapt);*/ static int ufshcd_dme_enable (struct ufs_hba *hba) { -struct uic_command uic_cmd = {0 }; +struct uic_command uic_cmd = { + .command =UIC_CMD_DME_ENABLE , + };int ret; - uic_cmd.command =UIC_CMD_DME_ENABLE ; - ret =ufshcd_send_uic_cmd (hba, &uic_cmd);if (ret) dev_err(hba->dev,
@@ -4111,7 +4111,12 @@ static inline void ufshcd_add_delay_before_dme_cmd(struct ufs_hba *hba)int ufshcd_dme_set_attr (struct ufs_hba *hba,u32 attr_sel,u8 attr_set,u32 mib_val,u8 peer) { -struct uic_command uic_cmd = {0 }; +struct uic_command uic_cmd = { + .command = peer ?UIC_CMD_DME_PEER_SET :UIC_CMD_DME_SET , + .argument1 = attr_sel, + .argument2 =UIC_ARG_ATTR_TYPE (attr_set), + .argument3 = mib_val, + };static const char *const action[] = {"dme-set" ,"dme-peer-set"
@@ -4120,12 +4125,6 @@ int ufshcd_dme_set_attr(struct ufs_hba *hba, u32 attr_sel,int ret;int retries =UFS_UIC_COMMAND_RETRIES ; - uic_cmd.command = peer ? -UIC_CMD_DME_PEER_SET :UIC_CMD_DME_SET ; - uic_cmd.argument1 = attr_sel; - uic_cmd.argument2 =UIC_ARG_ATTR_TYPE (attr_set); - uic_cmd.argument3 = mib_val; - do { /* for peer attributes we retry upon failure */ ret = ufshcd_send_uic_cmd(hba, &uic_cmd);
@@ -4155,7 +4154,10 @@ EXPORT_SYMBOL_GPL(ufshcd_dme_set_attr);int ufshcd_dme_get_attr (struct ufs_hba *hba,u32 attr_sel,u32 *mib_val,u8 peer) { -struct uic_command uic_cmd = {0 }; +struct uic_command uic_cmd = { + .command = peer ?UIC_CMD_DME_PEER_GET :UIC_CMD_DME_GET , + .argument1 = attr_sel, + };static const char *const action[] = {"dme-get" ,"dme-peer-get"
@@ -4189,10 +4191,6 @@ int ufshcd_dme_get_attr(struct ufs_hba *hba, u32 attr_sel, } } - uic_cmd.command = peer ? -UIC_CMD_DME_PEER_GET :UIC_CMD_DME_GET ; - uic_cmd.argument1 = attr_sel; - do { /* for peer attributes we retry upon failure */ ret = ufshcd_send_uic_cmd(hba, &uic_cmd);
@@ -4325,7 +4323,11 @@ static int ufshcd_uic_pwr_ctrl(struct ufs_hba *hba, struct uic_command *cmd)*/ int ufshcd_uic_change_pwr_mode (struct ufs_hba *hba,u8 mode) { -struct uic_command uic_cmd = {0 }; +struct uic_command uic_cmd = { + .command =UIC_CMD_DME_SET , + .argument1 =UIC_ARG_MIB (PA_PWRMODE ), + .argument3 = mode, + };int ret;if (hba->quirks &UFSHCD_QUIRK_BROKEN_PA_RXHSUNTERMCAP ) {
@@ -4338,9 +4340,6 @@ int ufshcd_uic_change_pwr_mode(struct ufs_hba *hba, u8 mode) } } - uic_cmd.command =UIC_CMD_DME_SET ; - uic_cmd.argument1 =UIC_ARG_MIB (PA_PWRMODE ); - uic_cmd.argument3 = mode;ufshcd_hold (hba); ret =ufshcd_uic_pwr_ctrl (hba, &uic_cmd);ufshcd_release (hba);
@@ -4381,13 +4380,14 @@ EXPORT_SYMBOL_GPL(ufshcd_link_recovery);int ufshcd_uic_hibern8_enter (struct ufs_hba *hba) { -int ret; -struct uic_command uic_cmd = {0 }; +struct uic_command uic_cmd = { + .command =UIC_CMD_DME_HIBER_ENTER , + };ktime_t start =ktime_get (); +int ret;ufshcd_vops_hibern8_notify (hba,UIC_CMD_DME_HIBER_ENTER ,PRE_CHANGE ); - uic_cmd.command =UIC_CMD_DME_HIBER_ENTER ; ret =ufshcd_uic_pwr_ctrl (hba, &uic_cmd);trace_ufshcd_profile_hibern8 (dev_name (hba->dev),"enter" ,ktime_to_us (ktime_sub (ktime_get (), start)), ret);
@@ -4405,13 +4405,14 @@ EXPORT_SYMBOL_GPL(ufshcd_uic_hibern8_enter);int ufshcd_uic_hibern8_exit (struct ufs_hba *hba) { -struct uic_command uic_cmd = {0 }; +struct uic_command uic_cmd = { + .command =UIC_CMD_DME_HIBER_EXIT , + };int ret;ktime_t start =ktime_get ();ufshcd_vops_hibern8_notify (hba,UIC_CMD_DME_HIBER_EXIT ,PRE_CHANGE ); - uic_cmd.command =UIC_CMD_DME_HIBER_EXIT ; ret =ufshcd_uic_pwr_ctrl (hba, &uic_cmd);trace_ufshcd_profile_hibern8 (dev_name (hba->dev),"exit" ,ktime_to_us (ktime_sub (ktime_get (), start)), ret);
include/ufs/ufshcd.h +2 -2
@@ -73,8 +73,8 @@ enum ufs_event_type {* @done: UIC command completion */ struct uic_command { -u32 command; -u32 argument1; +const u32 command; +const u32 argument1;u32 argument2;u32 argument3;int cmd_active;
Bart Van Assche
reviewerPATCH v2 3/7 scsi: ufs: Remove two constants
In reply to Bart Van AsscheThe SCSI host template members .cmd_per_lun and .can_queue are copied into the SCSI host data structure. Before these are used, these are overwritten by ufshcd_init(). Hence, this patch does not change any functionality.
--- drivers/ufs/core/ufshcd.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/ufs/core/ufshcd.c +0 -4
@@ -164,8 +164,6 @@ EXPORT_SYMBOL_GPL(ufshcd_dump_regs);enum {UFSHCD_MAX_CHANNEL =0 ,UFSHCD_MAX_ID =1 , -UFSHCD_CMD_PER_LUN =32 -UFSHCD_NUM_RESERVED , -UFSHCD_CAN_QUEUE =32 -UFSHCD_NUM_RESERVED , };static const char *const ufshcd_state_name[] = {
@@ -8958,8 +8956,6 @@ static const struct scsi_host_template ufshcd_driver_template = { .eh_timed_out = ufshcd_eh_timed_out, .this_id = -1, .sg_tablesize = SG_ALL, - .cmd_per_lun = UFSHCD_CMD_PER_LUN, - .can_queue = UFSHCD_CAN_QUEUE, .max_segment_size = PRDT_DATA_BYTE_COUNT_MAX, .max_sectors = SZ_1M / SECTOR_SIZE, .max_host_blocked = 1,
RE: [PATCH v2 3/7] scsi: ufs: Remove two constants
Quoted 7 lines
The SCSI host template members .cmd_per_lun and .can_queue are copied into the SCSI host data structure. Before these are used, these are overwritten by
ufshcd_init(). Hence, this patch does not change any functionality.Reviewed-by Manivannan Sadhasivam <[email protected]>Signed-off-by Bart Van Assche <[email protected]>
Best Regards,
Keoseong
Quoted 26 lines
--- drivers/ufs/core/ufshcd.c | 4 ---- 1 file changed, 4 deletions(-)drivers/ufs/core/ufshcd.c +0
-4@@ -164,8 +164,6 @@ EXPORT_SYMBOL_GPL(ufshcd_dump_regs);enum {UFSHCD_MAX_CHANNEL =0 ,UFSHCD_MAX_ID =1 , -UFSHCD_CMD_PER_LUN =32 -UFSHCD_NUM_RESERVED , -UFSHCD_CAN_QUEUE =32 -UFSHCD_NUM_RESERVED , };static const char *const ufshcd_state_name[] = {@@ -8958,8 +8956,6 @@ static const struct scsi_host_template ufshcd_driver_template = { .eh_timed_out = ufshcd_eh_timed_out, .this_id = -1, .sg_tablesize = SG_ALL, - .cmd_per_lun = UFSHCD_CMD_PER_LUN, - .can_queue = UFSHCD_CAN_QUEUE, .max_segment_size = PRDT_DATA_BYTE_COUNT_MAX, .max_sectors = SZ_1M / SECTOR_SIZE, .max_host_blocked = 1,
Bart Van Assche
reviewerPATCH v2 4/7 scsi: ufs: Rename the MASK_TRANSFER_REQUESTS_SLOTS constant
In reply to Bart Van AsscheRename this constant to prepare for the introduction of the MASK_TRANSFER_REQUESTS_SLOTS_MCQ constant. The acronym "SDB" stands for "single doorbell" (mode).
--- drivers/ufs/core/ufshcd.c | 2 +- include/ufs/ufshci.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/ufs/core/ufshcd.c +1 -1
@@ -2401,7 +2401,7 @@ static inline int ufshcd_hba_capabilities(struct ufs_hba *hba) hba->capabilities &= ~MASK_64_ADDRESSING_SUPPORT ;/* nutrs and nutmrs are 0 based values */ - hba->nutrs = (hba->capabilities &MASK_TRANSFER_REQUESTS_SLOTS ) +1 ; + hba->nutrs = (hba->capabilities &MASK_TRANSFER_REQUESTS_SLOTS_SDB ) +1 ; hba->nutmrs = ((hba->capabilities &MASK_TASK_MANAGEMENT_REQUEST_SLOTS ) >>16 ) +1 ; hba->reserved_slot = hba->nutrs -1 ;
include/ufs/ufshci.h +1 -1
@@ -67,7 +67,7 @@ enum {/* Controller capability masks */ enum { -MASK_TRANSFER_REQUESTS_SLOTS =0x0000001F , +MASK_TRANSFER_REQUESTS_SLOTS_SDB =0x0000001F ,MASK_NUMBER_OUTSTANDING_RTT =0x0000FF00 ,MASK_TASK_MANAGEMENT_REQUEST_SLOTS =0x00070000 ,MASK_EHSLUTRD_SUPPORTED =0x00400000 ,
Bart Van Assche
reviewerPATCH v2 5/7 scsi: ufs: Initialize hba->reserved_slot earlier
In reply to Bart Van AsscheMove the hba->reserved_slot and the host->can_queue assignments from ufshcd_config_mcq() into ufshcd_alloc_mcq(). The advantages of this change are as follows:
- It becomes easier to verify that these two parameters are updated if hba->nutrs is updated.
- It prevents unnecessary assignments to these two parameters. While ufshcd_config_mcq() is called during host reset, ufshcd_alloc_mcq() is not.
--- drivers/ufs/core/ufshcd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/ufs/core/ufshcd.c +3 -3
@@ -8678,6 +8678,9 @@ static int ufshcd_alloc_mcq(struct ufs_hba *hba)if (ret) goto err; + hba->host->can_queue = hba->nutrs -UFSHCD_NUM_RESERVED ; + hba->reserved_slot = hba->nutrs -UFSHCD_NUM_RESERVED ; +return 0 ; err: hba->nutrs = old_nutrs;
@@ -8699,9 +8702,6 @@ static void ufshcd_config_mcq(struct ufs_hba *hba)ufshcd_mcq_make_queues_operational (hba);ufshcd_mcq_config_mac (hba, hba->nutrs); - hba->host->can_queue = hba->nutrs -UFSHCD_NUM_RESERVED ; - hba->reserved_slot = hba->nutrs -UFSHCD_NUM_RESERVED ; -ufshcd_mcq_enable (hba); hba->mcq_enabled = true;
Bart Van Assche
reviewerPATCH v2 6/7 scsi: ufs: Inline ufshcd_mcq_vops_get_hba_mac()
In reply to Bart Van AsscheMake ufshcd_mcq_decide_queue_depth() easier to read by inlining ufshcd_mcq_vops_get_hba_mac().
--- drivers/ufs/core/ufs-mcq.c | 18 +++++++++++------- drivers/ufs/core/ufshcd-priv.h | 8 -------- 2 files changed, 11 insertions(+), 15 deletions(-)
drivers/ufs/core/ufs-mcq.c +11 -7
@@ -144,14 +144,14 @@ EXPORT_SYMBOL_GPL(ufshcd_mcq_queue_cfg_addr);*/ int ufshcd_mcq_decide_queue_depth (struct ufs_hba *hba) { -int mac; +int mac = -EOPNOTSUPP ; -/* Mandatory to implement get_hba_mac() */ - mac =ufshcd_mcq_vops_get_hba_mac (hba); -if (mac <0 ) { -dev_err (hba->dev,"Failed to get mac, err=%d\n" , mac); -return mac; - } +if (!hba->vops || !hba->vops->get_hba_mac) + goto err; + + mac = hba->vops->get_hba_mac (hba); +if (mac <0 ) + goto err;WARN_ON_ONCE (!hba->dev_info.bqueuedepth);/*
@@ -160,6 +160,10 @@ int ufshcd_mcq_decide_queue_depth(struct ufs_hba *hba)* shared queuing architecture is enabled. */ return min_t (int, mac, hba->dev_info.bqueuedepth); + +err: +dev_err (hba->dev,"Failed to get mac, err=%d\n" , mac); +return mac; }static int ufshcd_mcq_config_nr_queues (struct ufs_hba *hba)
drivers/ufs/core/ufshcd-priv.h +0 -8
@@ -253,14 +253,6 @@ static inline int ufshcd_vops_mcq_config_resource(struct ufs_hba *hba)return -EOPNOTSUPP ; } -static inline int ufshcd_mcq_vops_get_hba_mac (struct ufs_hba *hba) -{ -if (hba->vops && hba->vops->get_hba_mac) -return hba->vops->get_hba_mac (hba); - -return -EOPNOTSUPP ; -} -static inline int ufshcd_mcq_vops_op_runtime_config (struct ufs_hba *hba) {if (hba->vops && hba->vops->op_runtime_config)
Bart Van Assche
reviewerPATCH v2 7/7 scsi: ufs: Make .get_hba_mac() optional
In reply to Bart Van AsscheUFSHCI controllers that are compliant with the UFSHCI 4.0 standard report the maximum number of supported commands in the controller capabilities register. Use that value if .get_hba_mac == NULL.
--- drivers/ufs/core/ufs-mcq.c | 15 +++++++++------ include/ufs/ufshcd.h | 4 +++- include/ufs/ufshci.h | 1 + 3 files changed, 13 insertions(+), 7 deletions(-)
drivers/ufs/core/ufs-mcq.c +9 -6
@@ -138,18 +138,21 @@ EXPORT_SYMBOL_GPL(ufshcd_mcq_queue_cfg_addr);* * MAC - Max. Active Command of the Host Controller (HC) * HC wouldn't send more than this commands to the device. -* It is mandatory to implement get_hba_mac() to enable MCQ mode. * Calculates and adjusts the queue depth based on the depth * supported by the HC and ufs device. */ int ufshcd_mcq_decide_queue_depth (struct ufs_hba *hba) { -int mac = -EOPNOTSUPP ; +int mac; -if (!hba->vops || !hba->vops->get_hba_mac) - goto err; - - mac = hba->vops->get_hba_mac (hba); +if (!hba->vops || !hba->vops->get_hba_mac) { + hba->capabilities = +ufshcd_readl (hba,REG_CONTROLLER_CAPABILITIES ); + mac = hba->capabilities &MASK_TRANSFER_REQUESTS_SLOTS_MCQ ; + mac++; + }else { + mac = hba->vops->get_hba_mac (hba); + }if (mac <0 ) goto err;
include/ufs/ufshcd.h +3 -1
@@ -325,7 +325,9 @@ struct ufs_pwr_mode_info {* @event_notify: called to notify important events * @reinit_notify: called to notify reinit of UFSHCD during max gear switch * @mcq_config_resource: called to configure MCQ platform resources -* @get_hba_mac: called to get vendor specific mac value, mandatory for mcq mode +* @get_hba_mac: reports maximum number of outstanding commands supported by +* the controller. Should be implemented for UFSHCI 4.0 or later +* controllers that are not compliant with the UFSHCI 4.0 specification. * @op_runtime_config: called to config Operation and runtime regs Pointers * @get_outstanding_cqs: called to get outstanding completion queues * @config_esi: called to config Event Specific Interrupt
include/ufs/ufshci.h +1 -0
@@ -68,6 +68,7 @@ enum {/* Controller capability masks */ enum {MASK_TRANSFER_REQUESTS_SLOTS_SDB =0x0000001F , +MASK_TRANSFER_REQUESTS_SLOTS_MCQ =0x000000FF ,MASK_NUMBER_OUTSTANDING_RTT =0x0000FF00 ,MASK_TASK_MANAGEMENT_REQUEST_SLOTS =0x00070000 ,MASK_EHSLUTRD_SUPPORTED =0x00400000 ,