Merge pull request #290 from sgaud-quic/qcom-6.18.y

sgaud-quic · web-flow · commit faac849b351a · 2026-02-17T14:33:53.000+05:30
WORKAROUND: scsi: ufs: core: Set uic_cmd_timeout to max
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
@@ -117,7 +117,7 @@ static bool is_mcq_supported(struct ufs_hba *hba)
 module_param(use_mcq_mode, bool, 0644);
 MODULE_PARM_DESC(use_mcq_mode, "Control MCQ mode for controllers starting from UFSHCI 4.0. 1 - enable MCQ, 0 - disable MCQ. MCQ is enabled by default");
 
-static unsigned int uic_cmd_timeout = UIC_CMD_TIMEOUT_DEFAULT;
+static unsigned int uic_cmd_timeout = UIC_CMD_TIMEOUT_MAX;
 
 static int uic_cmd_timeout_set(const char *val, const struct kernel_param *kp)
 {

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ static bool is_mcq_supported(struct ufs_hba *hba)`
`117`	`117`	`module_param(use_mcq_mode, bool, 0644);`
`118`	`118`	`MODULE_PARM_DESC(use_mcq_mode, "Control MCQ mode for controllers starting from UFSHCI 4.0. 1 - enable MCQ, 0 - disable MCQ. MCQ is enabled by default");`
`119`	`119`
`120`		`-static unsigned int uic_cmd_timeout = UIC_CMD_TIMEOUT_DEFAULT;`
	`120`	`+static unsigned int uic_cmd_timeout = UIC_CMD_TIMEOUT_MAX;`
`121`	`121`
`122`	`122`	`static int uic_cmd_timeout_set(const char val, const struct kernel_param kp)`
`123`	`123`	`{`